Lode Hoste
|
79f0e2a8dc
|
Fix remaining merge issues
|
2015-05-05 22:02:31 +02:00 |
|
Lode Hoste
|
266909e086
|
Updated to Syncthing v0.11.2
|
2015-05-05 20:57:46 +02:00 |
|
Lode Hoste
|
e645255e79
|
Updated translations
|
2015-05-05 20:39:55 +02:00 |
|
Lode Hoste
|
8ff6a84a4e
|
Limit retries when create the config file
|
2015-05-05 20:39:25 +02:00 |
|
Lode Hoste
|
07ba64398e
|
Fix TAG warning and update Javadoc
Conflicts:
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
|
2015-05-05 20:36:15 +02:00 |
|
Lode Hoste
|
58d299a18e
|
Capture IOException when file descriptor is closed (fixes #382)
Conflicts:
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
|
2015-05-05 20:34:39 +02:00 |
|
Lode Hoste
|
767177e28d
|
Kill the Syncthing Process before resorting to shell-based kill
Conflicts:
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
|
2015-05-05 20:33:01 +02:00 |
|
Lode Hoste
|
b32ac0b13e
|
Fix lint warnings
|
2015-05-05 20:24:24 +02:00 |
|
Lode Hoste
|
5d5cf0b903
|
Streamline SyncthingRunnable
Conflicts:
src/androidTest/java/com/nutomic/syncthingandroid/test/syncthing/RestApiTest.java
src/main/java/com/nutomic/syncthingandroid/fragments/SettingsFragment.java
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingRunnable.java
src/main/java/com/nutomic/syncthingandroid/syncthing/SyncthingService.java
src/main/res/values/strings.xml
|
2015-05-05 20:21:15 +02:00 |
|
Lode Hoste
|
09331780b3
|
Cache line separator
|
2015-05-05 20:06:40 +02:00 |
|
Lode Hoste
|
97bbeadc6a
|
Don't retry if the task was cancelled
|
2015-05-05 20:06:17 +02:00 |
|
Lode Hoste
|
a447807ff6
|
Merge branch 'master' of github.com:syncthing/syncthing-android
|
2015-05-05 20:02:36 +02:00 |
|
Lode Hoste
|
461a46b3d7
|
Merge branch 'Zillode-fix-scanner'
|
2015-05-05 20:02:02 +02:00 |
|
Lode Hoste
|
7f7b8cd653
|
Merge branch 'fix-scanner' of https://github.com/Zillode/syncthing-android into Zillode-fix-scanner
Conflicts:
src/main/java/com/nutomic/syncthingandroid/fragments/DeviceSettingsFragment.java
|
2015-05-05 20:00:32 +02:00 |
|
Zillode
|
e77d5a6c12
|
Merge pull request #376 from Zillode/disable-cache
Clear webview cache (fixes #374)
|
2015-05-05 19:47:34 +02:00 |
|
Zillode
|
de2c6320af
|
Merge pull request #375 from Zillode/reduce-load
Increase GUI update interval and log get requests (fixes #362)
|
2015-05-05 19:47:10 +02:00 |
|
Lode Hoste
|
86f25e94c6
|
Merge branch 'Zillode-log'
|
2015-05-05 19:45:58 +02:00 |
|
Lode Hoste
|
74062e8269
|
Merge branch 'log' of https://github.com/Zillode/syncthing-android into Zillode-log
Conflicts:
src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
|
2015-05-05 19:45:50 +02:00 |
|
Zillode
|
7c54b762af
|
Merge pull request #369 from Zillode/https
TLS and v0.11.0 Support
|
2015-05-05 19:43:35 +02:00 |
|
Zillode
|
e5972dc1e1
|
Merge pull request #383 from syncthing/upstream
Capture IOException when for closed file descriptor (fixes #382)
|
2015-05-05 08:37:50 +02:00 |
|
Lode Hoste
|
9d4ede5aff
|
Capture IOException when for closed file descriptor (fixes #382)
|
2015-05-05 08:35:43 +02:00 |
|
Lode Hoste
|
1e02a10348
|
Properly initiate the ZXing barcode scanner (fixes #322).
|
2015-04-29 20:05:25 +02:00 |
|
Lode Hoste
|
3f332e8b8b
|
Clear webview cache (fixes #374)
|
2015-04-29 19:47:37 +02:00 |
|
Lode Hoste
|
e111d836f0
|
Increase GUI update interval and log get requests (fixes #362)
|
2015-04-29 19:43:40 +02:00 |
|
Zillode
|
cdffed64af
|
Merge pull request #370 from Zillode/copy-id
Only copy device ID when finger lifts
|
2015-04-29 19:32:58 +02:00 |
|
Lode Hoste
|
da4d654721
|
Support webgui for devices <ICS
|
2015-04-29 19:30:30 +02:00 |
|
Lode Hoste
|
1caf5fee20
|
Update to Syncthing v0.11
|
2015-04-29 19:30:29 +02:00 |
|
Lode Hoste
|
10cad9ae37
|
Print stacktrace on error
|
2015-04-29 19:30:29 +02:00 |
|
Lode Hoste
|
dccbbbbd41
|
Support HTTP Auth in Webview
|
2015-04-29 19:30:29 +02:00 |
|
Lode Hoste
|
4146970e64
|
Update Rest API to v0.11
Conflicts:
src/main/java/com/nutomic/syncthingandroid/fragments/DeviceSettingsFragment.java
|
2015-04-29 19:30:17 +02:00 |
|
Lode Hoste
|
1584754e32
|
Show GetTask progress in log
Conflicts:
src/main/java/com/nutomic/syncthingandroid/syncthing/GetTask.java
|
2015-04-29 19:08:09 +02:00 |
|
|
|
02a043f76c
|
Removed unneeded code.
|
2015-04-26 05:48:15 +02:00 |
|
|
|
e821d2e468
|
Do not use WeakReference for listeners (fixes #328).
This makes sure listeners are not invoked after being destroyed.
Also call onApiChange() on GUI thread.
|
2015-04-25 01:50:08 +02:00 |
|
Lode Hoste
|
499309fcc1
|
Only copy device ID when finger lifts
|
2015-04-23 23:23:20 +02:00 |
|
Lode Hoste
|
0c13d8e106
|
Support opening LogActivity in debug package
|
2015-04-23 08:28:43 +02:00 |
|
Lode Hoste
|
6be050c43d
|
Add log window (fixes #311).
|
2015-04-23 08:27:22 +02:00 |
|
Lode Hoste
|
df92b179c7
|
Fix several lint warnings
|
2015-04-23 08:10:04 +02:00 |
|
Lode Hoste
|
bcbec555cd
|
Update default HTTP configurations to use HTTPS
|
2015-04-23 08:09:07 +02:00 |
|
Lode Hoste
|
5e0029e208
|
Update deprecated 8080 port to 8384
|
2015-04-23 08:07:54 +02:00 |
|
Lode Hoste
|
8f2fe9955a
|
Enable TLS for the WebGUI
|
2015-04-23 08:03:43 +02:00 |
|
Lode Hoste
|
c7cdfa1ff2
|
Implement TLS support (fixes #19)
|
2015-04-23 08:03:24 +02:00 |
|
|
|
7ddee2f953
|
Toggle drawer when menu button is pressed (fixes #329).
|
2015-04-22 23:45:45 +02:00 |
|
|
|
f5e1a17965
|
Added instructions for logcat in console.
|
2015-04-20 23:00:08 +02:00 |
|
|
|
b9dec163e0
|
Set invisible placeholder for device ID (fixes #357).
|
2015-04-20 22:13:38 +02:00 |
|
|
|
c767259889
|
Export config to backups/syncthing instead of sd card root (fixes #364).
|
2015-04-20 21:33:04 +02:00 |
|
|
|
92fae9df89
|
Enabled test coverage.
|
2015-04-09 21:49:12 +02:00 |
|
Zillode
|
42be1fb26b
|
Merge pull request #338 from Zillode/fix-npe-onreceive
Fix NPE when mVersion or mCurrentAddress is not set
|
2015-04-09 20:41:16 +02:00 |
|
Lode Hoste
|
18901b03b8
|
Fix NPE when mVersion or mCurrentAddress is not set
|
2015-04-09 20:38:36 +02:00 |
|
|
|
1bc4935463
|
Fixed bug in FolderObserver, improved tests (ref #337).
|
2015-04-09 01:23:30 +02:00 |
|
|
|
8c75a8913d
|
Remove .stfolder generation and moveConfigFiles() (fixes #277).
|
2015-04-08 23:18:43 +02:00 |
|
