perso/syncthing-arm
Archived
4
0
Fork 0
Code Issues 1 Pull Requests 10 Actions Releases Wiki Activity
2,534 Commits 12 Branches 0 Tags
a84b6b4bccf7bb6b880efe92e22775b2ac34144f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakob Borg a84b6b4bcc Merge pull request #2145 from uok/awesome 
Change to Font Awesome icon font (fixes #2138)
 2015-08-14 09:11:14 +02:00
Jakob Borg 99736e5066 Ensure dir before files ordering when scanning 2015-08-13 13:01:50 +02:00
Jakob Borg 681306b7a1 Clean up the scripts a bit (...) 
- Move the Go files into script/ instead of random places
- Rewrite check-contrib.sh into check-authors.go and check-copyright.go
- Clean up build.sh a little bit
 2015-08-13 12:35:26 +02:00
Jakob Borg 5f36c9d4de Merge pull request #2152 from Zillode/fix-gui-reorg 
Revert small changes made during reorg GUI
 2015-08-12 21:47:25 +02:00
Jakob Borg c08de67b0d Remove erroneous file 2015-08-11 17:05:59 +02:00
Jakob Borg a2f73a7d35 Allow specifying Docker image to use for building 2015-08-09 14:40:18 +02:00
Jakob Borg 1492e57676 Minor typo in UPnP service description list 2015-08-09 14:14:13 +02:00
Jakob Borg 7504fc53b6 Merge branch 'v0.11' 
* v0.11:
  Translations and docs update
  Enable browser caching of static resources
  Handle multiple case insensitivity prefixes in ignores (fixes #2134)
  Make rescan available for unshared folders
  Add timeout for peek (fixes #1035)
  Fix TestReset when Syncthing shuts down too fast
  Clarify password in integration tests
  Properly rename config files during integration tests (fixes #1769)
 2015-08-09 11:58:18 +02:00
Jakob Borg daa2bcefad Translations and docs update 2015-08-09 11:56:22 +02:00
Jakob Borg 49aa9399be Repair config tests 2015-08-09 11:46:28 +02:00
Jakob Borg a71090df81 Enable browser caching of static resources 
This sends the Cache-Control header to allow caching of static resources,
and checks the If-Modified-Since header to allow browser to use the
cached resource on refresh.
 2015-08-09 11:36:06 +02:00
Jakob Borg 0bfcafc5c6 Handle multiple case insensitivity prefixes in ignores (fixes #2134) 2015-08-09 11:35:12 +02:00
Jakob Borg 2bcb57c994 Merge branch 'pr-2066' 
* pr-2066:
  Configurable home disk percentage, translations
  Add minimum disk free percentage to GUI
  Stop folder when running out of disk space (fixes #2057)
 2015-08-09 10:38:33 +02:00
Jakob Borg a2df691c7d Configurable home disk percentage, translations 2015-08-09 10:37:23 +02:00
Jakob Borg 6a58033f2b Merge pull request #2124 from calmh/go15 
Updates for Go 1.5
 2015-08-09 09:37:09 +02:00
Jakob Borg 7705a6c1f1 mv internal lib 2015-08-09 09:35:26 +02:00
Jakob Borg 0a803891a4 Updates for Go 1.5 2015-08-09 09:35:25 +02:00
Jakob Borg 7d620a93b9 Merge pull request #2141 from kamadak/fix-setting-addrlist 
Fix editing address lists in the Settings dialog.
 2015-08-09 09:11:30 +02:00
Jakob Borg 257d1afdf8 Enable browser caching of static resources 
This sends the Cache-Control header to allow caching of static resources,
and checks the If-Modified-Since header to allow browser to use the
cached resource on refresh. Also fixes some paths that caused redirects
(core//foo -> core/foo)
 2015-08-08 13:50:18 +02:00
Jakob Borg e312fdd4f8 Handle multiple case insensitivity prefixes in ignores (fixes #2134) 2015-08-08 11:58:20 +02:00
Jakob Borg 9b6681d543 Use grid instead of three-column (fixes #2130) 2015-08-08 11:37:19 +02:00
Jakob Borg bcc04623c1 Fix editing device address (fixes #2129) 2015-08-08 11:29:13 +02:00
Jakob Borg d75d162058 Merge pull request #2126 from AudriusButkevicius/peek 
Add timeout for peek (fixes #1035)
 2015-08-07 17:30:54 +02:00
Jakob Borg dd64ba1910 Merge pull request #2116 from Zillode/fix-test-reset 
Fix TestReset when Syncthing shuts down too fast
 2015-08-05 09:47:23 +02:00
Jakob Borg 82a5d1cd79 Merge pull request #2108 from Zillode/fix-delete-button 
Rename 'delete' to 'remove' (fixes #1007)
 2015-08-05 09:34:27 +02:00
Jakob Borg c26c172d01 Merge pull request #2103 from Zillode/fix-integration-rename-windows 
Fix integration rename windows
 2015-08-05 08:59:53 +02:00
Jakob Borg b1dd704819 Rebuild assets 2015-08-02 09:41:22 +02:00
Jakob Borg 9513e91d66 Flatten GUI tree somewhat 
The very deep tree structure didn't really aggree with me, sorry. This
makes the core module rather large, but on the other hand that just
highlights that it is rather large.
 2015-08-02 09:24:01 +02:00
Jakob Borg 19451e0654 Translation and docs update 2015-08-02 09:19:32 +02:00
Jakob Borg fa922d7792 Send index immediately on local change 2015-08-02 08:08:24 +02:00
Jakob Borg bbe1de3119 Merge pull request #2100 from AudriusButkevicius/memory 
Use protocol provided buffer for requests (fixes #1157)
 2015-08-02 08:07:52 +02:00
Jakob Borg f87e9b596d Merge pull request #2106 from Zillode/scan-deletes 
Reduce scanning effort
 2015-08-02 07:42:39 +02:00
Jakob Borg 917e12952e Merge pull request #2109 from Zillode/update-credits 
Update credits for dependencies (fixes #2082)
 2015-08-02 07:25:45 +02:00
Jakob Borg 5a2db802d9 Fix TestReset 2015-07-28 21:31:01 +04:00
Jakob Borg d3972b88f2 Remove set.ReplaceWithDelete (dead code) 2015-07-28 21:09:43 +04:00
Jakob Borg a5f6e3bba0 Update translations and docs 2015-07-26 11:25:40 +02:00
Jakob Borg d170660c25 Usage -> Statistics 2015-07-24 12:04:16 +02:00
Jakob Borg 1acfa291a0 Link to usage data (ref syncthing/website#17) 2015-07-24 08:53:33 +02:00
Jakob Borg 21accd534c Add folders without restart (fixes #2063) 2015-07-24 08:20:57 +02:00
Jakob Borg 319abebd70 Update all dependencies 2015-07-22 12:09:44 +02:00
Jakob Borg 76480adda5 Add devices without restart (fixes #2083) 2015-07-22 10:43:47 +02:00
Jakob Borg e205f8afbb Don't error integration tests on unexpected EOF at Stop() 2015-07-22 10:43:33 +02:00
Jakob Borg 12eab4a8ba Optionally ignore remote deletes (fixes #1254) 2015-07-21 20:39:19 +02:00
Jakob Borg da4ebb6535 Determine conflict winner based on change type and modification time (fixes #1848) 2015-07-21 15:39:20 +02:00
Jakob Borg 6e4d33c741 Don't run tests with audit on 2015-07-20 15:46:14 +02:00
Jakob Borg d3387e2a28 Make sure CPU profile actually gets written before exiting 2015-07-20 15:34:40 +02:00
Jakob Borg 491452a19d Improve performance for syncing many small files quickly 
Without this, as soon as we'd touched 1000 files in the last minute
(which can happen), we got stuck doing cache cleaning all the time,
burning a lot of CPU time.
 2015-07-20 15:30:44 +02:00
Jakob Borg 7d3257b222 Use soft shutdown when running tests 2015-07-20 15:05:15 +02:00
Jakob Borg 1836ef2884 Squashed commit of pull request #1981 
Conflicts:
	gui/scripts/syncthing/core/controllers/syncthingController.js
	internal/auto/gui.files.go
 2015-07-20 14:48:03 +02:00
Jakob Borg 43d6322d0f Merge pull request #2061 from calmh/atomicwriter 
Add osutil.AtomicWriter (take two)
 2015-07-20 14:27:36 +02:00
Jakob Borg f0684d83e9 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-20 14:27:14 +02:00
Jakob Borg 3f3170818d Merge pull request #2072 from dva/patch-1 
Double curly brace notation displaying
 2015-07-20 14:25:27 +02:00
Jakob Borg 7683096fe1 Add dva 2015-07-20 14:25:07 +02:00
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