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
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 81bc6bf34b7de736e8d0
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
Jakob Borg
58523060f0
Actually do negative caching on failed discovery lookups ( fixes #2434 )
2015-11-06 17:14:20 +01:00
Audrius Butkevicius
07d53be9fc
Merge pull request #2432 from calmh/cachepath
...
Cache the folderconfig Path() call
2015-11-06 08:37:39 +00:00
Jakob Borg
d4b0235a8b
Correctly report the default relay server in usage stats
2015-11-06 07:16:15 +00:00
Jakob Borg
34aa41e17b
Cache the Path() call, as it's quite expensive and called a lot
2015-11-06 07:11:22 +00:00
Jakob Borg
36f6a9347c
Benchmark must use *db.Instance
2015-11-05 17:46:53 +00:00
Jakob Borg
d49d386ef2
Docs and translation update
2015-11-05 15:47:06 +00:00
Jakob Borg
00c363829c
Refactor: move folder prepare to it's own function
2015-11-05 08:01:47 +00:00
Audrius Butkevicius
a9691dbdf4
Merge pull request #2430 from calmh/jsondecode
...
Run JSON decoding through the usual setting of defaults and fixing up
2015-11-04 20:44:56 +00:00
Jakob Borg
9df701906f
Run JSON decoding through the usual setting of defaults and fixing up
...
I see no reason not to do this, and it gives a unified place (the prepare()
call) to initialize cached attributes and so on.
2015-11-04 20:33:10 +00:00
Jakob Borg
283671fa9d
Remove old dead code
2015-11-04 20:15:36 +00:00
Jakob Borg
435c29755d
We haven't had cleartext passwords in the config for ages
2015-11-04 20:15:11 +00:00
Jakob Borg
686f91777c
Don't force rescan dirs and symlinks
...
We can't look for changed modtime on these as we don't track the modtime
to start with.
2015-11-04 19:53:07 +00:00
Audrius Butkevicius
2aa028facb
Add user-agent header, capitalize headers as others seems to do it ( fixes #2422 )
2015-10-31 15:36:08 +00:00
Audrius Butkevicius
b4bbd050c2
Merge pull request #2424 from calmh/dbinstance
...
We should pass around db.Instance instead of leveldb.DB
2015-10-31 12:51:23 +00:00
Jakob Borg
2a4fc28318
We should pass around db.Instance instead of leveldb.DB
...
We're going to need the db.Instance to keep some state, and for that to
work we need the same one passed around everywhere. Hence this moves the
leveldb-specific file opening stuff into the db package and exports the
dbInstance type.
2015-10-31 12:35:30 +01:00
Jakob Borg
313485e406
Remove file that snuck in by mistake
2015-10-31 11:38:59 +01:00
Jakob Borg
faf4267c73
Refactor: the various db key functions should be instance methods
2015-10-31 11:27:04 +01:00
Jakob Borg
e6277d799f
Undo incorrect revert of folder ID in test config
2015-10-31 11:27:04 +01:00
Jakob Borg
cdbc8004fb
Comment pedantry
2015-10-31 11:16:07 +01:00
Audrius Butkevicius
1fac2f686d
Merge pull request #2423 from calmh/urls
...
Create a correct URL is more difficult than just slapping on a scheme (fixes #2316 )
2015-10-30 20:50:32 +00:00
Jakob Borg
08c8d679ac
Create a correct URL is more difficult than just slapping on a scheme ( fixes #2316 )
2015-10-30 21:22:40 +01:00
Jakob Borg
48c34b7234
Translation update
2015-10-30 10:23:09 +01:00
Audrius Butkevicius
28603f0d2c
Merge pull request #2420 from calmh/closelog
...
Enable log rotation by automatically closing log file (fixes #2251 )
2015-10-29 15:25:51 +00:00
Jakob Borg
b2855f02fe
Enable log rotation by automatically closing log file ( fixes #2251 )
2015-10-29 16:04:07 +01:00
Audrius Butkevicius
bef3d88076
Merge pull request #2418 from calmh/fix2416
...
Rescan changed files before pulling on top of them (fixes #2416 )
2015-10-29 08:15:36 +00:00
Jakob Borg
e1a8ea7dec
Rescan changed files before pulling on top of them ( fixes #2416 )
2015-10-29 09:12:37 +01:00
Jakob Borg
c4ad97136f
Move leveldb instance and transactions into separate files
2015-10-29 08:07:51 +01:00
Audrius Butkevicius
eab1d6782b
Merge pull request #2415 from calmh/dbkeys
...
Add database and transaction instances
2015-10-28 21:50:29 +00:00
Jakob Borg
fd7b8ec77e
Neater transaction handling
2015-10-28 22:04:00 +01:00
Jakob Borg
e28c991331
Create an instance type to tie database methods to
2015-10-28 21:03:05 +01:00
Jakob Borg
a52811dfa3
Don't use godep to run tests
2015-10-28 09:22:07 +01:00
Jakob Borg
9e210d705d
The PublicKey() method is an addition in Go 1.4
2015-10-27 16:03:14 +01:00
Jakob Borg
c42f1b53ab
pulorder.go -> pullorder.go
2015-10-27 12:14:14 +01:00
