felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity
3,300 Commits 9 Branches 685 Tags
458e0b3b8b1c34f1a3faf80a83c95f7b0c8d8d13
Commit Graph
3300 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakob Borg 458e0b3b8b Merge branch 'master' into v0.12 
* master:
  Update docs and translations
  Model.internalScanFolder: Don't ignore special .stfolder and .stignore files.
  Model.internalScanFolderSubs: Scan only requested subs.
  A couple of protocol tests
  Humanize serialization of version vectors (again)
  FetchLatestReleases: fix the error log message
  Add postinst script to restart after upgrade
  Templatize Debian files
  Don't require restart for usage reporting changes (fixes #2704)
  RLimit comment typo
v0.12.16 		2016-01-24 08:09:28 +01:00
Jakob Borg 9758dc6422 Update docs and translations 2016-01-24 08:08:08 +01:00
Jakob Borg cc5f93e717 Merge pull request #2724 from plouj/master 
rest/db/scan: Only scan the requested subdirectories/files.
 2016-01-22 21:03:23 -08:00
Michael Ploujnikov 49601a63c8 Model.internalScanFolder: Don't ignore special .stfolder and .stignore files. 
Fixes #2151.

Since Walk.walkAndHashFiles ignores .stfolder and .stignore, they will
never be found by fs.Get(protocol.LocalDeviceID, sub) in
Model.internalScanFolder. As a result, when asked to scan those subs
we end up scanning the whole folder.
 2016-01-22 23:27:47 -05:00
Michael Ploujnikov 6c33188af3 Model.internalScanFolderSubs: Scan only requested subs. 
This reverts the change introduced in 9b9fe0d Reduce scanning effort.
That commit caused us to automatically ignore the basename of the
specified subs and instead scan closest known root folder. For
example, in a folder that looks like:

Sync/
├── 00
│   ├── one
│   ├── three
│   └── two
├── 01
│   ├── one
│   ├── three
│   └── two
├── 02
│   ├── one
│   ├── three
│   └── two
└── one

calling '/rest/db/scan?folder=default&sub=01' called filepath.Walk on
the whole Sync/ folder instead of just the desired subfolder. This
contradicts the scan behavior promised by the documentation.

This is related to #2151.
 2016-01-22 23:27:38 -05:00
Jakob Borg 1353e3916f A couple of protocol tests 2016-01-20 11:37:48 -08:00
Jakob Borg 11d4986517 Humanize serialization of version vectors (again) 2016-01-20 11:14:08 -08:00
Audrius Butkevicius e267bf3e09 Merge pull request #2715 from plouj/master 
FetchLatestReleases: fix the error log message
 2016-01-20 08:41:52 +00:00
Michael Ploujnikov 39c5c8c1d1 FetchLatestReleases: fix the error log message 2016-01-19 21:32:33 -05:00
Jakob Borg 6cce073da5 Merge pull request #2713 from calmh/debrestart 
Restart on Debian package upgrade
 2016-01-19 10:20:47 -08:00
Jakob Borg 99372c69e5 Add postinst script to restart after upgrade 2016-01-19 10:13:45 -08:00
Jakob Borg 042b703fe4 Templatize Debian files 2016-01-19 10:06:16 -08:00
Audrius Butkevicius 1880284bde Merge pull request #2711 from calmh/fix2704 
Don't require restart for usage reporting changes (fixes #2704)
 2016-01-18 18:12:58 +00:00
Jakob Borg 6c1faa4bdb Don't require restart for usage reporting changes (fixes #2704) 2016-01-18 10:06:31 -08:00
Jakob Borg e4a9fb8a27 Merge master into v0.12 (no changes) 2016-01-17 22:13:34 +01:00
Audrius Butkevicius 33f97d7d8f Merge pull request #2708 from Zillode/fix-typo 
RLimit comment typo
 2016-01-17 12:06:47 +00:00
Lode Hoste 82e033942e RLimit comment typo 
Thanks @plouj
 2016-01-17 12:54:44 +01:00
