b1b68b58fe
Update protocol package
2015-06-28 11:40:53 +01:00
ca21db9481
Merge pull request #2006 from AudriusButkevicius/timeout
...
Make ping timeout configurable (fixes #1751 )
2015-06-28 07:45:02 +02:00
93ad803073
Make ping timeout configurable ( fixes #1751 )
2015-06-27 12:34:41 +01:00
6cc7f70a65
Update protocol package
2015-06-27 12:07:42 +01:00
2b0c33f74d
Merge pull request #1996 from AudriusButkevicius/checkrace
...
Potential race between folder being added and scan (fixes #1986 )
2015-06-26 12:56:07 +02:00
dae1d36a23
Trim string slices upon loading config ( fixes #1750 )
2015-06-25 16:50:27 +01:00
824fa8f17a
Fix go lint warnings
2015-06-24 22:05:27 +01:00
31cd0b943c
Potential race between folder being added and scan (potentially fixes #1986 )
2015-06-24 21:59:03 +01:00
070eced2f6
Merge pull request #1985 from calmh/fix-reset
...
Fix reset DB
2015-06-24 14:07:15 +02:00
986f8dfb2e
Remove dead variable
2015-06-24 08:43:33 +01:00
8c0c03eb38
Merge pull request #1989 from AudriusButkevicius/session
...
Use different session cookies per device
2015-06-23 13:56:14 +01:00
fd9bc20bc5
Merge pull request #1988 from calmh/dups
...
Don't rename duplicate folders (fixes #1675 )
2015-06-23 11:17:30 +01:00
089fca2319
Use different session cookies per device
2015-06-22 19:51:46 +01:00
e936890927
Don't rename duplicate folders ( fixes #1675 )
...
Renaming them puts the user in a difficult situation as they can't
rename them back in the GUI. This way, they need to fix the config in
the same way it got broken (manual editing or external tool).
2015-06-22 11:27:47 +02:00
0450d48f89
Merge pull request #1856 from calmh/fix-1391
...
Serialize scans (fixes #1391 )
2015-06-21 14:26:17 +02:00
2463819a3d
Update translations and docs
2015-06-21 11:45:54 +02:00
2b2cae2d50
Fix reset DB
...
The reset of all folders failed when there was no data for a given
folder, as it was not returned by db.ListFolders then. But we don't
really care about that, we can "reset" it anyway...
2015-06-21 09:35:41 +02:00
0f1b40da71
Merge pull request #1982 from calmh/fix-1978
...
Sanitize rescan interval values (fixes #1978 )
2015-06-20 23:28:18 +02:00
f73d5a9ab2
Serialize scans and pulls ( fixes #1391 )
2015-06-20 23:01:40 +02:00
4eb0e24c6e
Sanitize rescan interval values ( fixes #1978 )
2015-06-20 23:01:30 +02:00
1d2235abe7
Model must be running for tests
2015-06-20 23:00:33 +02:00
d347e54acb
Don't start model until services have been added ( fixes #1969 )
2015-06-20 20:04:47 +02:00
b5198d8119
Merge pull request #1968 from calmh/newtests
...
Refactored integration tests
2015-06-20 19:24:04 +02:00
b8b5c5ff34
Merge pull request #1913 from Zillode/fix-reset
...
Fix 'reset' Rest API on windows
2015-06-20 11:43:05 +02:00
a738490a3b
Update translation strings
2015-06-20 11:40:05 +02:00
54a8de2059
Merge remote-tracking branch 'syncthing/pr/1979'
...
* syncthing/pr/1979:
Display Local State Summary (All Folders)
2015-06-20 11:39:31 +02:00
cb2c0e7ac5
Add fti7
2015-06-20 11:32:55 +02:00
510d309b8a
Display Local State Summary (All Folders)
2015-06-19 21:52:19 +02:00
a7ce2a7aa5
Merge pull request #1963 from wsgcsysadmin/master
...
Put thisDeviceName first in page tile to make small browser tabs distinguishable
2015-06-19 08:51:24 +02:00
cfe24ecdd9
Add wsgcsysadmin
2015-06-19 08:50:36 +02:00
c5e9cb025c
Merge pull request #1977 from Zillode/fix-1976
...
Corrected API response when resetting folder (fixes #1976 )
2015-06-19 08:48:40 +02:00
c3d07d60ca
Refactored integration tests
...
Added internal/rc to remote control a Syncthing process and made the
"awaiting sync" determination reliable.
2015-06-19 08:47:47 +02:00
a0897a7456
Corrected API response when resetting folder ( fixes #1976 )
2015-06-19 08:30:19 +02:00
c50ba9267c
Put thisDeviceName first in page title
2015-06-18 10:53:37 -05:00
423e69916c
Merge pull request #1962 from Zillode/fix-pull-order-gui
...
Set default pull order in webGUI
2015-06-18 16:51:10 +02:00
b56c76f8ad
Fix 'reset' Rest API on windows
2015-06-18 12:45:08 +02:00
cb2d2f000f
Set default pull order in webGUI
2015-06-18 12:42:00 +02:00
69af77a3bd
Merge pull request #1967 from calmh/woops
...
Incorrect error condition on shortcuts
2015-06-18 11:07:07 +01:00
7767746d3e
Incorrect error condition on shortcuts
2015-06-18 11:55:43 +02:00
7219aaeb89
Merge pull request #1966 from calmh/overrideevents
...
Generate LocalIndexUpdated events in Override
2015-06-18 10:17:38 +01:00
7af1863e81
Generate LocalIndexUpdated events in Override
...
The override should look like we detected the changes locally, or the
GUI and other things won't update correctly.
This is/was caught by the Override integration test, on my newly
refactored integration test suite which is soon ready for prime time, so
a test is coming. :)
2015-06-18 10:49:24 +02:00
4beb42bf45
Merge pull request #1959 from AudriusButkevicius/lastfile
...
Add label next to "Last file received" (fixes #1952 )
2015-06-18 10:45:27 +02:00
12a3086a9e
Add label next to "Last file received" ( fixes #1952 )
2015-06-16 12:12:34 +01:00
198725216f
Merge pull request #1957 from calmh/myid
...
Include myID in the StartupComplete event
2015-06-16 08:46:50 +01:00
08647f1267
Merge pull request #1956 from calmh/earlyevents
...
Fix API event subscription
2015-06-16 08:46:29 +01:00
87811efc30
Merge pull request #1955 from calmh/localver
...
Add version to LocalIndexUpdate event.
2015-06-16 08:45:09 +01:00
82c3e6f87f
Include myID in the StartupComplete event
...
Nice to have...
2015-06-16 09:27:06 +02:00
1ac40a3043
Fix API event subscription
...
The API never got the first few events ("Starting" etc) as it subscribed
too late. Instead, set up a subscription for it early on. If the API is
configured not to run this is unnecessary but doesn't hurt very much.
2015-06-16 09:17:58 +02:00
127b0c3332
Add version to LocalIndexUpdate event.
...
Allows correlating LocalIndexUpdate events on one device with RemoteIndexUpdated on another to make sure the cluster has converged.
2015-06-16 08:30:15 +02:00
a6d9150b14
Skip extra newline between assets
2015-06-15 23:13:43 +02:00
Audrius Butkevicius
Jakob Borg
Zillode
Frank Isemann
WSGCSysadmin