 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 |
|
Julien Clauter
|
c619ee8a1b
remove debug line in overview
|
9 years ago |
|
Julien Clauter
|
9614838f96
fixed creating syncrecords
|
9 years ago |
 Fabio Arnold
|
c9c2c4c5d1
merge?
|
9 years ago |
|
Fabio Arnold
|
4b1da2643b
inject local port in datagram socket. more clarity in port binder
|
9 years ago |
|
Alexander Brakowski
|
2f0215d9dd
fixed merge conflicts
|
9 years ago |
|
Alexander Brakowski
|
1b2f7bf862
fixed some db bugs
|
9 years ago |
|
Julien Clauter
|
f67d9be6a5
fixed unsynced records;
|
9 years ago |
|
Julien Clauter
|
219359ed2d
fixed sql query for unsnced recs;
|
9 years ago |
|
Alexander Brakowski
|
c4a1cf37f5
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Alexander Brakowski
|
1f3b03e5d5
fixed id for record
|
9 years ago |
|
Julien Clauter
|
942000d47b
fixed create record?
|
9 years ago |
|
Julien Clauter
|
7311a2e0e5
autoincrement mesagerec in syncrec
|
9 years ago |
|
Julien Clauter
|
9dc8749d38
fixed creating device table
|
9 years ago |
|
Julien Clauter
|
7c7de6604a
fixed sql syntax
|
9 years ago |
|
Julien Clauter
|
bfcb7bafc5
fixed unknown table in db handler
|
9 years ago |
|
Julien Clauter
|
8130114d16
remove prefix table in db handler
|
9 years ago |
|
Alexander Brakowski
|
18407e60f6
changed bluetooth synchronization to use our new protocol
|
9 years ago |
|
Julien Clauter
|
fd9dd273f6
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Julien Clauter
|
fc5aa4285c
Marked private methos in synchronizer
|
9 years ago |
|
Alexander Brakowski
|
f19759545d
Merge branch 'merge_v1' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-hostage-v3 into merge_v1
|
9 years ago |
|
Alexander Brakowski
|
b202f83749
...
|
9 years ago |
|
Julien Clauter
|
267bc4492e
added bssids to sync info for own state
|
9 years ago |
