3247 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Audrius Butkevicius	c5cb5cba18	Merge pull request #2481 from calmh/scanrate ... Add scan rate in web GUI	2015-11-17 20:25:37 +00:00
Jakob Borg	aa853ac833	Fix tests	2015-11-17 21:23:17 +01:00
Jakob Borg	8b759d0e1e	Update dependencies	2015-11-17 21:23:17 +01:00
Jakob Borg	a8a2192cf9	Show scan rate in web GUI	2015-11-17 21:23:17 +01:00
Jakob Borg	37f866b47f	Use pause/resume device to ensure TestConflictsDefault can run	2015-11-17 13:32:57 +01:00
Jakob Borg	9cf653d673	Rename Model.clusterConfig to Model.generateClusterConfig	2015-11-17 12:10:08 +01:00
Jakob Borg	0167b4b4a3	Don't cause rare spurious event timeout ... Correctly resetting timers is surprisingly tricky.	2015-11-17 12:05:22 +01:00
Audrius Butkevicius	dcb773e446	Merge pull request #2478 from calmh/opengui ... Warn the user if they're running with an insecure looking setup (fixes #2139)	2015-11-16 22:05:55 +00:00
Jakob Borg	b1a86fbc98	Warn the user if they're running with an insecure looking setup (fixes #2139)	2015-11-16 21:58:08 +01:00
Jakob Borg	cdd0cf7f18	Merge pull request #2477 from MoOx/patch-1 ... Update CI badge to specify environement (unix/windows)	2015-11-16 20:49:27 +01:00
Jakob Borg	9ae419201d	White list commit e37cef	2015-11-16 20:48:40 +01:00
Maxime Thirouin	e37cefdbee	Update CI badge to specify environement (unix/windows)	2015-11-16 20:31:16 +01:00
Jakob Borg	ad8c266f76	Update docs & translation	2015-11-15 18:15:10 +01:00
Jakob Borg	807c3bdcc7	Merge pull request #2473 from syncthing/revert-2470-nostoppedrescan ... Revert "Don't show "Rescan" button for stopped folders"	2015-11-14 21:10:52 +01:00
Audrius Butkevicius	62efbd17de	Revert "Don't show "Rescan" button for stopped folders"	2015-11-14 14:01:22 -05:00
Audrius Butkevicius	d99350fd61	Merge pull request #2470 from calmh/nostoppedrescan ... Don't show "Rescan" button for stopped folders	2015-11-14 09:09:28 -05:00
Jakob Borg	40c70a9a2a	Don't show "Rescan" button for stopped folders	2015-11-14 12:14:09 +01:00
Audrius Butkevicius	8fb7f40a6a	Merge pull request #2468 from calmh/removefolder ... Remove folder without restart (fixes #2262)	2015-11-13 09:51:58 -05:00
Jakob Borg	2f12d41d9d	Don't dirty blockmap key between lookups (fixes #2455)	2015-11-13 15:44:30 +01:00
Jakob Borg	9fbdb6b305	Cancel a running scan	2015-11-13 15:30:21 +01:00
Jakob Borg	73285cadb6	Remove folder without restart (fixes #2262)	2015-11-13 13:32:52 +01:00
Jakob Borg	56f1c295b6	Merge pull request #2462 from AudriusButkevicius/mtimes ... Use virtualMtime when deciding if a file is up to date	2015-11-12 08:48:45 +01:00
Jakob Borg	7f76ed8413	Fix build	2015-11-12 08:46:13 +01:00
AudriusButkevicius	f7edd36931	Use virtualMtime when deciding if a file is up to date	2015-11-12 03:40:06 +00:00
Audrius Butkevicius	c39f2b7c05	Merge pull request #2463 from boone/fix_typos ... Fix typos.	2015-11-11 21:29:34 -05:00
Mike Boone	342036408e	Fix typos.	2015-11-11 21:20:34 -05:00
Jakob Borg	f4904fce17	Merge pull request #2449 from Stefan-Code/upgrade-system ... made upgrade-system smarter (fixes #2446)	2015-11-10 21:15:02 +01:00
Stefan Kuntz	2abb2de753	Made upgrade-system smarter (fixes #2446)	2015-11-10 17:41:50 +01:00
Jakob Borg	ef0a0db07e	More local discovery URL debugging (ref #2444)	2015-11-10 10:16:55 +01:00
Jakob Borg	a45795efec	Add tylerbrazier	2015-11-10 08:20:16 +01:00
Jakob Borg	88ae353aef	Merge pull request #2443 from tylerbrazier/master ... Audit logins with new Login event (fixes #2377)	2015-11-10 08:19:03 +01:00
Tyler Brazier	97b9690711	Audit logins with new LoginAttempt event (fixes #2377)	2015-11-10 00:49:51 -05:00
Audrius Butkevicius	48ce356d5c	Merge pull request #2448 from calmh/connhandling ... Refactor out methods resolveAddresses, connectDirect, connectViaRelay	2015-11-09 22:01:06 -05:00
Audrius Butkevicius	92451f94bc	Merge pull request #2450 from syncthing/Zillode-patch-1 ... Correct commentary for ConnectionStats	2015-11-09 18:32:19 -05:00
Zillode	593632045d	Correct commentary for ConnectionStats ... Related to https://github.com/syncthing/syncthing-android/issues/473 and 944d9c84a0 ConnectionStats returns connection information for all devices, even when disconnected.	2015-11-09 23:58:06 +01:00
Jakob Borg	e3c55ef307	Fix address list in DeviceDiscovered, add debug prints (ref #2444)	2015-11-09 21:36:17 +01:00
Jakob Borg	edf1730fd2	Merge pull request #2447 from alex2108/master ... Add default-v4 and default-v6 as options for discovery	2015-11-09 16:02:37 +01:00
Alexander Graf	34cd8e3f95	Add default-v4 and default-v6 as options for discovery	2015-11-09 15:56:46 +01:00
Jakob Borg	242cce022a	Refactor out methods resolveAddresses, connectDirect, connectViaRelay	2015-11-09 15:35:32 +01:00
Jakob Borg	19bf51cefb	Revert "Merge pull request #2440 from Stefan-Code/master" ... This reverts commit 81bc6bf34b, reversing changes made to 7de736e8d0. Unfortunately this tricks the upgrade system into picking the wrong binary. We need to fix the upgrade system before merging this.	2015-11-09 14:23:26 +01:00
Jakob Borg	74a2e80142	Update docs & translations	2015-11-09 14:00:10 +01:00
Jakob Borg	b9b630e3b6	Change certificate on discovery-2	2015-11-09 13:58:44 +01:00
Jakob Borg	f0bdf833d1	Oh come *on*	2015-11-09 12:39:09 +01:00
Jakob Borg	81bc6bf34b	Merge pull request #2440 from Stefan-Code/master ... Added ufw firewall application preset	2015-11-09 12:19:42 +01:00
Jakob Borg	7de736e8d0	Ok then, lower case	2015-11-09 12:17:23 +01:00
Jakob Borg	cd097e0fce	Add Stefan-Code	2015-11-09 12:14:32 +01:00
Stefan-Code	cc81a7ccfe	added ufw firewall application preset (fixes #2435)	2015-11-09 11:58:59 +01:00
Jakob Borg	58d320c270	String slice formatting	2015-11-08 18:06:06 +01:00
Jakob Borg	59565fd1d1	Woops	2015-11-07 11:25:00 +01:00
Jakob Borg	55592137a2	Use constructor functions for FolderConfiguration and DeviceConfiguration	2015-11-07 09:50:04 +01:00