Zillode
3eb2b1f7a2
Fix Systemd readme link
2015-07-21 20:32:35 +02:00
Audrius Butkevicius
6ecc9bf93a
Merge pull request #2077 from calmh/conflictwins
...
Determine conflict winner based on change type and modification time (fixes #1848 )
2015-07-21 15:05:08 +01:00
Audrius Butkevicius
22e24fc387
Merge pull request #15 from syncthing/conflictwins
...
Base for better conflict resolution
2015-07-21 14:45:17 +01:00
Jakob Borg
516d88b072
Base for better conflict resolution
2015-07-21 15:40:02 +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
Audrius Butkevicius
77457e91e9
Merge pull request #1 from syncthing/review
...
Code review
2015-07-20 18:43:31 +01: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
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
2015-07-20 14:18:07 +02:00
Jakob Borg
049d92b525
Style and minor fixes, client package
2015-07-20 14:04:34 +02:00
Jakob Borg
f9bd59f031
Style and minor fixes, main package
2015-07-20 14:04:34 +02:00
Audrius Butkevicius
6d0d5bd566
Merge pull request #2 from syncthing/ratelimit
...
Implement global and per session rate limiting
2015-07-20 12:57:55 +01:00
Jakob Borg
35d20a19bc
Implement global and per session rate limiting
2015-07-20 13:37:11 +02:00
Jakob Borg
dab1c4cfc9
Build script from discosrv
2015-07-20 12:11:06 +02:00
Denis A.
9a50f4ac1f
Double curly brace notation displaying
...
Prevent double curly brace notation from displaying momentarily before angular.js compiles/interpolates document
2015-07-20 12:18:48 +03:00
Jakob Borg
59e829e595
Translation & docs update
2015-07-19 13:34:11 +02:00
Audrius Butkevicius
f86946c6df
Fix bugs
2015-07-17 22:04:02 +01:00
Audrius Butkevicius
e97f75cad5
Change receiver type, add GoStringer
2015-07-17 21:49:45 +01:00
Audrius Butkevicius
2505f82ce5
General cleanup
2015-07-17 20:17:49 +01: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
Ben Schulz
22c525e3fe
Improve info text for device addresses ( fixes #2044 )
...
Improve info text for device addresses (#2044 )
2015-07-16 10:15:33 +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
Audrius Butkevicius
00bebc317e
Merge pull request #2062 from canton7/feature/issue-2041
...
Allow #editIgnores to scroll in browser (fixes #2041 )
2015-07-15 17:48:15 +01:00
Antony Male
8f38e83aaf
Allow #editIgnores to scroll in browser ( fixes #2041 )
...
class modal-open is applied to <body>, which ultimately means that the
browser will scoll to the modal's content. However, #editFolder was
finishing its close animation (and removing this modal-open class)
after #editIgnores had set modal-open (and had started its open
animation). The end result is that <body> ends up without modal-open
when #editIgnores is open, and so the browser doesn't properly scroll.
Instead, only open the #editIgnores once #editFolder has finished closing.
2015-07-15 14:20:57 +01: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
Daniel Bergmann
569314be45
Added select-on-click for remote 'Device ID' and 'API Key'
...
Now these uneditable boxes match the behaviour when clicking on the ID
box in Actions > Show ID.
2015-07-13 17:01:13 +01:00
Jakob Borg
909d60464e
Revert "Merge pull request #2053 from calmh/atomicwriter" ( fixes #2058 )
...
This reverts commit b611f72e08a04b005e93
2015-07-13 12:47:32 +02:00
Jakob Borg
d855abf8b0
Translation & docs update
2015-07-13 08:24:04 +02:00
Audrius Butkevicius
b611f72e08
Merge pull request #2053 from calmh/atomicwriter
...
Add osutil.AtomicWriter
2015-07-12 12:10:54 +01: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
Audrius Butkevicius
d2e7a8004d
Merge pull request #2048 from calmh/clusterconfigrace
...
Make sure connection is added to m.protoConn and m.rawConn before it's Start()ed (fixes #2034 )
2015-07-10 08:46:31 +01:00
Audrius Butkevicius
7996ef0d45
Merge pull request #14 from syncthing/clusterconfigrace
...
Connection now needs explicit Start()
2015-07-10 08:31:57 +01: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
b05c1a5bb9
Connection now needs explicit Start()
2015-07-10 16:40:39 +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
Audrius Butkevicius
cb1a7a7bdc
Update panic instructions ( fixes #2039 )
2015-07-09 22:43:16 +01:00
