Audrius Butkevicius
dbb3f80995
Merge pull request #2193 from AudriusButkevicius/lans
...
Remove windows specialisation from osutil.GetLans (fixes #2192 )
2016-01-01 15:01:23 +00:00
Audrius Butkevicius
80b9a3e00b
Don't warn about failed ignores if folder unhealthy ( fixes #2630 )
2016-01-01 12:59:13 +00:00
Jakob Borg
be5e5d837b
Merge branch 'pr/2625'
...
* pr/2625:
Show device ID QR code from edit dialog (fixes #1494 )
2016-01-01 11:24:49 +01:00
Kevin Allen
ffc4a60bc6
Show device ID QR code from edit dialog ( fixes #1494 )
2016-01-01 11:24:09 +01:00
Audrius Butkevicius
1edfa4474f
Merge pull request #2632 from calmh/fix2627
...
Ensure loaded config is free of duplicate devices (fixes #2627 )
2015-12-31 08:37:52 +00:00
Jakob Borg
18e70f4e79
Ensure loaded config is free of duplicate devices ( fixes #2627 )
2015-12-31 09:17:17 +01:00
Jakob Borg
62a81cfdd1
Update lang-en.json and assets
2015-12-30 08:54:09 +01:00
Jakob Borg
6365a026c1
Merge branch 'pr/2628'
...
* pr/2628:
Disallow adding duplicate device ID in GUI
2015-12-30 08:53:29 +01:00
Jakob Borg
7c89193398
Add ironmig
2015-12-30 08:53:19 +01:00
Kevin Allen
4a6f1718b8
Disallow adding duplicate device ID in GUI
...
Adds check in valid device id to check for uniqueness
2015-12-30 08:52:11 +01:00
Jakob Borg
7b3fa8da60
Update translations & docs
2015-12-27 13:26:14 +01:00
Jakob Borg
2fae7ccf5c
Ignore error on os.Chtimes in config archiving
2015-12-26 18:25:36 +01:00
Audrius Butkevicius
f36f48c2cf
Merge pull request #2596 from andersonvom/load_config
...
Centralize config loading logic (also fixes #2509 )
2015-12-26 16:12:16 +00:00
Jakob Borg
8b726c7e8b
Correct GUI asset dir handling ( fixes #2621 )
2015-12-26 13:32:46 +01:00
Anderson Mesquita
8eb0687407
Update mtime of config file before upgrading ( fixes #2509 )
...
This updates the modified time of the config file before archiving it
during an update so that the clean up routine doesn't delete it if it's
too old, preventing the user from being able to rollback after an
upgrade.
2015-12-24 09:27:31 -05:00
Anderson Mesquita
9b9912ba9e
Centralize config loading logic
...
This gets rid of redundant checks and centralizes the logic of loading
the config files so that we don't have to keep doing the same thing in
multiple places.
2015-12-24 09:27:31 -05:00
Anderson Mesquita
22d0ed8225
Fix typo
2015-12-24 09:27:31 -05:00
Jakob Borg
b7a58d2f87
Merge pull request #2620 from andersonvom/issue-2454
...
Remove fixed footer at first media break (fixes #2454 )
2015-12-24 11:26:40 +01:00
Anderson Mesquita
219ece22fc
Remove fixed footer at first media break ( fixes #2454 )
...
After the first media break (under 1200px), the footer is too long to
fit in a single line, taking up too much space in small screen devices.
This makes it so that it will stop being fixed at the bottom, freeing up
valuable screen real estate.
2015-12-23 22:19:41 -05:00
Jakob Borg
4874301615
Merge pull request #2618 from AudriusButkevicius/svc
...
Svc -> Service
2015-12-23 21:33:42 +01:00
Audrius Butkevicius
1827dda0c6
Svc -> Service
2015-12-23 15:31:12 +00:00
Jakob Borg
d088b01f75
Rebuild assets
2015-12-23 16:09:42 +01:00
Jakob Borg
00c5062eab
Merge branch 'pr/2613'
...
* pr/2613:
Add an icon for Safari's pinned tabs
2015-12-23 16:09:31 +01:00
Jakob Borg
84eacde63a
Add jgke
2015-12-23 16:09:11 +01:00
Jakob Borg
d98290c17f
Merge pull request #2617 from andersonvom/issue-2598
...
Refactor rwfolder tests
2015-12-23 07:55:47 +01:00
Anderson Mesquita
6d94a3be05
Refactor rwfolder tests
...
This creates a few utility functions to avoid repetition and removes
some redundant checks.
2015-12-22 23:43:07 -05:00
Audrius Butkevicius
a2833d18ed
Merge pull request #2615 from calmh/jsonvv
...
Humanize serialization of version vectors
2015-12-22 21:12:23 +00:00
Jakob Borg
6f95afdc59
Humanize serialization of version vectors
2015-12-22 21:53:25 +01:00
Jakob Borg
aaa75a32a5
Temporarily patch kardianos/osext to build on FreeBSD
2015-12-22 13:41:04 +01:00
Jaakko Hannikainen
c300015ac2
Add an icon for Safari's pinned tabs
...
Safari has its own standard for handling icons for pinned tabs,
which requires a black-and-white .svg and a special tag.
Without using this, pinning a tab to localhost will show just
a blank square, instead of a pre-generated letter.
2015-12-22 12:29:59 +02:00
Jakob Borg
eb4f5e9faa
Update deps, step two (because I suck)
2015-12-22 09:43:47 +01:00
Jakob Borg
c7aec839ae
Merge pull request #2614 from andersonvom/issue-2598
...
WIP: Consider tempfile when checking for free space (fixes #2598 )
2015-12-22 09:42:34 +01:00
Jakob Borg
37aa89b19d
Update kardianos/osext (ref #1272 )
2015-12-22 09:39:47 +01:00
Anderson Mesquita
3f94e70488
WIP: Consider tempfile when checking for free space ( fixes #2598 )
...
Checks the existing blocks that can be reused when downloading a file so
that it only requires the space corresponding to the missing blocks.
This will prevent syncthing from claiming the folder doesn't have enough
space when resuming download of large files after they have been
partially downloaded.
2015-12-21 13:36:08 -05:00
Jakob Borg
435afa0eea
Merge pull request #2610 from calmh/fix2608-2
...
Correctly set default logfile location on Windows (fixes #2608 )
2015-12-21 12:26:49 +01:00
Jakob Borg
fb82a5e086
Correctly set default logfile location on Windows ( fixes #2608 )
2015-12-21 12:19:28 +01:00
Audrius Butkevicius
71d98c2f26
Merge pull request #2609 from calmh/fix2608
...
Don't crash on stat error in ensureDir (fixes #2608 )
2015-12-21 10:35:55 +00:00
Jakob Borg
4a97aa12d6
Don't crash on stat error in ensureDir ( fixes #2608 )
...
I'm not really sure under what circumstances MkdirAll returns a nil
error but a subsequent stat fails, but apparently it can happen and we
need to handle it. The "mode >= 0" was a no-op, and we never call
ensureDir anyway without the intention of ensuring the mode, so removed
that.
2015-12-21 09:35:43 +01:00
Audrius Butkevicius
c9e67fb460
Log when we fail to connect to relay
2015-12-20 22:14:13 +00:00
Audrius Butkevicius
cec87be4e3
Remove windows specialisation from osutil.GetLans ( fixes #2192 )
2015-12-20 18:10:02 +00:00
Jakob Borg
eb1a234a77
Translation & docs update
2015-12-20 10:05:17 +01:00
Jakob Borg
394c2b67d6
Merge pull request #2595 from AudriusButkevicius/leaks
...
Always exit via error select, making sure reader routine is exits (fi…
2015-12-20 10:03:34 +01:00
Jakob Borg
aeb3af7105
Merge branch 'pr/2594'
...
* pr/2594:
Move event timestamp to header for share folder prompt
Edit device after accepting new connection (fixes #1929 )
Move new device timestamp to box header
Fix unmatching closing span tag
2015-12-20 09:53:26 +01:00
Jakob Borg
e5cf99e31c
Move event timestamp to header for share folder prompt
2015-12-20 09:52:59 +01:00
Anderson Mesquita
8120535a35
Edit device after accepting new connection ( fixes #1929 )
...
This will open the "edit device" dialogue after accepting a new device
connection. This will allow the user to specify the name of the device
or leave it blank in case they want to accept whatever the device
advertises once it connects.
2015-12-19 09:48:27 -05:00
Anderson Mesquita
ba01433381
Move new device timestamp to box header
...
The device ID is already long enough to make it a bit hard to read the
body message, so moving the timestamp to the header unclutters the body
a bit.
2015-12-19 09:42:33 -05:00
Anderson Mesquita
6b99cdb83a
Fix unmatching closing span tag
2015-12-19 09:42:33 -05:00
Audrius Butkevicius
e7b71f8743
Merge pull request #2601 from calmh/fix2600
...
Don't verify free space for files when folder MinDiskFreePct==0 (fixes #2600 )
2015-12-19 13:02:57 +00:00
Jakob Borg
03935b2d64
Don't verify free space for files when folder MinDiskFreePct==0 ( fixes #2600 )
2015-12-19 13:59:08 +01:00
Jakob Borg
2b89f33765
Merge pull request #2592 from andersonvom/remove_globals
...
Remove some global variables from main.go
2015-12-19 09:05:05 +01:00
