aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2014-08-31 21:44:06 +0200
committerJakob Borg <jakob@nym.se>2014-08-31 21:44:06 +0200
commitfaac3e7d7c73abb155be3d5021283f5be23c7cd7 (patch)
treef1ddfa72b6bd646f0bf36b7269073f803f8d1af6
parentdab434020770817e8a07e642d4fb5b62ad14a7e4 (diff)
downloadsyncthing-faac3e7d7c73abb155be3d5021283f5be23c7cd7.tar.gz
syncthing-faac3e7d7c73abb155be3d5021283f5be23c7cd7.zip
Don't clobber staggeredMaxAge = 0 (fixes #604)
-rw-r--r--auto/gui.files.go2
-rw-r--r--gui/app.js8
2 files changed, 8 insertions, 2 deletions
diff --git a/auto/gui.files.go b/auto/gui.files.go
index 0fb31d154..79c130f8a 100644
--- a/auto/gui.files.go
+++ b/auto/gui.files.go
@@ -28,7 +28,7 @@ func init() {
bs, _ = ioutil.ReadAll(gr)
Assets["angular.min.js"] = bs
- bs, _ = hex.DecodeString("1f8b080000096e8800ffec7dff73db36b2f8effe2b107d729594c89493f432f789a3f4a56e72cfd734c9c449efcdb8be37940449ac2952e5173b7e89fff7b7bb00497ca528dbedddcd3c4d1b4bc462b1582c16bb8b05381eb3a374739545cb55c1064743f6f8e0d1b7ec6fe1793a65dfa7d99285c91c2092228ba6659166391be49cb362c5d9d1bbb71f3f1c7fffe9e3bb0f276c11c57c18ec01ba9771cc085dce329ef3ec82cf03f629e72c5d40b52867795a6633ce66e99c33f8b94c2f7896f0399b5e4163eca7e38ffb79711573c41547339ee4d85c58b019944e395ba42590142544c39be3a3576f4f5e51f3c1dedef8c1af791c25059b66e925b4fd8c1559c947d056524449c9abdf9bb8ccf17ff19b3d1843cd659c4ec398dd7fc616619c0350982ccb38cce46f04daeb97f025075ecc8afee1dede4598b1fc2a9941b792259b543582753a2f633ee8d765fd113bed6fc27c16c69b8ccf564550646192c761c1fb67c343425466f13404f413d607be11feba7e001d5844cbc1a28407519ab0c1fd55516cde67e94534e7d988ddaff155cf86eccb1e838f0618ccf9222ce3220f3ee7d9e23f7908cfde866b6af4bff68f4e3ebcdeff989ef3041adf52f7284dcf235ed5d56a8aaa164101f0eea4088b68f61a062b7f9362e30341247e80318be8f333d68f818dfbfd515d90970b5110fc9aa7499f9e5f03d3f07f9d454596c63120edbfbae04971546431305ee1593e4b3730b0d4ad9a3ff43088c3bca05ad09da48c63c1001c172c39fe011e1fc8aed1a897b319cff3d7093c6f1a98874558e15570dfe7eba818f43f1dbf4b4038797f2811e1275ab0816ce1053b502be30711068b347b15ce56cae07324d484c50ff0204f6126c4e972d023a8de88d1df209a57df8a2b6482f84e141f5a7834c2ad5a46856be5f7b5d2350767b1b953ea54cc9365b162fbecd15953bb66b55915a85710e7bcf818ad795a160a4f4c76d020074b5e0caa89f590f5c7447ffe5d1e25333ee9c323d1e450ab1ac8d11dd4a36c94f32c4bb301fd0b654aef47eccf0707f2c1b5222e12743761592c2c69b97dcfe308d04f1ef5efaec78f0eac2eef48415beb56cb2db3fea47ada3ef3556d09dfe374162254c5461c2fd045173f40b198f5d553e8d0bb1fe111ae19cdd324bc8896802159bebc0caf708871b968ca539af4f67354f2615688954396a91a6996ae373127fa27eccbf5a15e86cb81eff971829cd0086dca134e3cc9edcac4637c7e7aa63d87d58cc736f8fa8aa66abfaf3d4d00d8816393a5453a4be3a315287758eb356e48988c6fd2ac00b6877663a2ec3d0c4bc42fbdb51d9d02632579851db3492d37cb0cd6a0e364913aeac14a55a173cbf4c3de1857aadeb016df46deb02057e725d832af23305bd0665944595e300429c325af2c993882871bb156922d840f61c9ccfa7965cda8d8c82202eb2994eb265a576183f492b35578c15978114671388525817d143546acc7939e8a2a47dd2c1b942db1cb08acb87558cc5604ce807ff077ffd309ac27972b58bf59ef7f56fb1fffde2348159ba804427f5583a00999a405fd3e7adb0b1a7d26d6d7643912d5602e34aa05963d364080886621fc794eb0b95c3be0c9c387a6ee43000027b8d3e84c5fa8c45a0b4a432e3ecfd963cf224ac6a2b1ca69bf2a72a1ad8b308ee66f8830b0420b50448d1c8048e611701f8b5d4d01bf3ee2d8636d5008455919c2381663d41063510686632c06654a1213a7978a3c28e866209901fb3b9ad7eb4d9881e99c0af1c20a58c8c0dace913832c7792d324e6468a2d7a294c3d7380e2c40b593c00ff56750a46fb0e123687830b46ae28068e072605e3065985c7cc38f6097de1c4c31fef9dd824679c826b5f6d606927134e75b91c62a327d103d48bd1651d5cf4a62ea3e4ed82357d79ab5090de6badae9c199c34e13e4fa04f55a533f2041d370768ec4c06424e125e47cbee7691b677eb5b20fa5161c5c025bd2cb613085bf83fe94c334e565128335afacb89a4d622d90cdb2743dd4d7bcfb50b557afc862b13811dab5a7aee72afa4a87a0d958d504b51f6660320f032c3934ac6d7b2e1a1d279043838f26ad09e7f397cd5a5a43f7b3751f9c951f78acf830f0701e65f239d87e5136544bd19ec1425cb7d5e7455ace5658f06933475f51145d9b641ccf3c44647c0ddeb5930ebba8220286578ea7831030977916e5e73529e6f0356e8e3a6064fb814b9d69acc7e190e6d137dfb07b8d45648e8f29e7d7cd12a2ba3c9a8b558fada02d4ac0ac561ed76659238da225db2aab310dfaff2fe1c5659a9d9349d11fa26d14c683fe0a166dad4d806c30b5c3e5abb24096bba15c3344710ebaf1d898815fbfb27ba2fbb7e073e39d581c35d88614b48cad97ab5b6720f102430a5c9a951dd881da622e4c4c2821ff57a754357a85ab8a96e59945b51b8cec462e3d5d58fd3a75e10d68adf818571b31cd6fdd0fb00881dfab0f40d1a0a64df523613d104d31c5cb40d2cb9cec2eb43684254f76269800f98a8c098cdf2132b0458a5560ce31b2c1556ebc451c8e0006e23e5a38a639d17d54d3540112a2e31f464ced4dcdd9b6a9f201d45cc1ff08e6fa3b4150d8139b7e27cdd8d91fa25c3a6b9d280629e4309ab69b775a752088e6671691d8124ea07cb08d9ea31d88a109bf8514cf7cf2816b8b5bdd4e32dde4cfd8c1c82a49cbc257749c7c7f55f0fc635a84b113e05d596c8178399f03f3007d4d61084f74b8eb4377f72aa1d8debbff2e04018f0e0ebca85b94ca11850228caea183373b8b4f841f06e4323107cfaf0126caf4d810efbc48e4e8216395e808f8a0ea770d071d95c81a33005af9b251c7404f89261852301cd32e7335c25e6231313e898cb101c51f057c2fcbcf67ef1f73a3c07f783cd56693403e7e6fb9234d23c4dfa05d53151419569b944146b362f33240a57ff288c3180566e462c4f49a7f102d152249b149a85088828a235af7c25e1b95f447954808fb5e289dc98101840356e70c7c32628949e3fe102b0754aba344c703323632bf8073cf9653a42aa64ef4d1cbf95b082a269bba795a0aa22b27e46aa70e14967e51a43a6822a54367138e383f1e0bb67f0df3fbe060f0e7fc91f0c9b4af0eb9709fc3338fdc7e1d98361f0e0fef0eb3fe0dff188f5ee3fea397c997b4d65970b63900044f59a0a931e7bc830b6061af1120cf987ac77b80e3fef831051d19383078fbf7df0e4e981e16579dd3624e8a1c282e72af67d26703da028a5dbe74303a4749a1d75dbad0e56e51bd1aac1a729cc343e7f0dff6af1a37a02aaeb07ad04c6c273ced147ea2960c81684344c2abdad53a867695507088a887cda124326be38a3b864f17c87e450fc9c271824f8f4e118d7bb348151179d7245c5cc88b7d6986a4f91f1208d287b34f0a36d74a8ac1a11a7c442eb1a4973ef42c4af47e4055806a78785f562e91ed9932bf091d61a4bddaccc09b0df95557adc95d60efcee5c68046a270b5dac1324f72cb65db7f7d430d404ef2de703834893c944a5dfed77b8dc0e7b46348de2bc20ecff42d3a359e1bf43d2688e481afbdfdcf9acd12daddab6c006adce3aa4c4aca284c1cdcf75dbac35f1681358293ddc7362c131066307c3bc2336a38d4247880d3f754c78b6de6018f4065d4796616d94c89eb0b17a6df0f8714784b7b3073fd8b187132fa78094333f5a6406547e7407631288be62c003281a236acf70b8148432e946ac99eb23ef08fc7354ef51ed3e48af66ab0e561c8ece8a9876fd52dc866a2c0ddd9e2d70876b8030fbf55ee210984e1dd6cda9b9310acad623d4d75946e21f51f28b4f2b08d587d30eecf07797c9fb0c86272baea0dad027e67ef1b625acc8ae3c58686f1f9c9980dc3220ffa7b0580560da0d608cffc21e085e1284ea8301871cbe9f0985cc2be60ea9d25a166e5f6bd39a77e76f5b03f3367ecd66b4db35b002695ea678149bdd85ed9b0c5bfce7ce8b7f3369f29d2d008ad8759967627379575ba7de92eed61341cd0dcc184aaeeaa42c0070273d01b3f0a8daacbf17e5afd69be2eaddf457e0b7ee730f0d35606ef4db0c70bbec6f22b0e440fb656cd20a216318c1af69940cfa23d6f71050ede7ebb828aee72427d92de2a775445b429aa89f3b3c821f6f888406db586e862df4e669560812c5aea98719558e01fefd29dc185113f43fc0014db388e7466362c40358c1f2818a6be8e0946943571fcb6fb415841686bd5104d668ac2512eb21c15ae54d56d20255cf8a16799089505a1ccb44bed745b94175b74ae834dbc7b42db6a3de32f270a419dc3cf3aa269118a4c766b7bb24aedc144a6019e3a83933545a88af525fbae9dc9acc16b55ba5c5a9414a8cc829f9705a7f0c47da115b170adb55a0db7fed11ef2d02203325761dfc2ac1c2e46007911351d45d1bd412a7766e53a641eddaa89e3d65b62ad3f65a9214db72b034e1d1c5460ea39649b9a3e86c9190caa4f134bf494fc43e994a812bee8109b3e9c219d802d7b35f2673bec04878df1d0c4188f304f7850f5d71116bab52a8fb28a17424760f9bf062ce8b74b381969d982b208c53385aa00d4e2f6f8ee230ff03581381bcfc0e7c99e32e72e6464c59df7273b7036f2a5a6415a813cd63ee1f1131f5fa2e37584783cb11e51478306db2681d66575d30cdc224b9292ac74818e28084bee7d98c27056e10fdde32f148dd30b8de260fe2b007b97884dfdadb7263d5a46133c3050c20c0c1748a1caef4a289b10b40a1e1d0e42b39b08b38051d0acdb87511aeed98f9a3b1d661d7e9fb7bb59b6b18d92603b45a5ecbfc9b6fb69bef75e46942dc72dbb6429ad2f3be61e1f9767daa1a52699bd5da14db3a4acadc2db344b9a5c2febd796aab964e8cb527ff56c6fa7501528f1ee736b6526817f8a9399c3eeeea8a16013d93188b02e9f0b6e9b2ef5a84424dc6ff67754121020cb73fb5ea657f577ee65b87a1dab66928edb6816358c02efa7e4ff6c411ac353ffbdbde32ceb0bcccdfd26695c11dbdbbd8039138abc44564d8c3ccff467aab669386954c603dd4bce53a49985719ee60add839c2125bbd1eb67454623b3d38f30a833cc0b7551ae4ea2c4b3b2ec9bd9e6f45aec7199af75456415afaa84b0cb830d3bcc830ecfbd4bd686206db5b57c7cd2116db9666b58131600a5fba326520ed7aaa346c65d136fe74614e67cef079549cf0027378722f67c663304d281b07f33531b306ea5e351ea6e4d67a23a38dcaa1580474e719d9c9ba0d82e0d38757091e60a11d1557719da284e7275d98fefae9b89d0c00307372251fcca410d3c40d2f781ddd75463248dde184617f3b79f736c0a3c3c9325a5c59c15fb542ba11478f56743e377fc6be6014ac00e5b6ff11e48dd2b0379b3812b9ee633a157badb8cec2cfdfa4b9337a3d428246d488cbe5ef769af026b1318571dde363c475574cc91e89cec29b9719fc93aeb938053113c9c3fa98d5e7d4ee5582c37f2bc338774bf0c816dc21fbfad5eabef8b4a304691ce9d26be81c499b231bef68c5c5010f6f4e1e97730933f1a29cbefb2c54e71c6c6c53f71c7cee70a5946172572213d69deea52638dc8820540a3b93b3ffa835ceac72ba3ad8280e67e1610c4a3fe4b504d13613e5be1b8cb6873df894f38f6f4e2848a109802cf077c43e5ea99f6a7077e22528912ba0f99255fa8ee1019a38beda73b4a14bbc47a32af27fd882c4af922d89f752a06f646dd9ee3a29b2200795590cfa2354eae14651569f152bed73002a1a0387f6ce85a5f4f5130aed0b480f0f75f47c4145928f9698a67226451f58cf4193e1d6c54056721c94719e215675e8c965849bde977cba412d53cf003c5806f2af689446c80d013524591cb99668c0884292fbd6be9177c2d8f3c2446679bf3a6ec7b1fa8163b289a36f417dc84c69a5fa6a34539f8e770952eb99684125fdab0b8b8c98df545844f5dd64a56d87c0759aa75d20fd9458c7a3baec2374c5e4361be4d9ab1b71d3cd2ce53857376e59e7bf1c642b247b8ff83bcc79a7376b787715da32cbc0c09435ee07fc3368cdf9e0cbf5a872b16c52b009e0ccabcfa0629d1cd2c04e78bc1059514660418b2bd8fd6d08ab62383c17f90d15a6fab196cd60e041e05773dc9e0feec37c7f9f11d19a4387a351b16d8be51fd991028da980299affa69c10cc57e965df8d2b9c6f41e61aa12f2a2ff0d0e65512aea319f41da344580278c4f546d71d06ce3ce9e81a3937ccddf2559c63daca5b0b9b35e155c3d1e8ee0e871edd49302dc11ea7a75e89ba62d7a9522d4a3b4c7a91cc61d0a1ac2dcd8d0973253956249af8778e45c29b81da28e8d0d95b74d8ecb43d00b6cde5f0ff5aa5a60ae91ca1ef3b4f133e62d1e1de8e425587bf1cbdb2a01ab5e45255b73548b10bf69c1409a2cd7d199ac0b65c9ba1b87d047b1a9da9815f5d65b7f87755e5a6c78716a8a4dc7650f033cd7878de61cb41a4b9a6f60966adc79b325f0dece5cb33c15d5960065cb779d85568533c1e57e1f2d91f6a5cddab783aeb1dfdc088c72aaa829dad932902c3c0d43d3790bcc460a3f3d296a4e32e84da79bf10397a0c3e6ffb3854ea4319f566f406868a908267858eb55c933a409bbbcd37b47bd177ed281a2253d6960d5ff89807e8f1b017b5b056f7246d958e59ccc3ec559598db6ab2a8972f69749eea542b97c111595b8d6caa37264a3c46d5228bc07e8dafec61cd8b4c25d575cd5057e16da2bbad229c93b50affd68731674a22a5b11b836543e77108397280c71345d8a45d04a682d31351bd3e04e69beee643c81a5a74c7eb432875405c623a625e8dd917db7255c1a56562a7b6fa92327d4d9d264aa6b1be2e991b740e5472c311ed6865e7de091060f85e9c3cca23dccbb54e1eb9482548bc335369c9b57e3aeaeab54ea8d3341babf6b76210703f72be815a0fdb7bf73eccc2751e9c03b0c2c126907b77cc2bc2e592677cde897f15f09db3b0a6623b172bd09fc2cf2f29194a49f0e9c6d5b5a839667f79faedc1812740ea6af208b464729cc0b27041c7bfba3537536b756f4c22cadf43f72c33d9d3d48552c7929badc3eb1f9f04cc43e7f6ea36316f2ffffa95fdb95d8d5983dd0108b03e79da11af39a2dd61a91575abe57663e906854670e7ff86d1225c8e3ac61390862df184703eb716b0ad2bd7176d757806eb50fb42f481632a65c5e413c0f0b49dc59d65769ba4ee2a883716b11b4b4dcfee4dd7e8d3dd4a027a63ada2208e5e6cd22d1102ad292b42201138a78b0555fb91a76776996ea1284e8f6da4d426ac482bc2d88f138bcbeb77379754e6d044b4e576b4944e088fe78b30a39e4942acb3400e5d2c2f2e7292615c935dc1f8664f8b595555d5967fbb4bfd2abd42a0e9db87cafa62cd0218bb3695a3f18318faf25202ea543d651da7d4740ee90c3399e3b0043b54f8d1678f7562a8d7d4da99a715a69bb055583f15631ba93534dc03691dd92d1016cda8b146c9a9fb3c98549bc58b485585b71c79b70ddbad8ee04d37d823bfd9e7abf2b366beb5db6f060e574fece05c739c11eb0805287ff90274ea514c09ed7279778ed8d12d78b9b18c54d268c58bc09bf76977afef8a398166880cf16821a53a5650053b64e6ea4049f81b0e3dfb88021dc53a1d01292aa46db4de8879f215c428b6db559d56cbbbd9a4d1efbe13d2e2b050b47ce23f485c78f1f2fdf18f747d4dc3a7992e2a180baaa1b23099a7eb134a131c3c3918b1278f3d862d652b7dfab0d5b2f5dfe826b2ae30a3e34d982df1aa35bc914cdc090dbff382f1ca44139964d5d5d1dbf9508940e9b923d51228ba14ee76bd5193b6ee8a30dcb57dcb456e86f7f452352929f7451c5476d8b474cb29a743ccbec40b3dc9b237467871d356ef0eee0cd2c8642d370a181d7107c4cc5cf2fa32648d55f45620432d2e7e10f375c2be3df8ff4f0f8db22823e303e7c2a3a74ffef2ad610312c6e0751c2e73f60de017b81e36f58643b25b1c059e436ee24264a77da43726516af8fd48bb616c881348b7112bae61de1224a90ffe6072ae19ff30b7a0604a67d1bcfd789e3308df1337c18d2b0c1d04d5adc8a669e98f59e3b421884e991458f4811b6f8a68d3279901eccda6c9c8c5b796bc8e9cc2ba37e58f7a6f35ac27956dd6ac4d74fe4d249a61589076896b0a95ddcc413862d38a58e5ec4248a708c4c9d8e6f402866325c0d409609e1091689e4bf0a14b2455152d1fc96a2f6435c9823d05abf06909afb5fd6ce015f51acca2ea8bba2a7047e10dd9621ede8441a389b069e7cc6c6fbd41f0424560d3803789c4155e3a5da4ec7dc4ae1b425422d6a75965134b32a4b0548780ec06c9b659ab2dc68a996a6491acd5c6626186ae313364a8f63a1606a5c2529d8a58a70216fc688da9efe861b1a4d4889947cba8c8470854850070482ee471c703c7101c54b4d01f81400fb2d357bcb782be84536a7a88373bd5258f0eaa29882d33fd1629a091ed4bcc7ad704991a8f55232ee609c816d6da13644f056df487e2b18775cf41cf89ccb61edeb2c62f4faaad3ef1ca9581286f5e5f025fc43c6b18226a55c40b4a06c3a0482539444990e38bf5068f150b4436fd7022314810e8b9e0023804b240b43e62d83360894653ed746873418268ef02d139a65f8c944e7f55e521a9f5028926fe44c154a094b614b34ba34168765d06953b5546ec326c2eb3a50b094542305d6e9d8b3708f2cff0139f83efbbdee01538791923c4328c12e56d5ff81e89aced4410be748c4df47b6a6bbcba7b44a0cf35eaaa8fa410b7969bfc656a5bf4069062ede11673a141d3bcf74ea5807ae70e0062f7653f033c917435a8d9845c735c0f24cb195dac9e3bdbc40fb5691bd1cda836dfaae5b21a7f17cf9b563119a3c12769803f745fb152528f86364cbab13aa3ac11341bee491e1a9ead7cbaebb8196cdb95cd5b58ec94818adf86ad6f1df116b4d476cab5fa2636997ad24f42000df5f7af552c3006890da26483738c2ee770cc662a06c5f13afacce7837ad5d06a356693f16ab88aa06994e041f6eef498a60d3da4b5a7367f7c06fa01f35ebc21b0bc0043edf1b7ec81fac78acb13e478e2003545a303971e0ff192ed3efb6bb40b695d68ba05313f7523a6958a5b34ffa3bb79f5f28d0c5f335bc903d6e96f93b335c717c3fe0bc919dd4ca2fc69e1a6097a1b39db85b22e24dd46cc3ad1d24ac42d5a3fff1d840c5cdcacb8a18c69c43bcf837b1a0de3cbf02a7f5baea73cfb43e4db79958f4a7e2736d1e6ccdd92eb2256dde2a6936c614616bee43325798f4f7f19fff2cbd9d80c7e0b587003e84b6dd94fd8130f6794de3bb9d30b82608c5106815058f12af2fdc74319df1ff7b62f9d60aba3bdfdefc945efe519db9848684e35ae3d3adbc62bda5cbcddcc7444860468f3168f3f8d9723bcc1cc47cd9ce20cd1051ff4538a928b0c8a36ba5432c4bbcd9fb1fe91b24b2b1b972f4f6f6c647c67de2c2ee7560985a6ccbd5c792416704fe457a5896b052d5f6fd01a06c0e74278300e35e9a151db63c9729fe28e939ebe17702a71e2eb747a2f9e8fa9e68bea2d756d6c2a93e8b79276b35c2f3074f0e8b7122a0375c9f227a444e9451c25e7cf1a1cc48611d8db6b30d48b224337b2c8625328f159701fa42de7591e9449be8a16ca41540c4dfe1cc6ee240cbad1adcbfe59f5116fda01f558c6737c7f0ed9d0c06d27b0a00c38fb334245c595c12de3e6f67a309b80b7ba275777c47b3fbf7ce50e828bbda79c8571c6c3f9d58dc823efd14fdf761aa29c098477ca1d87234d3256f3c77078ad64f05671a601c57067a4bd90537be7fdff09b53e6c3acfdaa5da4d81fb969484507e17cd27fd874d8f1dfb75a07837bece551c41187160a20db2530f7d13a353576fcbc7ba1167899933e686bcd31943fb4a3b2f90affaf692f5298ba184f005ab621ddff91a5a44458cb3f43f8c1c2af1ea46474134c353c0d6e3599ce62e3cb4f16f3cbfaedef48a1cfc5f000000ffff010000ffff476a365b2f860000")
+ bs, _ = hex.DecodeString("1f8b080000096e8800ffec7d6b731b37b2e877fd0a98d71b92363594edac6baf653ad751ecbdda38b6cbb2b3a74ad19e1a922039d17086998764aeadff7eba1b98193c87a347b2bb55879558e40068341a8d7ea181198fd951bad966d17255b0c1d1903d3e78f42dfb5b789e4ed9f769b6646132871a499145d3b248b39c0d72ce59b1e2ece8dddb8f1f8ebffff4f1dd8713b688623e0cf600dccb3866042e6719cf7976c1e701fb9473962ea05994b33c2db31967b374ce19fc5ca6173c4bf89c4db7d019fbe9f8e37e5e6c638eb0e268c6931cbb0b0b3683d229678bb40494a2847078737cf4eaedc92bea3ed8db1b3ff8358fa3a460d32cbd84be9fb1222bf908fa4a8a282979f57b139739fe2f7eb3076368b98cd36918b3fbcfd8228c73a81426cb320e33f91b2bedf54bf892032d6645ff706fef22cc58be4d6630ac64c926558b609dcecb980ffa75597fc44efb9b309f85f126e3b35511145998e47158f0fed9f0900095593c0d01fc84f5816e04bf6e1fc00016d172b028e14194266c707f55149bf7597a11cd793662f76b78d5b321fbb2c7e0a3550ce67c11967191079ff36cf1ff7908cfde866beaf4bff68f4e3ebcdeff989ef3043adfd1f6284dcf235eb5d55a8aa6164201d0eea4088b68f61a262b7f9362e70381247e80308be8f333d68f818cfbfd515d90970b5110fc9aa7499f9e5f01d1f07f9d444596c63100edbfbae04971546431105ea1593e4b3730b134ac9a3ef43088c3bca056309ca48c6341009c172c39fe011e1fc8a1d1ac97b319cff3d7093c6f3a98874558c1c50f70f0df573c6127358fe0cc86192c8dcb15108158384ee1f90610c7721844c20534581a51a282da64e912dae7d44a3238838a790a93b001522fd26c8d8bae28b32467212ce50358ad5132a38e54502b9af99cadc21c961460b880c5b082357819152b822fa088450a7086235194a40c0719a8c03ee2a206d68d80bbe32d5b739878b162119032a2ba37940bc588440b5581762ac04ba897a4050b6745492081da30ee451937fd460b36b867d21b3f3ccbd2ec7522e6e2502b12636a9e5dedd55f2517dce7eba818f43f1dbf4b603a787f78b8a7f52879e1053b30bb25aac004bc0a672b6599726429b32e7e802c790a322b4e97831ed5ea8d18fd0da279f5add822bb8aef8ef158885bad8c0657caefab436bf4ea1ac0ee4e6950314f9630f3fbecd159d3ba5e146653c05e010cd3fc315af3b42c149a98e4a0e5182c7931a844e043d61f13fef977c4be933e3c125d0eb5a6815c87837a3d1ae5c40d03c913eae847eccfc0d5e2c195b2b065d5d6656d31cb626171cbed471e47007ef2a87f77237e74600df99a18b4f56ef5dc229f6b81d82ea355bd06dfe3741662ad8a8c385fa0352e7e8062219faba730a0773fc223d4eecdd324bc8896002159bebc0cb738c5a8d89bf29416bdfd5c0a6da1e36599aa3b66e97a1373c27fc2be5c1dea65a8b87dcf8f13a4848668532ec5666e37261ae3f3d333ed39d81d3cb6abafb7b454fb7ded6902951d3040cb14e92c8d8f56a086412368d4907532be49b302c81eda9d89b2f7302d11bff4b6760c0acccae4150ecc46b5dc2c335058c7c92275b4039ba202e7e6e987bd31da14bd61cdbe0dbf61416ee8ecd791544c8b28cb0b8655ca70c92b9b338ee0e146583564b5e243306eb27e5ea965151a69c208f5b1b070d00e0e1ba0971cf4e20567e14518c5e114540228546a31623d9ef4545039ca66d96165005c46606fafc362b6a2ea0ce8077ff73f9d803e114646ef9fabfd8f7fef514d159a68044cbfadaba04646cd8bbf8fdef682469e094b28598e4433580b8d6801b5c7065821a255087f9e53dd5cea0e78f2f0a129fbb00254a77aa7d199aea884ae05a12195cf73f6d8a344c9ac37b49cf6ab4217faba08e368fe8610037fa10041d4f001b0641e01f5b1d8d515d9395ca02b0d8966f2c72821c6a20c8d19312953e29838bd54f841013703ce0cd8dfd1425a6fc20c6cb454da83d0000b19f8453922478e13af59c6090cedb49a95c0bce4b1622c551f7590400ff56750a46fb0e323e87830b45ae28468d5e5c4bc60ca34b9e8861f694b6aed6189f1cfef1634cb4336a9a5b736918ca3e3d50a345681e993e801eab588aa71561c538f71c21eb986d6e826746dea66a707670e3bcdb43d7554ae34f1031c340d67e7880c2c46625e02cee77b9ebe71e5579a7d28a5e0e012c8925e0e8329fc1df4a71c96292f9318fc2e45e36a3689a5201bb57435d475de7d68daab35b250162742baf6547dae82af64089a8d554b10fb610626f330c09243c3dab6d7a23170aa7268d0d1c435e17cfeb2d1a575ed7eb6ee835bf9038f156f131ecea34c3e07db2fca866a29da3358887a5b7d5ea4e56c85059f3673f4ea45d19589c6f1cc8344c6d7e90577e261175548c0f4caf9742002e632cfa2fcbc46c59cbec6cd51278c6c3ff0cd328df4381dd23cfae61b76afb188ccf969f1b154974773b1eab915b8450998d5cae3da2c6bb851f4645b6535a441ffff24bcb84cb3733229fa43b48dc278d05f81d2d6fa849a0da4f67af9aa2c90e4ee5aae15a23807dd686cacc0af5fd93d31fc5bd0b9f14e2c8a1a6423a7da3fb75eaaee5c81440b0cfe7069567620074a8bb93031a184fc5f1d53d5e815ae2a5a966716d6ee6a643772e9e982f6eb34843720b5e263d4366299df7a1c601102bd571f00a3418d9bea47823e105d31c5cb40d4cb9cec2eb43684254f76269800f98a8c090cca20308adb04e61a231b5ca5c65b84e1086020eca385639913de47354e55450274fcc388a9a3a929dbb6543e80982bf81f415cff20a8168ec4c6df89330ef6872897ce5a278c810b39cca6ede69d560308a2f9998524f6840b281fecc2e7e81ac8d082df818a673df9aa6bcaadee27996ef267ec606495a465e12b3a4ebedf163cff981661ecacf0ae2c76d478399f63c4f459cd1c41084ff47a5787eee1554cb17b74ff5d08041e1d1c7841b70895230a05503cdc3167e67469f183e0dd866620f8f4e125d85e9b021df6891d9d042972bc001f151d4ee1a0a3daace3b109071901be6458c14840b2ccf90cb5c47c64420219731982230afe4a989fd7de2ffe5e87e7e07eb0d92a8d66e0dc7c5f92449aa749bfa036262868322d970862cde6658648a1f68fc2180368e566c4f294641a2f102ced399040b300011245b4e695af243cf78b288f8a40c4e0c516928000a2718331681ba12a244db0a0da3a25591a26b8ed94b115fc039efc321d215672f4268cdf4ad0a068daee692528aa08ad9f112b543ce9ac5c63c8546085c2260e677c301e7cf70cfefbc7d7e0c1e12ff98361d3087efd32817f06a7ff383c7b300c1edc1f7efd07fc3b1eb1defd473d872f73af69ec72610c1400a95ed360d2630f19c6d640225e8221ff90f50ed7e1e77d60222a7a72f0e0f1b70f9e3c3d30bc2cafdb86083d5448f05c85becf04ac0714a574fb7c6880944eb3a3eebbd5c1aa7c23d21a7c9ac24ae3f3d7f0af163faa17a0aa3f4813188ae79ca38fd453aa2159b0a66152e97d9d423b4baa3aaa208bc8a72d3164a28b338a4b16cf77880ec5cf798241824f1f8e51dfa509ccba18942b2ae6da58a93b53ed29321ea41165cf067eb48d0e955423a29450b4ae9934f72e44fc7a445e8065707a48582b4bf7cc9e6cc1475a6b24759332a78afdaea4d2e3aea43bf0bb53d108d04e12ba482750ee5964bb6a1fa961a809da5bce0706912693898abfdbef70b91df68a683ac57541d0ff8d9647a3e1bf43d4688d481cfbdfdcf9aad12daddab6c00eadc13ab8c46ca284c1cdcf55dbaa35e1680b58293ddc7342c139066307c3bc2336a38d4247880d3f754c78b6de6018f406434792616be4c89eb0b17a6df5f1e38e08ef260f7e70600f275e4a012a677eb0480c68fce80ee6241063c58007603446d09ee970090865d18d58b3d647de19f8d788dea3da7d905ecd4e19ac381c9d0531edfaa5b80dd5581aba3d5be00ed700ebecd77b8943203a0d5837a7e6c62c285b8fd05e2719b17f44694a3ea9506730046087bfbb4cde67303d59b18566431f9bfbd9dbe6b022db7aa0d0de3e383301b96580fe4f61b10ac0b41bc01cff853d10b4a41aaa0f061472f87e662d245e31777095d6b370fb5abbd6bc3b7fdf5a356fe7576c46bb5d032b90e6258a47b0d943d8bdc9b0c37feeacfc9b45935fdb02a0885d9775263697af6bebd45bd2dd4622b0b981194369709d840554bc969c805578546dd6df8bf257eb4db17d37fd15e8adfbdc43430c981bfd3601dc2efb9b082c39907e199bb4d690318ce0d7344a06fd11eb7b10a8f6f3755814d773a2935c2fe2a70d4453214dd4cf1d1ec18f374442936da89b610bbe799a150245b16bea21469563807f7f0a3746d404fd0f7040d32ce2b9d19998f10034583e50610d1d94326de8ea63f98db680d0c2b0378ac01a9db544623d28585ade242529a87a55b4f0834c84d2e25826f0bd2ec20d9abb4542a7d53ea66db16bca2d230f479ac1cd33af681289417a6c76b74be2ca4da1049631ce9a3343a505f92af5a59bccadd16c11bb555a9c1aa4c4889c920fa78dc770a41db17521b05d05bafdd71ef1dec1003253e2ba935f25589814ecc072228a7add0eb5c4a96bf729d3a0aedba99e3d65f62ad3f65a9214db72b034e6d1d9464ea39649794dd6d9c1219549e3e97e939e887d32150357dc031366d38533b005ae67bf4ce67c8191f0be3b188235ce13dc173e74c545acad4a21eea384d291d83decc20b392fd2cd067a7642ae2a619cc2d1036d707a69731487f91f409a08f8e577a0cb1c7791333760cacf979bbb1d6853e1229b409b681e73ff8c88a5d777b9c13a1854479453e081b4c9a275986dbb409a85497253508e9930d801117dcfb3194f0adc20fabd79e291ba6170b58b1fc4b11c72f108beb5b7e586aa71c366860a0c6a8083e96439d4f4a28bb1ab8282c3a14957726017710a3214ba71cb22d4ed98f9a391d661d7e9fb7bb59b6b18d92601b4565ecbfc9b6f769bef75e46942d472dbb6829bd2f3be61e1f9767daa1652689bcdda04db3a4acadccdb384b925c2feb3696a8b964e84b517ff4ec2fa6501628f1ee72eb2526817e8a9399c3eeaea82162b7a16311605d2e16d9365dfb530859a8cffaf1a828204186e7f6a95cbfea1fccc774e43b56dd360da6d03c7b0805df8fd9ee48923d0353ffbfbde31cfa05ee66f69b3caa08e3e5c1c81489c55e22232ec61e67f23be55b749434a26a01e6ade729d24ccab0c77b056ec1c6109add6872d0395d04e0fcebccc208f5aeee406a99d65694795dcebf934723dcfd0bda7b15aa5658c3ac7800b33cd8b0cc3be4fdd4a1333d8deba066e4eb1d8b6349b0d8c0953e8d295280369d753a3612b8976d1a70b713a5386cfa3e2841798c3937b29331e836942d93898af29ce966eb68d8729a9b5dec868a3727c192bbaf38cec64dd0640f0e9c3ab040fb0d08e8aabb84e51c2f3932e487ffd74dc8e0654307372251dcca410d3c40d2f781ddd75463248dce182617f3b79f736c043dec9325a6cade0afda20dd88a347f23ced33f605a3600508b7fd8fc06f9486bdd9c491c8751fd3f9e52bc575167efe26cd9dd1eb112234a24e5c2e7fb7d38437898d2984eb1e1f23aabb624af64c7466debccc389d6f16a720662279589fb3fa9cdabd8a71f86f6518e76e0e1ed98c3b645fbf5ac3179f7690c08d239d7b0d9923717364e31dadb838e0e1cdc9e3722d61265e94d3779f85ea5c838d6dea5e83cf1dae94324dee4664c2bad3bdd404871b218442e1dae8ec3f6a8d33ab94ae0e368ac359781883d20f79cd41b4cd44b9ef06a1ed690f3ee5fce39b130a52680c200bfc03b18f57eaa71adc83780942640b385fb24ade313c4013c7db3d471f3ac77b24aac2ff872d40fc22d9e2782f06fa46d68eedae93220b721099c5a03f42a11e6e1461f559b1d23e0720a2317068ef5c58425f3fa1d0ae407a78a8a3e70b2a127fb4c434953329fac47a0e9a0c772a03d9c87150c679865895a12797116e7a5ff2e906a54cbd02f06019f0bf22511a263718d4e06471e45a8201230a51ee5bfb46de0563af0b1398e5fdeab01dc7ea078ec5268ebe05f52133a597eaabd14d7d3adec548ad67a20596f4afce2c32627e536611cdafc72b6d3b04aed33ced0ce9c7c43a1ed5651fa12b24b7d920cf5edd889a6e6229c7b9ba51cb3affe5405b41d97bc4df61ce3bbd59c3bbabc096590606a66c713fe09f416ace075fae46958b65a3825d00655e7d0611eba49056ed84c70b9115650416b4b8823dde06b12a86c37391df5041aa1f6bd90c061cacfc6a8edbf3c17d58efef33425a73e870362ab2edb0fc233b52a011152045f3df941382f92abdecbb6185f31dc05c33f445a5051edadc26e13a9ac1d8314a842500475c4475d561e2cc938eae9973d7b95bba8a734c3b696b41b316bc6a381ac3bdc6a14777124c4bb0c7e9a957acaed8752a578bd20e8b5e2473187828baa5b93161ae24c78a4413ffceb1487833401b051d067b8b019b83b627c0b6b91cfe5f2bd754219d23f47de769c2472c3adcbb2653d5e12fc7a8ac5a8d587289aadb1aa438047b4d8a04d1e6be0c8d615baecd50dc3eaa7b1a9da9815f5d64b7f87755e366c487565589b9eda0e0679af1f0bcc3968348734ded13ccda883765be1ad8eacbb3c05d596046bd6eebb02bd3a6783cae82e5b33fd4b8ba57f074963bfa81118f5554053b5b1753048681297b6ec079894146e7a52d49c75d0875f07e26728c187cdef679a8c48732ebcdec0d0c112119cf0a1d6bb926758036779b6f68f7a2efda913544a6accd1bbef0310fd0e3612f6a66adee49dac91db39887d9ab2a31b7d564512f5fd2f03cd5b1562e8323b4761ad9d46e4c98788caa451681fd1a6fed69cd8b4c45d575cd5057e66da2bbad2c9c93b50affd68731674a22a5b11b836543e77108397300c71345d8a45d18a6aaa727a27a7d08cc37bd9e0f215b68d11daf0fa1b4017689e9887935675f6ccb55ad2e2d133bb5d59794e9ebea3451328d75bd646ed03940c90d47b4a3959d7b678500c3f7e2e4511ee15eae75f2c8852ad5c4db4d959e5cfad3d1566f754283a6d558f5bf1382a8f723e71b68f5b07d74efc32c5ce7c139545628d80472ef8e7845b85cf28ccf3bd1afaa7ce724acb1d84dc5aaea4fe1e797940ca524f874a3ea5ab41cb3bf3cfdf6e0c01320757579045232394e402d5cd0f1af6eddcdd456dd3b9380f2f7303ccb4cf67475a1b4b1f866e7f4fae72701f3d0b9bdba8bcddbcbbf7e657f6e17633eca77af0b7de827e06f47737755e80477e8eb3ef02a40834ff1726c4a9c8cb7b8a7f14f9ea574ff1f857f59be4acb585ced27159b0aabbef457def08c804aba4ae1c9d33f07ec24159704e2250c6a2d101451d1cf5548f58dbdf5e6ba7e63af9e3ad8baeedab7e83bad5cc0becd95e8181443addb316c8278ec089b84f3b9a5a7772ae82f9a127c06eab65ddf7ee098315af1e8094078dacea19d97e6ae05d971bdb9a7e83a2bf4c68bae678fa66b90ed6e39019dce565610274c36e98e4088d695150891009cd2c6aa55bbcba76776996e8829be9d6d8bd596bac89ec21097138a2bb8e1ee2ea9acbe89e8cbed4f2a83108edd17612d3e938858479e1c2a47decfe444c3b80dbcaae35b3d2dd663d554b372ec21f5ab2c1201a66f9f9deb0bd50c75ecd6548e361e42e8cbbb176850f592751cc6d329a413cc248ec3e0edd0e0479fd9d989a05e8bf2da34ad20dd84acc2c8ab08db70ad21e11e4823d0ee81a068b69b354b4ed9e781a49a665e40aa28bce5ccbb4df56e6d046dbad53df25bb7be263f6b566abb996ac0708dc4361c9a539bd8460840f9cb1787544f9ccada2ecffeda8149baec2f37d448c58d56582c5c7ba5bbd745c7d44733128870b4c8591d12a9623a324177a0e4350e879eed52018e42ba8eb81b15d26e616fc43c69196216dbedaa4edaf26ef6a2f42bfe04b7382c142d6dfa0f62175ebc7c7ffc23ddd2d3d069a6b30a86bcea5a5998ccd3f50965430e9e1c8cd893c71ec39692b23e7dd869d9fa2fae13c965e847bc09b325de288717af89abafe1775e305e99682261aeba217b371d2a16283d57c15a0c4577dfdd6e346a6eda5d21869bd36fb94841f11ed2aa1625a5f888f3d80e9b962e73e57456db975fa2e792f6c6585f5c28d6bb83ab91343459cbc509c640dc713f3365bebef3592315bda6ca108b8b1fc47a9db06f0ffeefd343a32ccac8f8c0b5f0e8e993bf7c6bd8800431781d87cb9c7d03f005ac874dbbe190ec164781e72c9fb8f7d9691fe99d49901a7c3fd06e101be404d05dc88adba677c482eaf34d98836c8679cc9d3658d259346f3f85e8dc6be8890befc615840e8cea1664d3b4f487e671d9508d4e092358f4811b2fc46893279951d99b3494918b6fa9bc8e94c2b637a58f7a3d37e893ca366b74131df313f97418fda4cdf01a4365d376108ed8b44256890e857458421c006e224018759615a6ce0ae6411809e6b9ac3e74b1a42aa2e523d9ec856c2649b0a740153e2dc1b576d90db8a25d0359347d513705ea28b4215bcc439b3068241176ed5c99edbd37005ea8006c1cf0c294b8824b87a8942d9ed875118a8ac4fa34ab6c6289866496eaac93dd21d9366bb5c75831538d6499b5da592cccd03526c00cd551c7c2a05448aa6311eb5880c28fd698e18f1e164b4a0d9979b48c8a7c8495aa10004ec9853cd579e09882830a17fa2300e87b09f415afe7a02fe194ba1ee2055675c9a3836a0962cf4cbf2c0b7064fb12b23e3481a64663d5888b7902bc85adf604da53811bfda170f6613d7290732281af8797c9f1cb936a4753bc596620ca9bb7b4c017b1ce1a82885615f20293c1302852890e6112e4f8a6c7c163c502915d3f9c4808b20a8c5c50011c0259207a1f311c199044c3a9763ab4b520ab68af3cd129a6dfff944e7f55f921a9e502b126fe44c6546a297d296697868390ec3a0f2a57c78cd865d8dcd94bf72e8abc67bac33b17afb4e49fe1273e07df77bdc19b7ef232c61acb304a94979ae1eb32b2b6834ff86e3536d1afe3ade1eaee11557dae61577d2486b883dea46953df623400145b0f77980b0d98e6458c2a06343a770010872fc719e0c1abeda0261352cd710b922c67747f7ceeec133fd4a76d4437b3da7cabd46535ff2e9a37bd62ce49034fe2007fe85a66a5a49e0d6d9a74637546c9316836dc9334343c5bf9f4baf36690edba64de4162270f54f4366c7deb24bbc0a5b653aed417cec90c9b7e1242d5507fcd5c45026392d8204a36b8c6682bcdb19aa91804c7ebe8339f0f6aada1b56acc26e30d781542d328c1f3faddf1314d1b7a48baa7367f7c06fa01f3de2f22a0bc0043edf1b7ec81fac78acb53cdf1c451d5648d0e547a3cc4bbc4fbecafd17550eb82d32d90f9a91b32ad58dca2fb1fddddab778c64f8dee38a1fb04d7f179fad39bea9f8df88cfe80216e54f0b35cdaab7e1b3eb60d605a5dbb059275c5a91b845efe7bf0393818b9b1537e4310d79e7b1774fa7617c196ef3b7e57acab33f84bf9d3716a9e87722136dcedc2dba2e64d52d6e3ab0476f9c9e5474a65cf6f1e92fe35f7e391b9bc16f5117dc00fa525bf613f6c4431965f44eeaf4822018639441001456bc0a7cfff150c6f7c7bdddaa136c75b4b7ff33a9e8bd2364171109cca946b54767bb68459b8bb75b998ec890a8dabcace44fe3e5082f6af36133a7384374c107fd94a2e42283a20d2f150df1b2fd67ac7fa4ecd2cacee5dbfc1b1b195f0d388bcbb95542a129732f579efc05d813f955e9e24a01cbd7f8767568df7f2e9807e350931e1ab53d962cf729ee38e9e97b01a71226be35a8f7e2f9985abea85ec6d746a632897e2b6937cbf59e46078d7e2ba13160972c7f424c9451c45172feac8141641881bdbd0643bd283274238b2c3699129f05f781db729ee54199e4ab68a19cb7c5d0e4cf9821e6f2c1e8e2ba2efb67d547bc504824a8e16b82c886066a3b2b0bcc80b23f63ada8d81ad4322ea8af27b30978ab7b72f540bcaf21906f16c2ea62ef2967619cf170bebd117ae43dfaf1db8d43943301f04ea9e370a489c76afa180eaf95f3decace34a118ee8cb4f78e5264fa7f99da3d6d3acddab9da8d81fb329884407e17cd27fd87cd881dfb75207837bec15514c13ae25c485bcd4e23f42d8c4e43bd2d1deb4e9c2566ce98bbe69dae18da57bab6827cd5b755d6a72c86128217ac8a757ce73ab4888a1857e9ff3372a8c41b2a1d05d10c0f3b5b8f67719abbe0d0c6bff1fcaa7aa12d52f07f000000ffff010000ffff4cc5014bc0880000")
gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
bs, _ = ioutil.ReadAll(gr)
Assets["app.js"] = bs
diff --git a/gui/app.js b/gui/app.js
index 86c2f0b70..b98e43991 100644
--- a/gui/app.js
+++ b/gui/app.js
@@ -737,10 +737,16 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http, $translate, $loca
$scope.currentRepo.FileVersioningSelector = "none";
}
$scope.currentRepo.simpleKeep = $scope.currentRepo.simpleKeep || 5;
- $scope.currentRepo.staggeredMaxAge = $scope.currentRepo.staggeredMaxAge || 365;
$scope.currentRepo.staggeredCleanInterval = $scope.currentRepo.staggeredCleanInterval || 3600;
$scope.currentRepo.staggeredVersionsPath = $scope.currentRepo.staggeredVersionsPath || "";
+ // staggeredMaxAge can validly be zero, which we should not replace
+ // with the default value of 365. So only set the default if it's
+ // actually undefined.
+ if (typeof $scope.currentRepo.staggeredMaxAge === 'undefined') {
+ $scope.currentRepo.staggeredMaxAge = 365;
+ }
+
$scope.editingExisting = true;
$scope.repoEditor.$setPristine();
$('#editRepo').modal();