Jakob Borg f0473fde17 Docs and translations update v0.12.15 2016-01-17 10:57:20 +01:00
Jakob Borg e2980a5210 Don't crash on folder remove while pulling (fixes #2705) 2016-01-17 10:55:39 +01:00
Jakob Borg 764da14440 Improve API/GUI shutdown handling (fixes #2694) 
This fixes both a race condition where we could assign s.stop from one
goroutine and then read it from another without locking, and handles the
fact that listener may be nil at shutdown if we've had a bad
CommitConfiguration call in the meantime.
 2016-01-17 10:55:26 +01:00
Audrius Butkevicius 7da6c627fe Handle race within the job queue (fixes #1263) 2016-01-17 10:55:19 +01:00
Jakob Borg 0a092b5b7f Codesign binaries in Mac OS X distribution packages 2016-01-17 10:54:42 +01:00
Audrius Butkevicius 693e1c93f1 Merge pull request #2707 from calmh/notok 
The "OK" log level is silly and should not exist
 2016-01-16 22:21:06 +00:00
Jakob Borg 2919b76947 The "OK" log level is silly and should not exist 2016-01-16 23:04:41 +01:00
Audrius Butkevicius 42b94561a2 Merge pull request #2706 from calmh/fix2705 
Don't crash on folder remove while pulling (fixes #2705)
 2016-01-16 20:54:43 +00:00
Jakob Borg acaf134dfe Don't crash on folder remove while pulling (fixes #2705) 2016-01-16 21:42:32 +01:00
Jakob Borg ab9109e0dc Only print codesign success if we tried to codesign 2016-01-16 19:59:01 +01:00
Audrius Butkevicius f88b2c11fe Merge pull request #2702 from calmh/codesign 
Codesign binaries in Mac OS X distribution packages
 2016-01-16 18:57:46 +00:00
Jakob Borg d5d330413b Codesign binaries in Mac OS X distribution packages 2016-01-16 19:50:04 +01:00
Jakob Borg 61d7e11001 Merge pull request #2701 from AudriusButkevicius/raceee 
Handle race while in the job queue (fixes #1263)
 2016-01-16 18:59:50 +01:00
Audrius Butkevicius c4c6df179b Handle race within the job queue (fixes #1263) 2016-01-16 17:20:21 +00:00
Audrius Butkevicius b04b7bf357 Merge pull request #2696 from calmh/fix2694 
Improve API/GUI shutdown handling (fixes #2694)
 2016-01-14 10:38:06 +00:00
Jakob Borg 97b1c66d4a Improve API/GUI shutdown handling (fixes #2694) 
This fixes both a race condition where we could assign s.stop from one
goroutine and then read it from another without locking, and handles the
fact that listener may be nil at shutdown if we've had a bad
CommitConfiguration call in the meantime.
 2016-01-14 11:06:36 +01:00
Jakob Borg 74a210f198 Fix asset locations in one more place 2016-01-13 21:11:46 +01:00
Jakob Borg 9f8af2327d Update docs & translations v0.12.13 v0.12.14 2016-01-13 21:11:02 +01:00
kluppy 345e24142e Update 'Edit' menu to 'Action' menu (fixes #2662) 2016-01-13 21:09:17 +01:00
kluppy 0fdd03ddee Fix location of build translation scripts. 2016-01-13 21:08:34 +01:00
Audrius Butkevicius 31861052e5 Merge pull request #2687 from kluppy/master 
Fix #2662 update Edit menu to Action
 2016-01-13 11:02:40 +00:00
kluppy 7c42b5cb17 Update 'Edit' menu to 'Action' menu (fixes #2662) 2016-01-13 20:09:32 +10:00
kluppy df7fea4412 Fix location of build translation scripts. 2016-01-13 20:09:32 +10:00
Jakob Borg a0fa288cb6 Undo the hash algorithm additions; retain flag checks 2016-01-12 16:03:06 +01:00
Jakob Borg 70bac24832 Always run relaying when enabled (fixes #2665) 2016-01-12 16:02:59 +01:00
Jakob Borg 1df40fbdeb Mend protocol tests, for sure 2016-01-12 16:02:38 +01:00
Audrius Butkevicius 5fa8b42fac Merge pull request #2690 from calmh/fix2665 
Always run relaying when enabled (fixes #2665)
 2016-01-12 13:48:22 +00:00
Audrius Butkevicius d3fa67fe2e Merge pull request #2689 from calmh/nohashalgo 
Undo the hash algorithm additions, retain flag checks
 2016-01-12 13:46:34 +00:00
Jakob Borg 357089a438 Mend protocol tests, for sure 2016-01-12 14:35:00 +01:00
Jakob Borg 8b3d75b339 Undo the hash algorithm additions; retain flag checks 2016-01-12 14:35:00 +01:00
Jakob Borg f741066466 Always run relaying when enabled (fixes #2665) 2016-01-12 14:15:47 +01:00
Jakob Borg 91e9ffff85 Rebuild assets 2016-01-12 14:15:00 +01:00
Jakob Borg 853df14e2f Improve protocol tests, close handling 2016-01-12 10:08:50 +01:00