1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-11-23 21:01:18 +00:00
Commit graph

1036 commits

Author SHA1 Message Date
Lars K.W. Gohlke
7e4879a26e fix NPE, when pressing back button on LogActivity (fixes #604) 2016-07-06 02:02:47 +02:00
Cedric Staniewski
3a8346b9a5 Sort folders by label
If the label is empty or unset, use the folder ID in comparision.
2016-07-03 23:02:31 +02:00
49d053f6bc Clarified root option warning (fixes #688). 2016-06-27 19:14:31 +02:00
8fe8fba4dc Bumped version to 0.7.21 2016-06-25 14:48:56 +02:00
c49e33818a Imported translations. 2016-06-25 14:25:15 +02:00
047d0cf0fd Updated Syncthing to v0.13.7 2016-06-25 14:18:10 +02:00
Lars K.W. Gohlke
6a09c3d18f upgrades latest gradle and build tools
* upgrades latest gradle and build tools

* restore part of the previous removed comment
2016-06-25 14:14:21 +02:00
Lars K.W. Gohlke
48e19a88bb fix api access to activate/deactive natEnabled
* fix api access to activate/deactive natEnabled

* remove old key and add a single 'nat_enabled' new one

* fixed translation
2016-06-25 14:04:04 +02:00
5a2d8aca97 Merge pull request #682 from syncthing/upgrade-android-design-version
upgrades android design dependency
2016-06-21 23:55:53 +02:00
Lars K.W. Gohlke
0232abb445 upgrades android design dependency 2016-06-21 23:52:37 +02:00
f328714e60 Merge pull request #672 from Unrud/patch-1
Make multiple PendingIntents distinguishable
2016-06-14 22:04:14 +02:00
Unrud
af8ec86843 Make multiple PendingIntents distinguishable
If notifications for multiple new devices or folders are shown, the last Intent was used for all of them.
2016-06-14 18:17:28 +02:00
ea96011c39 Merge pull request #675 from Unrud/folder_label
Use folderLabel from FolderRejected events
2016-06-14 12:33:02 +02:00
Unrud
3899abf454 Use folderLabel from FolderRejected events
Show folder label in notification and
preset value for new folder.
2016-06-13 01:13:32 +02:00
b4e2c44ab2 Added "enable relaying option (fixes #616). 2016-06-12 22:24:09 +02:00
d29b675a1e Use expandable notification for new device/folder (fixes #614). 2016-06-12 22:15:36 +02:00
788af35c00 Updated Go to 1.6.2 2016-06-12 21:54:57 +02:00
6fc0106880 Also don't reset submodule in make-go.bash 2016-06-12 21:54:38 +02:00
9009301106 Completely removed $RESET variable from build script. 2016-06-12 21:03:25 +02:00
2f1a5af7c3 Build script shouldn't overwrite submodule status. 2016-06-12 19:54:26 +02:00
c6b42adef9 Bumped version to 0.7.20 2016-06-12 16:55:08 +02:00
650550c573 Imported translations. 2016-06-12 15:19:42 +02:00
d49c2b05c6 Merge pull request #670 from lkwg82/syncthing-0.13.5
upgrade to syncthing v0.13.5
2016-06-10 16:36:22 +02:00
c48cd2c3f3 Merge pull request #662 from lkwg82/syncthing-version
Syncthing version
2016-06-10 16:34:43 +02:00
Lars K.W. Gohlke
1dc13f17d5 upgrade to syncthing v0.13.5 2016-06-09 23:58:24 +02:00
cdb09285bc Merge pull request #669 from lkwg82/fix-changed-settings
fixes RestApi options for 'listenAddress'
2016-06-09 23:57:46 +02:00
Lars K.W. Gohlke
6a337bd443 fixes RestApi options for 'listenAddress' 2016-06-09 23:52:00 +02:00
Lars K.W. Gohlke
1aafb38764 adds display of syncthing version in main drawer 2016-06-09 08:55:49 +02:00
1f6acb8f83 Bumped version to 0.7.19 2016-05-25 14:53:01 +02:00
d0efdca1e8 Imported translations. 2016-05-25 14:51:49 +02:00
eb6a123017 Updated Syncthing to v0.13.2 2016-05-25 14:42:32 +02:00
573533a35f Fixed device toggle (fixes #647). 2016-05-19 11:40:55 +09:00
08c546a93b Bumped version to 0.7.18 2016-05-18 12:18:50 +09:00
6403756ef2 Imported translations. 2016-05-18 12:10:20 +09:00
3a8ee3a424 Updated Syncthing to v0.13.0 2016-05-18 12:00:00 +09:00
1fba3dd53e Updated Syncthing to v0.13.0-beta.4, adjusted to API changes. 2016-05-07 06:22:54 +02:00
63ab66448a Bumped version to 0.7.18-beta0 2016-05-04 03:45:25 +02:00
0316e8aad7 Merge branch 'syncthing-v0.13' 2016-05-04 03:42:18 +02:00
12997d6b36 Added support for folder labels. 2016-05-04 03:41:55 +02:00
6f77e4912b Updated Syncthing to v0.13.0-beta.3 2016-05-04 03:41:53 +02:00
0b0de91017 Bumped version to 0.7.17 2016-05-04 03:34:34 +02:00
419f973e65 Downgrade build tools to 1.3, enable res cruncher (fixes #632). 2016-05-04 03:31:16 +02:00
fc28e1eb70 Merge pull request #638 from relan/badges
Update Google Play and F-Droid badges
2016-04-30 13:53:55 +02:00
relan
9696d09058 Update Google Play and F-Droid badges 2016-04-30 08:08:03 +03:00
cc74cd1fcf Fix crash in case DrawerFragment is opened early (fixes #629). 2016-04-26 23:08:35 +02:00
bb17c53d4c Fixed lint warnings. 2016-04-26 22:54:27 +02:00
e49affe844 Bumped version to 0.7.16 2016-04-26 22:09:06 +02:00
21f1ca57b7 Fix native build failing on Ubuntu 16.04 2016-04-26 21:35:03 +02:00
db17cf9267 Merge pull request #630 from capi/fix-625
Track WiFi changes again in NetworkReceiver (fixes #625)
2016-04-26 20:14:17 +02:00
Martin Carpella
cfac1d3a61 Fix checks for intent actions (fixes #625) 2016-04-26 20:01:50 +02:00