 Alexander Brakowski
|
cb543bc5ca
merged conflicts
|
%!s(int64=9) %!d(string=hai) anos |
|
Lars Pandikow
|
66b19427a8
Merged rc - branch and small clean up
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
a115e9af49
Revoke previous change
|
%!s(int64=10) %!d(string=hai) anos |
|
Mihai Plasoianu
|
0504145b8d
fixed small bug in sync
|
%!s(int64=10) %!d(string=hai) anos |
|
Julien Clauter
|
e2a2272397
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
%!s(int64=10) %!d(string=hai) anos |
|
Julien Clauter
|
e392ad02de
moved logfilter to model package in ui2, added logfilter comments
|
%!s(int64=10) %!d(string=hai) anos |
|
Mihai Plasoianu
|
271de9ac78
sync bugfixes
|
%!s(int64=10) %!d(string=hai) anos |
|
Alexander Brakowski
|
4f236c8686
merged hostage v1 changes
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
5e63295acd
Portscan is logged corretly.
|
%!s(int64=10) %!d(string=hai) anos |
|
Alexander Brakowski
|
d6ad3c5b10
made all the methods in the database helper synchronized
|
%!s(int64=10) %!d(string=hai) anos |
|
Alexander Brakowski
|
6248bc92a8
fixed conflicts that arose from the new database design
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
745a674851
Updated portscan detection
|
%!s(int64=10) %!d(string=hai) anos |
|
Alexander Brakowski
|
252926cc92
fixed some some merge bugs
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
0a55c9a91e
Deleted UglyDatabaseHelper
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
853609c78b
Implemented TracingSyncActivity
|
%!s(int64=10) %!d(string=hai) anos |
|
Lars Pandikow
|
18daa77da8
Rewrote Synchronization between Devices:
|
%!s(int64=10) %!d(string=hai) anos |
|
Mihai Plasoianu
|
c0cd0e8f14
portscan updated
|
%!s(int64=10) %!d(string=hai) anos |
|
Mihai Plasoianu
|
dd92998c18
ContentProvider for db implemented
|
%!s(int64=10) %!d(string=hai) anos |
