Jakob Borg
c741465328
Use versionString() in about modal ( fixes #1663 )
2015-04-20 08:23:59 +09:00
Jakob Borg
fbca537a40
Merge pull request #1655 from kamadak/fix-nil-deref
...
Fix nil pointer dereferences in REST with non-existent folders
2015-04-19 17:20:47 +09:00
Jakob Borg
83420b0199
Merge pull request #1654 from AudriusButkevicius/fixes
...
Fix capitalization (fixes #1652 , fixes #1649 )
2015-04-19 17:20:05 +09:00
KAMADA Ken'ichi
33d3ba1b45
Fix nil pointer dereferences in REST with non-existent folders
2015-04-18 22:41:47 +09:00
Audrius Butkevicius
497f85a236
Fix capitalization ( fixes #1652 , fixes #1649 )
2015-04-18 11:23:21 +01:00
Audrius Butkevicius
a624c302ab
Merge pull request #1648 from calmh/scanner-batches
...
Don't buffer large files a long time while scanning
2015-04-17 09:05:09 +01:00
Jakob Borg
cebe21a3af
Don't buffer large files a long time while scanning
2015-04-17 16:40:09 +09:00
Audrius Butkevicius
9eb679d70a
Merge pull request #1647 from calmh/fix-localindexupdated
...
Homogenize the LocalIndexUpdated event
2015-04-17 08:14:38 +01:00
Jakob Borg
6d84443db8
Homogenize the LocalIndexUpdated event
...
It had two different formats, and we use "items" instead of "numFiles"
in other places.
(Discovered while documenting :)
2015-04-17 14:22:06 +09:00
Jakob Borg
da8a1f242c
Merge pull request #1646 from AudriusButkevicius/readonly
...
Make targets writeable before removal on Windows (fixes #1610 )
2015-04-17 14:21:39 +09:00
Jakob Borg
946d98b71f
Merge pull request #1645 from AudriusButkevicius/tests
...
Fix tests on Windows (fixes #1531 )
2015-04-17 14:20:53 +09:00
Audrius Butkevicius
dff51fc707
Make targets writeable before removal on Windows ( fixes #1610 )
2015-04-16 22:53:53 +01:00
Audrius Butkevicius
7d954dd5d1
Fix tests on Windows ( fixes #1531 )
2015-04-16 21:18:17 +01:00
Jakob Borg
c6300a5da8
Tone down UPnP errors a little
2015-04-16 23:45:12 +09:00
Jakob Borg
9359daa0d9
Merge branch 'pr-1636'
...
* pr-1636:
Store and use _localStorage object
fix using detect localStorage
2015-04-16 23:44:59 +09:00
Jakob Borg
2322e9cff7
Store and use _localStorage object
2015-04-16 23:44:34 +09:00
Jakob Borg
a876e1e348
Merge remote-tracking branch 'syncthing/pr/1636' into pr-1636
...
* syncthing/pr/1636:
fix using detect localStorage
2015-04-16 23:32:48 +09:00
Jakob Borg
6a863c8f71
Translation update
2015-04-16 23:27:27 +09:00
Jakob Borg
392b006b06
Add Moter8
2015-04-16 23:23:34 +09:00
Audrius Butkevicius
96289f42b7
Merge pull request #1644 from syncthing/timeout
...
UPnP refactor/fixes
2015-04-16 14:32:16 +01:00
Audrius Butkevicius
1b69c2441c
Make UPnP discovery requests on each interface explicitly ( fixes #1113 )
2015-04-16 14:23:36 +01:00
Audrius Butkevicius
8ca85a4918
Merge pull request #1639 from calmh/events
...
Improve event handling a little bit.
2015-04-16 14:18:52 +01:00
Audrius Butkevicius
2a31031cbc
Add unit suffix to UPnP settings
2015-04-16 10:32:22 +01:00
Audrius Butkevicius
d148cd8ccc
Make UPnP timeout configurable
2015-04-16 10:32:12 +01:00
Jakob Borg
d1cc1828b8
Improve ItemStarted/ItemFinished events
...
- Remove full details from ItemStarted (unnecessary, incorrect CamelCase)
- Add "type" ("file" or "dir") to both events
- Add "action" (what we tried to do - "delete" or "update") to both
events.
2015-04-14 23:31:39 +09:00
Jakob Borg
069e8cf122
Don't schedule summaries on all state changes
...
Prior to this change we schedule summaries on each state change, i.e.
scanning->idle and idle->scanning, which is unnecessary. Now we only do
it on index updates, plus the immediate one on going syncing->idle.
2015-04-14 20:57:42 +09:00
Audrius Butkevicius
45cbcaca6d
Merge pull request #1638 from calmh/lstat
...
Work around broken Lstat on Android
2015-04-14 11:59:20 +01:00
Jakob Borg
102a2db1f3
Work around broken Lstat on Android
2015-04-14 19:53:49 +09:00
Sergey Mishin
9f81c85ca7
fix using detect localStorage
2015-04-13 19:07:39 +03:00
Audrius Butkevicius
ba4a6fc0c5
Merge pull request #1633 from calmh/errorstate
...
Move folder errors to state
2015-04-13 00:48:13 +01:00
Jakob Borg
aa803ce2ff
Move folder errors to state
...
The "Invalid" config attribute is retained for errors discovered during
config loading (empty path, duplicate ID). This can only be set or
cleared at config loading time.
Errors discovered during runtime (I/O problems, etc) are now in the
folder state instead. Changes to these are sent as any other folder
state change.
2015-04-13 07:43:45 +09:00
Jakob Borg
a027a60f5d
Correctly feature detect localStorage ( fixes #1632 )
2015-04-13 06:50:07 +09:00
Jakob Borg
270649535e
Merge pull request #1625 from Moter8/patch-1
...
Reword and clarify some sentences.
2015-04-10 13:48:14 +02:00
Carsten H
cf80ba71f4
Reword and clarify some sentences
2015-04-10 13:46:38 +02:00
Jakob Borg
b74df18a4a
Translation update
2015-04-10 13:32:23 +02:00
Jakob Borg
5cd2906a39
Fix NICKS and authors in index.html
2015-04-10 12:57:43 +02:00
Jakob Borg
bc37b69d17
Add ARM to GUI architectures, and fallback for unknowns
2015-04-10 12:45:53 +02:00
Francois-Xavier Gsell
94f6e400ad
fix '~' completion in add folder build assets ( fix #1478 )
2015-04-10 15:42:52 +08:00
Francois-Xavier Gsell
b95a6ccf80
fix '~' completion in add folder ( fix #1478 )
2015-04-10 15:42:52 +08:00
Jakob Borg
7df9c1b6e4
Merge pull request #1621 from Zillode/fix-no-upgrade
...
Fix compilation of -noupgrade builds
2015-04-10 08:30:50 +02:00
Lode Hoste
75348c0158
Fix compilation of -noupgrade builds
2015-04-09 22:44:46 +02:00
Audrius Butkevicius
75fb14acaf
Fix integration tests
2015-04-09 16:16:39 +01:00
Audrius Butkevicius
5350315b68
Merge pull request #1614 from calmh/new-short-id
...
Index reset should generate file conflicts (fixes #1613 )
2015-04-09 13:48:37 +01:00
Audrius Butkevicius
658e39c270
Merge pull request #1618 from calmh/id-conflict
...
Check for short ID conflict at startup
2015-04-09 13:40:32 +01:00
Audrius Butkevicius
ef7ce6c7e1
Merge pull request #1619 from calmh/gui-version
...
GUI version string includes OS and Arch
2015-04-09 12:29:58 +01:00
Jakob Borg
509e2411bf
Merge pull request #1616 from syncthing/rates
...
Fix total transfer rates (fixes #1615 )
2015-04-09 13:08:49 +02:00
Jakob Borg
65c906f951
Merge pull request #1617 from syncthing/integ
...
Try capturing panics
2015-04-09 13:07:46 +02:00
Audrius Butkevicius
1f159e8233
Fix total transfer rates ( fixes #1615 )
2015-04-09 12:07:21 +01:00
Jakob Borg
936c76119d
Index reset should generate file conflicts ( fixes #1613 )
2015-04-09 13:06:09 +02:00
Jakob Borg
f45865606a
Add initial merge and reset conflict tests
2015-04-09 13:06:09 +02:00
