perso/syncthing-arm
Archived
4
0
Fork 0
Code Issues 1 Pull Requests 10 Actions Releases Wiki Activity
2,441 Commits 12 Branches 0 Tags
bb438bfb17ad4d750995e2e7859c6f9ef2018a28
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakob Borg bb438bfb17 Squashed commit of pull request #1990 
commit 4eb3ff55ba964fde84f4ac98c7304b2b883f03e1
Merge: ddb3fea a04b005
Author: Brian R. Becker <brbecker@gmail.com>
Date:   Sat Jul 11 20:45:30 2015 -0700

    Merge remote-tracking branch 'upstream/master'

commit ddb3fea0d994794375bd3a71a417240b27cb9d09
Author: Brian R. Becker <brbecker@gmail.com>
Date:   Mon Jun 22 11:36:58 2015 -0700

    Corrected spelling in GUI message
 2015-07-20 14:22:36 +02:00
Jakob Borg a11aa295de Squashed commit of pull request #1875 
commit d60fbce311414f3ade16c7b1f6525b1d02f01699
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Mon Jun 1 11:16:36 2015 +0200

    Correct order of deb files

commit 3b2ecfcc45343701ccb98483a62f70c102a70785
Merge: f4daebb c23a601
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Mon Jun 1 11:15:06 2015 +0200

    Merge github.com:syncthing/syncthing

    Conflicts:
    	build.go

commit f4daebb8510f0b40b15e404817a7799e0c3b592c
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Tue May 26 12:58:25 2015 +0200

    Add me to AUTHORS

commit 9e77f4bea01cc826132a5fbc6ca412cce5327e97
Author: Jacek Szafarkiewicz <szafar@linux.pl>
Date:   Tue May 26 12:57:40 2015 +0200

    Add systemd files to deb packate
 2015-07-20 14:18:07 +02:00
