 Daniel Lazar
|
a57efbebd0
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Daniel Lazar
|
ae360de38d
now using isNetworkAvailable()
|
vor 11 Jahren |
|
Alexander Brakowski
|
3b53634df7
..
|
vor 11 Jahren |
|
Alexander Brakowski
|
6d2db4a8ad
fixed hostage cash bug
|
vor 11 Jahren |
 Fabio Arnold
|
37332b024d
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Fabio Arnold
|
d2c9e7f045
removed unnecessary native stuff
|
vor 11 Jahren |
|
Daniel Lazar
|
9db8f0a87e
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Daniel Lazar
|
d6fed6bedb
added correct behaviour for the GHOST protocol in services fragment
|
vor 11 Jahren |
|
Julien Clauter
|
bdcb967f1b
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Julien Clauter
|
aa2cce4289
fixed label alignment in the line bar
|
vor 11 Jahren |
|
Alexander Brakowski
|
135eaae9b2
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Fabio Arnold
|
f4e5f9e08a
fixed spelling error
|
vor 11 Jahren |
|
Alexander Brakowski
|
acbe69a3d0
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Alexander Brakowski
|
eca13999b5
improved settings; and fixed SMB
|
vor 11 Jahren |
|
Fabio Arnold
|
7789c532c1
threatmap display network connection missing also when 3G is not available
|
vor 11 Jahren |
|
Daniel Lazar
|
08837fea5a
added permission to Manifest
|
vor 11 Jahren |
|
Alexander Brakowski
|
c96638b5cc
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostage into merge_new
|
vor 11 Jahren |
|
Alexander Brakowski
|
6403ec5f6f
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Alexander Brakowski
|
bdf778fd80
changed gitignore
|
vor 11 Jahren |
|
Alexander Brakowski
|
8300e331c6
fixed strange save state bug, which resulted in an fragment back stack bug
|
vor 11 Jahren |
|
Mihai Plasoianu
|
8e38f676eb
portscan detection implemented (only logger output)
|
vor 11 Jahren |
|
Julien Clauter
|
44f9891f43
bug fixes; statistics now load data in background thread
|
vor 11 Jahren |
|
Julien Clauter
|
3f37fa4aa6
added spinner in record overview
|
vor 11 Jahren |
|
Julien Clauter
|
0ec5ef24f5
many fixes in ugly db;
|
vor 11 Jahren |
|
Julien Clauter
|
924379715c
compile bug fix
|
vor 11 Jahren |
|
Julien Clauter
|
2c9296d58f
Merge branch 'master' of https://git.tk.informatik.tu-darmstadt.de/scm-ssi-student-hostagev2
|
vor 11 Jahren |
|
Julien Clauter
|
9ffd245e7b
bug fixes and comments
|
vor 11 Jahren |
|
Alexander Brakowski
|
32eb0ee049
fixed last merge conflicts
|
vor 11 Jahren |
|
Alexander Brakowski
|
2db746886a
..
|
vor 11 Jahren |
|
Alexander Brakowski
|
7a42f2394a
finished merge fixes
|
vor 11 Jahren |
