 Julien Clauter
|
92dc30741a
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
68677d4644
fixed null pointer in getunsyncattacks
|
9 years ago |
|
Alexander Brakowski
|
64168b7546
Merge remote-tracking branch 'origin/merge_v1' into merge_v1
|
9 years ago |
|
Alexander Brakowski
|
4ebb7541ea
added debugging toString and prints
|
9 years ago |
|
Daniel Lazar
|
8d55167228
small fix
|
9 years ago |
|
Julien Clauter
|
d3c1ac3c32
again
|
9 years ago |
|
Julien Clauter
|
8a0960738e
updapte own device in updated devices for dbh
|
9 years ago |
|
Julien Clauter
|
d099d7163d
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
36538bc708
arect max attack id
|
9 years ago |
|
Daniel Lazar
|
3a77356aa9
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Daniel Lazar
|
251f3bed05
fixed a possible crash
|
9 years ago |
|
Julien Clauter
|
fad6ae261d
increaase max attack id on older device
|
9 years ago |
|
Julien Clauter
|
860992f953
set correct max id on dbh
|
9 years ago |
|
Julien Clauter
|
2e669a0347
increasaed own device max id
|
9 years ago |
|
Julien Clauter
|
447d346292
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
6272a1ba47
actualise syncdevice id in syncinfo
|
9 years ago |
|
Alexander Brakowski
|
4383433779
improved bluetooth sync UI and fixed some sync bugs
|
9 years ago |
|
Alexander Brakowski
|
861dc4570f
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
5aa1686cbc
Correct the attack id of parcelable message records created in a syncrecord
|
9 years ago |
|
Julien Clauter
|
bc37379313
added missing devices to the sync process.
|
9 years ago |
|
Julien Clauter
|
b16c07915e
added message records to syncrecord
|
9 years ago |
|
Julien Clauter
|
b25ac373b5
fixed db bug
|
9 years ago |
|
Alexander Brakowski
|
2f935cceda
solved merge conflicts
|
9 years ago |
|
Julien Clauter
|
27191440fd
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
a25d8c43f0
moved current device in db helper
|
9 years ago |
|
Alexander Brakowski
|
01d988e5c2
some changes
|
9 years ago |
|
Alexander Brakowski
|
8edf0eb287
solved merge conflicts
|
9 years ago |
|
Alexander Brakowski
|
5b9e539447
tried to solve sync issue
|
9 years ago |
|
Julien Clauter
|
b4833b1832
write / read database changed on multiple places
|
9 years ago |
|
Julien Clauter
|
dee31a540e
fixed pre closing database
|
9 years ago |
