Martchus
/
syncthing
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
3,512 Commits 70 Branches 0 Tags 113 MiB
Commit Graph

3512 Commits

Author SHA1 Message Date
Audrius Butkevicius bf353a42cd Merge pull request #2780 from letiemble/CORS_Support2 
Move CORS middleware to process un-authenticated OPTIONS requests
 2016-02-12 21:29:45 +00:00
Laurent Etiemble d8e19b776e Swap the corsMiddleware and the csrfMiddleware to the unauthenticated OPTIONS requests are first processed. 2016-02-12 22:10:08 +01:00
Audrius Butkevicius cf96bb464f Merge pull request #2777 from calmh/dbfile404 
Return "No such object in the index" when /rest/db/file gets called on something that doesn't exist
 2016-02-12 20:12:34 +00:00
Jakob Borg 3c7164846d Return "No such object in the index" when /rest/db/file gets called on something that doesn't exist 
Better than the confusing result of getting a blank fileinfo that looks
valid apart from being all crap.
 2016-02-12 14:55:16 +01:00
Jakob Borg 4fa4668ed6 Revert "Add .arcconfig to project root" 
This reverts commit 0ce21aea08.
 2016-02-11 21:17:01 +01:00
Jakob Borg 0ce21aea08 Add .arcconfig to project root 2016-02-09 16:50:57 +01:00
Audrius Butkevicius 6f2de31146 Merge pull request #2757 from calmh/newxdr 
Use v2 of XDR package
 2016-02-02 14:44:06 +00:00
Jakob Borg e1ac740ac4 Use v2 of XDR package (actual changes) 2016-02-02 15:33:46 +01:00
Jakob Borg 4feeaf1641 Use v2 of XDR package (auto generated) 2016-02-02 12:44:33 +01:00
Jakob Borg a08bbabd4d Use v2 of XDR package (deps) 2016-02-02 12:43:33 +01:00
Jakob Borg a7a9d7d85c Return correct content type for /rest/events 2016-02-02 12:40:42 +01:00
Jakob Borg e93c766c42 Rename RawAPIKey -> APIKey in GUIConfiguration 2016-02-02 11:12:25 +01:00
Audrius Butkevicius 5d4bfdabd6 Merge pull request #2755 from calmh/dashconfig 
Add -paths option to print config, key, database paths
 2016-02-02 09:53:28 +00:00
Jakob Borg 39c16d1cc4 Add -paths option to print config, key, database paths 2016-02-02 10:41:49 +01:00
Jakob Borg eb55d19786 Clean up error handling a bit in protocol.readMessage 2016-02-02 10:18:19 +01:00
Jakob Borg ae36fada6b Remove old reference to moved protocol 2016-02-02 10:18:18 +01:00
Audrius Butkevicius 60ca7784ba Merge pull request #2748 from canton7/feature/multiple-api-keys 
Support multiple API keys (command-line and config) (fixed #2747)
 2016-02-01 09:20:51 +00:00
Jakob Borg 7e8db13854 Update docs & translations 2016-01-31 10:38:05 +01:00
Jakob Borg 3e7d0ec14f build.sh prerelease should rebuild author credits in about dialog 2016-01-30 22:49:14 +01:00
Antony Male 5971c00a4f Support multiple API keys (command-line and config) (fixes #2747) 2016-01-30 15:18:09 +00:00
Audrius Butkevicius 8ff7531f89 Merge pull request #2749 from AudriusButkevicius/relayprx 
Use dialer in relay checks (fixes #2732)
 2016-01-30 12:39:13 +00:00
Audrius Butkevicius f59e1ad854 Use dialer in relay checks (fixes #2732) 2016-01-30 12:33:42 +00:00
Audrius Butkevicius 1a0a8a1655 Merge pull request #2738 from tpng/patch-1 
Handle null case for invalid ng-model value (fixes #2392)
 2016-01-30 03:25:31 +00:00
Benny Ng 24023ff9e8 Handle null case for invalid ng-model value (fixes #2392) 
Invalid ng-model value is assigned `null` by angular.js which is being matched as `object`, thus disappear in the UI when a minus sign is entered.
 2016-01-30 10:40:57 +08:00
Audrius Butkevicius 016f799983 Merge pull request #2745 from calmh/redirect307 
Return status code 307 instead of 302 when redirecting from HTTP to HTTPS
 2016-01-29 15:06:01 +00:00
Jakob Borg fae68a5396 Return status code 307 instead of 302 when redirecting from HTTP to HTTPS 2016-01-29 11:07:51 +01:00
Jakob Borg 79680b1d5e Benchmark for single database update 2016-01-28 09:12:01 +01:00
Jakob Borg 0ce45c20b8 Merge branch 'pr/2735' 
* pr/2735:
  Add a CORS handler to deal with preflight OPTIONS requests
 2016-01-26 21:56:06 +01:00
Laurent Etiemble fed374fcb6 Add a CORS handler to deal with preflight OPTIONS requests 2016-01-26 21:55:51 +01:00
Jakob Borg 374202ac45 Add letiemble 2016-01-26 21:51:20 +01:00
Jakob Borg 56db1d3dfa Update docs and translations 2016-01-24 17:35:33 +01:00
Audrius Butkevicius d4796261d7 Merge pull request #2729 from syncthing/rumpelsepp-patch-1 
Correct order of pkill(1) arguments in debian script (fixes #2728)
 2016-01-24 12:31:47 +00:00
Stefan Tatschner 452c5d5e91 Correct order of pkill(1) arguments in debian script (fixes #2728) 
According to http://linux.die.net/man/1/pkill the signal name must be **before** anything else.
 2016-01-24 13:10:30 +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
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
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