Jakob Borg
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
Jakob Borg
cb2c0e7ac5
Add fti7
2015-06-20 11:32:55 +02:00
Frank Isemann
510d309b8a
Display Local State Summary (All Folders)
2015-06-19 21:52:19 +02:00
Jakob Borg
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
Jakob Borg
cfe24ecdd9
Add wsgcsysadmin
2015-06-19 08:50:36 +02:00
Jakob Borg
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
Jakob Borg
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
Lode Hoste
a0897a7456
Corrected API response when resetting folder ( fixes #1976 )
2015-06-19 08:30:19 +02:00
WSGCSysadmin
c50ba9267c
Put thisDeviceName first in page title
2015-06-18 10:53:37 -05:00
Jakob Borg
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
Lode Hoste
b56c76f8ad
Fix 'reset' Rest API on windows
2015-06-18 12:45:08 +02:00
Lode Hoste
cb2d2f000f
Set default pull order in webGUI
2015-06-18 12:42:00 +02:00
Audrius Butkevicius
69af77a3bd
Merge pull request #1967 from calmh/woops
...
Incorrect error condition on shortcuts
2015-06-18 11:07:07 +01:00
Jakob Borg
7767746d3e
Incorrect error condition on shortcuts
2015-06-18 11:55:43 +02:00
Audrius Butkevicius
7219aaeb89
Merge pull request #1966 from calmh/overrideevents
...
Generate LocalIndexUpdated events in Override
2015-06-18 10:17:38 +01:00
Jakob Borg
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
Jakob Borg
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
Audrius Butkevicius
12a3086a9e
Add label next to "Last file received" ( fixes #1952 )
2015-06-16 12:12:34 +01:00
Audrius Butkevicius
198725216f
Merge pull request #1957 from calmh/myid
...
Include myID in the StartupComplete event
2015-06-16 08:46:50 +01:00
Audrius Butkevicius
08647f1267
Merge pull request #1956 from calmh/earlyevents
...
Fix API event subscription
2015-06-16 08:46:29 +01:00
Audrius Butkevicius
87811efc30
Merge pull request #1955 from calmh/localver
...
Add version to LocalIndexUpdate event.
2015-06-16 08:45:09 +01:00
Jakob Borg
82c3e6f87f
Include myID in the StartupComplete event
...
Nice to have...
2015-06-16 09:27:06 +02:00
Jakob Borg
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
Jakob Borg
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
Jakob Borg
a6d9150b14
Skip extra newline between assets
2015-06-15 23:13:43 +02:00
Jakob Borg
7e5197c566
Help link for folder master
2015-06-15 22:34:39 +02:00
Jakob Borg
2d217e72bd
Dependency update
2015-06-15 21:10:33 +02:00
Jakob Borg
12331cc62b
Merge pull request #1943 from ralder/webgui-events-in-service
...
webgui: moved events controller to events service
2015-06-15 20:33:27 +02:00
Sergey Mishin
2449f1e1b6
webgui: moved events controller to events service
2015-06-15 19:05:46 +03:00
Audrius Butkevicius
6a6593c656
Merge pull request #1948 from calmh/symwarning
...
Dont warn about irrelevant symlinks, print path to culprit (ref #1945 )
2015-06-15 10:41:51 +01:00
Jakob Borg
ad220d61f9
Merge pull request #1951 from AudriusButkevicius/voodoo
...
Voodoo
2015-06-15 11:31:03 +02:00
Audrius Butkevicius
1e35383b4d
Merge pull request #1947 from calmh/metadata
...
Differentiate between content and metadata updates in ItemStarted/ItemFinished
2015-06-15 10:26:09 +01:00
Audrius Butkevicius
c8457ab005
Voodoo
2015-06-15 10:22:44 +01:00
Jakob Borg
070a308217
Dont warn about irrelevant symlinks, print path to culprit (ref #1945 )
...
This skips the warning about "unsupported symlinks" for invalid or
deleted symlinks (and as a side effect also accepts them into the index,
which should be fine). It also prints the affected file paths to the
log. This should be in the hypothetical list of "errored files" we
should present instead of the cryptic "puller stopped" message in the
future...
2015-06-15 00:47:13 +02:00
Jakob Borg
c1f4477376
ItemStarted can be map[string]string
2015-06-14 22:59:21 +02:00
Jakob Borg
d728320ece
New ItemStart/Finished type 'metadata' for shortcut updates
2015-06-14 22:56:41 +02:00
Audrius Butkevicius
fee0d7168a
Merge pull request #1946 from calmh/guiassets
...
Default GUI override dir
2015-06-14 21:40:56 +01:00
Jakob Borg
7c23b32de3
Default GUI override dir
...
If STGUIASSETS is not set, look for assets in $confdir/gui by default.
Simplifies deploying overrides and stuff.
2015-06-14 22:28:40 +02:00
Jakob Borg
1437952aee
Translation and docs update
2015-06-14 13:52:00 +02:00
Jakob Borg
a162157301
Add translation strings for trash can versioning
2015-06-14 11:08:25 +02:00
Audrius Butkevicius
6316bf3582
Merge pull request #1941 from AudriusButkevicius/errors
...
Correctly set and clear errors for missing folders (fixes #1937 )
2015-06-13 23:47:20 +01:00
Audrius Butkevicius
1d856b4723
Correctly set and clear errors for missing folders ( fixes #1937 )
2015-06-13 23:45:54 +01:00
Audrius Butkevicius
7f56d5c23a
Merge pull request #1935 from calmh/trashcan
...
Add trash can file versioning (fixes #1931 )
2015-06-12 13:20:37 +01:00
Jakob Borg
a778763851
Add trash can file versioning ( fixes #1931 )
2015-06-12 13:30:49 +02:00
Audrius Butkevicius
983d7ec265
Merge pull request #1933 from calmh/fix-1907
...
More resilient broadcast handling (fixes #1907 )
2015-06-11 14:59:31 +01:00
Jakob Borg
297769ef57
More resilient broadcast handling ( fixes #1907 )
...
My theory is that some error condition on the socket results in it
blocking for writes, which maybe also blocks reads... This separates the
two into separate services with their own socket, with restarts and
retries as appropriates on write timeouts and read/write errors. It
should be more robust, hopefully, but I have a hard time testing the
actual error conditions...
2015-06-11 15:06:05 +02:00
Jakob Borg
885d050e5f
Correct docs site link
2015-06-11 14:24:39 +02:00
Jakob Borg
8fb4ce6cad
Merge pull request #1927 from ralder/patch-1
...
fix disappeared status of folder after restart syncthing
2015-06-11 08:47:53 +02:00
Jakob Borg
42738ab54d
Add missing copyright notice
2015-06-11 08:46:57 +02:00
ralder
7d1250620e
fix disappeared status of folder after restart syncthing
...
sometimes after restart process syncthing '/rest/db/status' for folder may return data with 'state' = empty string
2015-06-10 16:48:16 +03:00
