Audrius Butkevicius
504ad86648
Merge pull request #2655 from calmh/fix2605
...
Don't conflict copy conflict copies (fixes #2605 )
2016-01-03 20:44:05 +00:00
Jakob Borg
096b2d73cd
Don't conflict copy conflict copies ( fixes #2605 )
2016-01-03 21:16:31 +01:00
Audrius Butkevicius
5754d31d0f
Merge pull request #2653 from calmh/fix2604
...
Change default max conflicts to 10 (fixes #2604 )
2016-01-03 20:13:51 +00:00
Jakob Borg
ed3ed1f90a
Change default max conflicts to 10 ( fixes #2604 )
2016-01-03 21:10:25 +01:00
Jakob Borg
adb1227b2e
Update kardianos/osext ( fixes #2650 )
2016-01-03 19:59:56 +01:00
Jakob Borg
18ae87962d
Clarify points of contact
2016-01-03 13:07:22 +01:00
Jakob Borg
4673862981
Update docs & translations
2016-01-03 09:56:33 +01:00
Jakob Borg
212d7257e9
Pretty print the new architectures
2016-01-01 21:19:15 +01:00
Audrius Butkevicius
9df8d0848a
Merge pull request #2641 from calmh/archs
...
Also build linux-arm64, linux-ppc64, linux-ppc64le
2016-01-01 20:08:08 +00:00
Jakob Borg
ded7abb1f6
Also build linux-arm64, linux-ppc64, linux-ppc64le
2016-01-01 20:56:31 +01:00
Audrius Butkevicius
44d5a61cfe
Merge pull request #2639 from calmh/minihashalgo
...
Detect nonstandard hash algo and stop folder (ref #2314 )
2016-01-01 19:42:08 +00:00
Jakob Borg
0db80710aa
Detect nonstandard hash algo and stop folder (ref #2314 )
2016-01-01 20:14:31 +01:00
Jakob Borg
7c47eff112
Update lang-en.json for translations
2016-01-01 20:13:44 +01:00
Jakob Borg
d81849ab3b
Merge pull request #2631 from AudriusButkevicius/igwarn
...
Don't warn about failed ignores if folder unhealthy (fixes #2630 )
2016-01-01 16:48:31 +01:00
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
