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

2474 Commits

Author SHA1 Message Date
Audrius Butkevicius b63351074c Update protocol package 2015-08-01 12:22:19 +01: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
Audrius Butkevicius e62cf13760 Add stwatchfile 2015-07-27 19:00:22 +01: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
Audrius Butkevicius 2202aaed51 Merge pull request #2087 from calmh/norestart 
Add folders without restart (fixes #2063)
 2015-07-24 08:06:36 +01:00
Audrius Butkevicius cbefcd50cf Merge pull request #2088 from calmh/usagedata 
Link to usage data (ref syncthing/website#17)
 2015-07-24 07:55:41 +01: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
Audrius Butkevicius de89d7a976 Merge pull request #2084 from calmh/norestart 
Add devices without restart (fixes #2083)
 2015-07-23 11:07:27 +01: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
Audrius Butkevicius 42dc51784e Merge pull request #2079 from snnd/bugfix_reloads 
fix(core): prevent endless reload on cache requests
 2015-07-21 23:01:15 +01:00
Dennis Wilson a4a46f480d refactor(core): eleminate global state of guiVersion and deviceId 2015-07-21 23:47:35 +02:00
Dennis Wilson e34be16237 style(core): add simple flow, hoisting, stacktrace infos 2015-07-21 23:41:10 +02:00
Dennis Wilson dfcc166918 fix(core): prevent endless reload on cache requests 2015-07-21 22:35:51 +02:00
Audrius Butkevicius 895d56ed04 Merge pull request #2076 from calmh/ignoredelete 
Optionally ignore remote deletes
 2015-07-21 19:48:06 +01:00
Jakob Borg 12eab4a8ba Optionally ignore remote deletes (fixes #1254) 2015-07-21 20:39:19 +02:00
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
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
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
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 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
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