Jakob Borg 59e829e595 Translation & docs update 2015-07-19 13:34:11 +02:00
Jakob Borg 78dca5fe8b Assets & translations 2015-07-16 14:03:21 +02:00
Jakob Borg 8c816f64e4 Merge pull request #2064 from uok/infotext 
Improve info text for device addresses (fixes #2044)
 2015-07-16 14:02:35 +02:00
Jakob Borg f3f6b03d85 Don't let folder ID escape into HTML tag ID:s (fixes #2059) 2015-07-16 08:13:10 +02:00
Jakob Borg 8fab7ec5e3 Decrease timing sensitivity of ignore.TestCache 2015-07-14 12:12:57 +02:00
Jakob Borg 50eb968109 Merge pull request #2060 from brgmnn/master 
Added select-on-click for remote 'Device ID' and 'API Key'
 2015-07-14 10:55:32 +02:00
Jakob Borg 909d60464e Revert "Merge pull request #2053 from calmh/atomicwriter" (fixes #2058) 
This reverts commit b611f72e08, reversing
changes made to a04b005e93.
 2015-07-13 12:47:32 +02:00
Jakob Borg d855abf8b0 Translation & docs update 2015-07-13 08:24:04 +02:00
Jakob Borg 44e3bec42e Add osutil.AtomicWriter 
This captures the common pattern of writing to a temp file and moving it
to it's real name only if everything went well. It reduces the amount of
code in some places where we do this, but maybe not as much as I
expected because the upgrade thing is still a special snowflake...
 2015-07-12 14:28:59 +10:00
Jakob Borg a04b005e93 Revert "Let suture logging bubble upwards" 
This reverts commit 1b837116e6.
 2015-07-11 11:12:20 +10:00
Jakob Borg 1b837116e6 Let suture logging bubble upwards 2015-07-11 10:52:57 +10:00
Jakob Borg d16b04b683 Protocol dep update because I screwed up previous one 2015-07-10 19:58:56 +10:00
Jakob Borg 0c28216ee5 Make sure connection is added to m.protoConn and m.rawConn before it's Start()ed (fixes #2034) 2015-07-10 16:43:41 +10:00
Jakob Borg 5bb8ea7449 Remove one of two emits of events.DeviceConnected (ref #2034) 2015-07-10 16:12:59 +10:00
Jakob Borg b78c515724 Debug output on request errors 2015-07-10 16:01:10 +10:00
Jakob Borg bc0ce7b820 launchd: Log to files 2015-07-06 21:45:49 +02:00
Jakob Borg 1da3a57fe7 Asset rebuild 2015-07-05 19:44:55 +02:00
Jakob Borg 8697982302 Add canton7 2015-07-05 19:44:19 +02:00
Jakob Borg c4168cf855 Merge pull request #2030 from canton7/feature/issue-2029 
Use bootstrap grid instead of column-count:3 for aligning checkboxes (fixes #2029)
 2015-07-05 19:41:44 +02:00
Jakob Borg 57a5d13c47 Translation and docs update 2015-07-05 11:24:21 +02:00
Jakob Borg 500b96240b Don't show Failed Items on folder masters 2015-07-05 11:21:15 +02:00
Jakob Borg 13d961d41d Correctly show Override button when out of sync 2015-07-05 11:20:59 +02:00
Jakob Borg fddc4c2fc0 Rebuild assets 2015-07-05 11:13:35 +02:00
Jakob Borg 061ec7369f Merge pull request #2027 from calmh/bootstrap 
Update bootstrap
 2015-07-05 11:07:13 +02:00
Jakob Borg 8366dbd8e0 Add link to home page (fixes #1993, fixes #1999) 2015-07-05 11:06:29 +02:00
Jakob Borg b02047e4b5 Update Bootstrap 3.1.0 -> 3.3.5 2015-07-05 11:05:38 +02:00
Jakob Borg e9545c4961 Merge pull request #2022 from brgmnn/master 
Preserve setgid bit on local directores (fixes #2012)
 2015-07-04 19:37:21 +02:00
Jakob Borg dec6540967 Implement "advanced configuration" dialog (fixes #2010) 2015-07-04 13:47:43 +02:00
Jakob Borg e9e13474c9 Merge pull request #2021 from brgmnn/master 
Fixed add device button being overlapped by footer (fixes #1950)
 2015-07-03 08:56:33 +02:00
Jakob Borg 76822c7c34 Merge pull request #2018 from brgmnn/master 
Added select ID text on click to gui
 2015-07-02 11:01:37 +02:00
Jakob Borg 60004ebff1 Show FolderErrors result in UI (fixes #1437) 2015-06-30 14:41:48 +02:00
Jakob Borg 2d9fcf6828 Collect puller errors, send FolderErrors event 2015-06-30 14:41:47 +02:00
Jakob Borg c8ac9721d7 Translation and docs update 2015-06-28 21:10:57 +02:00
Jakob Borg ca21db9481 Merge pull request #2006 from AudriusButkevicius/timeout 
Make ping timeout configurable (fixes #1751)
 2015-06-28 07:45:02 +02:00
Jakob Borg 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
Jakob Borg 070eced2f6 Merge pull request #1985 from calmh/fix-reset 
Fix reset DB
 2015-06-24 14:07:15 +02:00
Jakob Borg 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
Jakob Borg 2463819a3d Update translations and docs 2015-06-21 11:45:54 +02:00
Jakob Borg 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
Jakob Borg f73d5a9ab2 Serialize scans and pulls (fixes #1391) 2015-06-20 23:01:40 +02:00
Jakob Borg 4eb0e24c6e Sanitize rescan interval values (fixes #1978) 2015-06-20 23:01:30 +02:00
Jakob Borg 1d2235abe7 Model must be running for tests 2015-06-20 23:00:33 +02:00
Jakob Borg d347e54acb Don't start model until services have been added (fixes #1969) 2015-06-20 20:04:47 +02:00
Jakob Borg b5198d8119 Merge pull request #1968 from calmh/newtests 
Refactored integration tests
 2015-06-20 19:24:04 +02:00
Jakob Borg b8b5c5ff34 Merge pull request #1913 from Zillode/fix-reset 
Fix 'reset' Rest API on windows
 2015-06-20 11:43:05 +02:00
Jakob Borg a738490a3b Update translation strings 2015-06-20 11:40:05 +02:00
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
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
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
Jakob Borg 7767746d3e Incorrect error condition on shortcuts 2015-06-18 11:55:43 +02: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
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
Jakob Borg ad220d61f9 Merge pull request #1951 from AudriusButkevicius/voodoo 
Voodoo
 2015-06-15 11:31:03 +02: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
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
Jakob Borg a778763851 Add trash can file versioning (fixes #1931) 2015-06-12 13:30:49 +02: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
Jakob Borg 5c49b93c67 Links are nice, too 2015-06-10 00:04:53 +02:00
Jakob Borg 9a11f81fd3 Point to contribution guidelines and docs 2015-06-10 00:02:39 +02:00
Jakob Borg 76ad925842 Refactor config commit stuff to support restartless updates better 
Includes restartless updates of the GUI settings (listening port etc) as
a proof of concept.
 2015-06-09 15:41:22 +02:00
Jakob Borg ef6f52f688 Correctly handle nil error in verbose logging (fixes #1921) 2015-06-09 09:04:03 +02:00
Jakob Borg 145f8c7435 Start folders before GUI/API (fixes #1918) 2015-06-08 11:04:09 +02:00
Jakob Borg a8b43ae598 Translation / docs update 2015-06-07 12:57:26 +02:00
Jakob Borg 5cd4cd2271 Merge pull request #1912 from AudriusButkevicius/warnings 
Silence discovery warnings (fixes #1388)
 2015-06-04 19:29:42 +02:00
Jakob Borg 5f4a92c8e6 Correct link 2015-06-03 19:47:39 +02:00
Jakob Borg ccf3fed950 Merge remote-tracking branch 'syncthing/pr/1911' 
* syncthing/pr/1911:
  replaced (not all) wiki links to new location docs.syncthing.net
 2015-06-03 19:24:30 +02:00
Jakob Borg c1761cab49 Trigger ItemFinished when temp file creation fails instead of failing silently 2015-06-03 16:28:31 +02:00
Jakob Borg 25b25b5434 Merge pull request #1885 from AudriusButkevicius/moar-checks 
Additional cases for detecting folders disappearing
 2015-06-03 08:40:21 +02:00
Jakob Borg 8bdf66d9c0 Merge pull request #1906 from ralder/fix-style-top-menu-for-small-devices 
fix language menu for small screen devices
 2015-06-03 08:38:40 +02:00
Jakob Borg e952da7f91 Ensure we always have an up to date list of language names 2015-06-02 08:47:26 +02:00
Jakob Borg 5bd1e4a167 Re-add mistakenly removed languages 2015-06-02 08:33:36 +02:00
Jakob Borg 6d3de41751 Merge pull request #1905 from ralder/fix-missing-languages 
fix missing languages (fixes #1902)
 2015-06-02 08:12:06 +02:00
Jakob Borg c23a601cc6 Random number is too large for 32 bit archs (fixes #1894) 2015-06-01 09:33:13 +02:00
Jakob Borg 36d4c69fd6 Translation update 2015-05-31 09:37:02 +02:00
Jakob Borg ca7e7fa0c4 Docs link, capitalization 2015-05-31 09:35:17 +02:00
Jakob Borg 1f6dd5dbb9 Add man pages to Debian package 2015-05-30 13:11:17 +02:00
Jakob Borg db52646655 Include generated man pages 2015-05-30 13:05:55 +02:00
Jakob Borg 8bb18fa988 Create 'prerelease' step to run before releases 2015-05-30 10:39:27 +02:00
Jakob Borg f0edaf2f8c Merge pull request #1884 from calmh/helplink 
Show help link, add icons, tweak icon spacing
 2015-05-30 10:32:16 +02:00
Jakob Borg d632e3aa1b Show help link, add icons, tweak icon spacing 2015-05-30 10:31:45 +02:00