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
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
f3f6b03d85
Don't let folder ID escape into HTML tag ID:s ( fixes #2059 )
2015-07-16 08:13:10 +02:00
Jakob Borg
8fab7ec5e3
Decrease timing sensitivity of ignore.TestCache
2015-07-14 12:12:57 +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
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
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
b78c515724
Debug output on request errors
2015-07-10 16:01:10 +10:00
Audrius Butkevicius
1ded554a15
Fix advanced option saving ( fixes #2042 )
2015-07-09 21:58:58 +01:00
Jakob Borg
1da3a57fe7
Asset rebuild
2015-07-05 19:44:55 +02:00
Jakob Borg
57a5d13c47
Translation and docs update
2015-07-05 11:24:21 +02:00
Jakob Borg
500b96240b
Don't show Failed Items on folder masters
2015-07-05 11:21:15 +02:00
Jakob Borg
fddc4c2fc0
Rebuild assets
2015-07-05 11:13:35 +02:00
Jakob Borg
b02047e4b5
Update Bootstrap 3.1.0 -> 3.3.5
2015-07-05 11:05:38 +02:00
Jakob Borg
e9545c4961
Merge pull request #2022 from brgmnn/master
...
Preserve setgid bit on local directores (fixes #2012 )
2015-07-04 19:37:21 +02:00
Jakob Borg
dec6540967
Implement "advanced configuration" dialog ( fixes #2010 )
2015-07-04 13:47:43 +02:00
Daniel Bergmann
3fe1673ce9
Preserve setgid bit on local directores ( fixes #2012 )
...
When setting the permissions on directories with ignore permissions off,
preserve the setgid bit to it's original value instead of setting it
off.
2015-07-04 09:01:34 +01:00
Daniel Bergmann
aee9093848
Fixed add device button being overlapped by footer ( fixes #1950 )
2015-07-02 16:16:42 +01:00
Daniel Bergmann
5c18d34d89
Added a contact email address for myself.
...
Added myself to the AUTHORS, NICKS and GUI contributors files. Also
fixed the sort order in AUTHORS and NICKS when adding myself as there
were a couple of entries in both that were not quite in alphabetical
order.
2015-07-02 09:45:22 +01:00
Daniel Bergmann
970a9c7552
Added select ID text on click to gui
2015-07-02 09:34:12 +01:00
Jakob Borg
60004ebff1
Show FolderErrors result in UI ( fixes #1437 )
2015-06-30 14:41:48 +02:00
Jakob Borg
2d9fcf6828
Collect puller errors, send FolderErrors event
2015-06-30 14:41:47 +02:00
Jakob Borg
c8ac9721d7
Translation and docs update
2015-06-28 21:10:57 +02:00
Audrius Butkevicius
93ad803073
Make ping timeout configurable ( fixes #1751 )
2015-06-27 12:34:41 +01:00
Jakob Borg
2b0c33f74d
Merge pull request #1996 from AudriusButkevicius/checkrace
...
Potential race between folder being added and scan (fixes #1986 )
2015-06-26 12:56:07 +02:00
Audrius Butkevicius
dae1d36a23
Trim string slices upon loading config ( fixes #1750 )
2015-06-25 16:50:27 +01:00
Audrius Butkevicius
824fa8f17a
Fix go lint warnings
2015-06-24 22:05:27 +01:00
Audrius Butkevicius
31cd0b943c
Potential race between folder being added and scan (potentially fixes #1986 )
2015-06-24 21:59:03 +01:00
Jakob Borg
070eced2f6
Merge pull request #1985 from calmh/fix-reset
...
Fix reset DB
2015-06-24 14:07:15 +02:00
Audrius Butkevicius
986f8dfb2e
Remove dead variable
2015-06-24 08:43:33 +01:00
Audrius Butkevicius
8c0c03eb38
Merge pull request #1989 from AudriusButkevicius/session
...
Use different session cookies per device
2015-06-23 13:56:14 +01:00
Audrius Butkevicius
089fca2319
Use different session cookies per device
2015-06-22 19:51:46 +01:00
Jakob Borg
e936890927
Don't rename duplicate folders ( fixes #1675 )
...
Renaming them puts the user in a difficult situation as they can't
rename them back in the GUI. This way, they need to fix the config in
the same way it got broken (manual editing or external tool).
2015-06-22 11:27:47 +02:00
Zillode
0450d48f89
Merge pull request #1856 from calmh/fix-1391
...
Serialize scans (fixes #1391 )
2015-06-21 14:26:17 +02:00
Jakob Borg
2463819a3d
Update translations and docs
2015-06-21 11:45:54 +02:00
Jakob Borg
2b2cae2d50
Fix reset DB
...
The reset of all folders failed when there was no data for a given
folder, as it was not returned by db.ListFolders then. But we don't
really care about that, we can "reset" it anyway...
2015-06-21 09:35:41 +02:00
Jakob Borg
f73d5a9ab2
Serialize scans and pulls ( fixes #1391 )
2015-06-20 23:01:40 +02:00
Jakob Borg
4eb0e24c6e
Sanitize rescan interval values ( fixes #1978 )
2015-06-20 23:01:30 +02:00
Jakob Borg
1d2235abe7
Model must be running for tests
2015-06-20 23:00:33 +02:00
Jakob Borg
d347e54acb
Don't start model until services have been added ( fixes #1969 )
2015-06-20 20:04:47 +02:00
Jakob Borg
b5198d8119
Merge pull request #1968 from calmh/newtests
...
Refactored integration tests
2015-06-20 19:24:04 +02:00
Jakob Borg
a738490a3b
Update translation strings
2015-06-20 11:40:05 +02:00
Jakob Borg
cfe24ecdd9
Add wsgcsysadmin
2015-06-19 08:50:36 +02:00