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

2203 Commits

Author SHA1 Message Date
Jakob Borg 936c76119d Index reset should generate file conflicts (fixes #1613) 2015-04-09 13:06:09 +02:00
Jakob Borg f45865606a Add initial merge and reset conflict tests 2015-04-09 13:06:09 +02:00
Jakob Borg cfc9776bae Check for short ID conflict at startup 2015-04-09 13:06:00 +02:00
Audrius Butkevicius 0cb7ed9e4e Try capturing panics 2015-04-09 11:49:02 +01:00
Jakob Borg 4b07609458 GUI version string includes OS and Arch 
(Useful when debugging via screenshots...)
 2015-04-09 11:33:24 +02:00
Audrius Butkevicius e41e58e781 Merge pull request #1608 from calmh/xdr-update 
Update XDR dependency (fixes #1606)
 2015-04-08 14:33:53 +01:00
Jakob Borg f5030f1c2c Update XDR dependency (fixes #1606) 2015-04-08 14:49:29 +02:00
Jakob Borg 2a48fb8e87 Merge pull request #1607 from syncthing/deadlock 
Don't run deadlock detection in release mode unless asked to (fixes #1536)
 2015-04-08 14:48:20 +02:00
Audrius Butkevicius df6dbc5fa4 Only run deadlock detection if asked or non-release/beta (fixes #1536) 2015-04-08 13:40:05 +01:00
Jakob Borg 4b1d2839e8 Correct override PATH in test 2015-04-08 14:23:26 +02:00
Audrius Butkevicius a892f80e86 Merge pull request #1590 from calmh/long-filenames 
Handle long filenames on Windows (fixes #1295)
 2015-04-08 13:12:25 +01:00
Jakob Borg b2a79855ae Handle long filenames on Windows (fixes #1295) 2015-04-08 14:05:39 +02:00
Audrius Butkevicius ff4974178a Merge pull request #1605 from calmh/http-trace 
Add HTTP request tracing
 2015-04-07 21:10:51 +01:00
Jakob Borg d7100fd9bc Add HTTP request tracing 2015-04-07 21:52:47 +02:00
Jakob Borg 0bfb40ae51 discourse -> forum 2015-04-07 16:07:16 +02:00
Jakob Borg 11c83670d6 Merge pull request #1601 from syncthing/conns 
Fix GUI
 2015-04-07 15:35:54 +02:00
Audrius Butkevicius 68ff4f3842 Fix GUI 2015-04-07 14:24:34 +01:00
Jakob Borg ab25cd09ed Merge pull request #1600 from syncthing/conns 
Change /rest/system/connections output (fixes #1487)
 2015-04-07 14:29:40 +02:00
Audrius Butkevicius 8f05b8f982 Change /rest/system/connections output (fixes #1487) 2015-04-07 13:21:03 +01:00
Jakob Borg 63ae2f64cf Woops: /rest/system/errors -> /rest/system/error 2015-04-07 13:46:39 +02:00
Jakob Borg 105103fae0 Woops: /rest/system/report -> /rest/svc/report 2015-04-07 13:33:37 +02:00
Jakob Borg 70f4792ab1 Translation update 2015-04-07 12:24:02 +02:00
Jakob Borg defd9fa322 Merge pull request #1595 from calmh/rest-rework 
Tidy up the REST interface URLs (fixes #1593)
 2015-04-07 12:20:36 +02:00
Jakob Borg e884d0fda6 Tidy up the REST interface URLs (fixes #1593) 2015-04-07 12:16:23 +02:00
Audrius Butkevicius 5f6a8fdc20 Merge pull request #1568 from calmh/override 
Override needs to twiddle the version a bit more (fixes #1564)
 2015-04-07 11:13:43 +01:00
Audrius Butkevicius 196a9ddbb0 Merge pull request #1599 from calmh/cleanup 
Clean up config directory of old crap
 2015-04-07 10:33:46 +01:00
Audrius Butkevicius 746140bd11 Merge pull request #1573 from calmh/beacon 
Use a socket per interface for v6 multicast (fixes #1563)
 2015-04-07 10:23:25 +01:00
Jakob Borg 7b99a5fbac Clean up config directory of old crap 2015-04-07 09:25:28 +02:00
Jakob Borg b74c31e520 Only show Override button in idle state 2015-04-06 23:33:28 +02:00
Jakob Borg 221f43e4bd Use a socket per interface for v6 multicast (fixes #1563) 2015-04-06 20:55:50 +02:00
Jakob Borg a17333d73e Override needs to twiddle the version a bit more (fixes #1564) 2015-04-06 20:55:40 +02:00
Jakob Borg 207b43499c Merge remote-tracking branch 'syncthing/pr/1577' 
* syncthing/pr/1577:
  Add uptime in webgui (fixes #1501)

Conflicts:
	cmd/syncthing/gui.go
	internal/auto/gui.files.go
 2015-04-06 20:53:32 +02:00
Jakob Borg 0c0de17b38 Merge pull request #1582 from ralder/webgui-enable-gzip 
Enable gzip for static files for webgui
 2015-04-06 08:33:57 +02:00
Sergey Mishin 77882e6086 Enable gzip encoding static files for webgui 2015-04-06 03:11:30 +03:00
Audrius Butkevicius 19a9834843 Merge pull request #1589 from calmh/copyconf 
Copy configuration struct when sending Changed() events
 2015-04-05 20:53:10 +01:00
Audrius Butkevicius 23dab30ca5 Merge pull request #1588 from calmh/dbcommitter 
Use separate routine for database updates in puller
 2015-04-05 20:43:46 +01:00
ralder b5d7ce8ebe Add uptime in webgui (fixes #1501) 2015-04-05 22:37:55 +03:00
Jakob Borg bf4eb4b269 Copy configuration struct when sending Changed() events 
Avoids data race. Copy() must be called with lock held.
 2015-04-05 21:07:15 +02:00
Jakob Borg a5edb6807e The -reset option now only removes db 2015-04-05 17:40:58 +02:00
Jakob Borg ecadf30fe7 model: Use separate db commit routine (fixes #1558) 2015-04-05 16:19:14 +02:00
Jakob Borg 515f0db5b4 Benchmark syncing many vs large files 2015-04-05 16:16:15 +02:00
Jakob Borg c2f367cf70 Merge pull request #1585 from Zillode/extra-case-test 
Test combination of prefixes (@benapetr)
 2015-04-05 13:37:52 +02:00
Lode Hoste f21dfea965 Test combination of prefixes (@benapetr) 2015-04-05 11:45:43 +02:00
Audrius Butkevicius b84cad4db0 Merge pull request #1583 from calmh/configcleanup 
Remove handling for old deprecated config versions
 2015-04-05 01:31:53 +01:00
Jakob Borg 16ae019c8c Fix AUTHORS 2015-04-04 23:52:23 +02:00
Jakob Borg bd2051febd Remove handling for old deprecated config versions 2015-04-04 23:37:47 +02:00
Audrius Butkevicius 6fb1e03ed4 Merge pull request #1576 from Zillode/reset-indexes 
Update reset API to reflect new use cases.
 2015-04-04 22:31:59 +01:00
Jakob Borg 8d41a762b6 Clean up translations, generate assets 2015-04-04 23:21:45 +02:00
Jakob Borg 6d3003716c Merge remote-tracking branch 'syncthing/pr/1553' 
* syncthing/pr/1553:
  Add dzarda
  Added an "n", typo in a GUI string
 2015-04-04 23:20:48 +02:00
Marc Laporte 2c87c3bac3 Fix some typos 2015-04-04 23:15:07 +02:00