Hard override on changes from master repo

auto/gui.files.go

@@ -18,7 +18,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["angular.min.js"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec3cfd73dbb692bffbaf40756945393265277dbd77519c4eeaa4eff9a5493c71d2bb39d79da14448624d912a3f626b6cffefb70b80243e493a4ef2de9b394d1b4bc062b1bb582c76171f9309394a37db2c5aae0ae21d8dc8a3fd83efc93f828b74467e4ab325099290a4c58a66649e264516cdca22cd729f3c8f63c25ae524a339cd3ed2d0df016c1f724ad2052956514ef2b4cce6141a8694c0cf65fa9166090dc96c0b68c9ebe3f77b79b18d2989a3394da05db10a0a3287aa1945548bb484cea304ca29f9e5f8e8e59bd3976411c5d4dfd999ecfe91c751529059965e42f74f48919574cc888c929256bf377199e3fffc37d99d40cb659cce82983c784216419c0350902ccb38c8c46f04da1996f025077ee7c570bab3f331c848be4de6c056b22487550b7f9d86654cbd615d371c93b3f3d1943528b37816009a43320411313c359c0f842ea2a5b728a1204a13e23d5815c5e6244b3f4621cd46e47a87c04729f443ba08cab8c8fdab3c5bfc9d0650f62658b30efe67efe8f4ddcf7befd30b9a40471d6d8fd2f422a2555ba5e5ed4827b3c8d238a699373cad4a8f8a2c064625daf379ba0141b22e2bda51049b8c7e7c1114d8cdfeb42e5dd2e2ed2b28c221694a514641567001b391004a18230c3b929250d6610e00d7b753ad12c46996afb7c72f90c7a1529a80462292b3730b92e3041955c813f59b2c2dd2791a1fad60fc418f6b3225189a65303f4cdc39a5c94bac33a90125a2b1497a4637a985532cce0a106ae0aa3b01a147f4d22ec584d2f079234556859f61b61e3e21c3171446562e0ca34c94130fbe8fe45a5413ac4479c9e5455ace5758f16113c2e08baa5b9d8ce3b983888caec15458e930ab2a22c2f43289d320b41212e405cda2fca22685fd011b730a533c59e66071166946c92c4de39cc4303da0a48036ea1016050386c165e5d75108b87f8900790288604a805acd3321117222d4857008f23c0c41c7739a0360b1dd808d1a16f4aa18de8e256caf83ab539a84af669b5cc2f7b62c9629ce8c7738997e89d61158eb57d14f937cd4204bcaf58c662aba778020488e1360e563109f4a28790da9aa88d78d4acc403b3651790784274116806589dfd13f4b98fb32bf2005023c83414842c67603d282105af1a9a9490fb1fd0ceb06e1b55c882de29307379d07f1f324398179256164c5e445048a016bda9688ea16da2a442f936016d3d08dab4183caa822f91b5bb9ac5878553f34a768677fe20ba7acb4584c9a7267fb0f27c98949012f2158d9daf89dd9f4799226db755ae6e03e043840cc8ef1e5d482e85c3569cb323ab54f4d31e364317d38ee9a8ee36a25e23e834abc2a31c4f6bc04f7049c8e79c0d6c20f8aec3a119e04797e9966613b52094a20de3425add4beff459ea5e89cfdfdfdfb9353f0ad32021d69f26d43f6fce4f815ddca8376724c788940116ca20bf8ad0d52ed25c0aa7f5acee760f869e88d24ab1f2d88f70df309e4526980a3242abcd154adf286ff91d0026470c196d5e108d7d120f6862bf077861ab4e971342b524542e37fdc918ca6613b11089bafca0257aa76489b2ba4127d6b0af7e7004c9c2959375b192dca2c7189c33e202ea95fcf82f94598a51bd003e80f3417f402b461960659281ceb5bc7a0b431583b360be06385c0b5d329d3c61c4f1f107a95d3fd900c27f91626fa1a68cc51eff25cf2b6c12f0974e654059dda5480630432b0bd44f288fb7d9e9d3a81bc1a20b95df3fdedec0f583e7d9059eec91ee0c887b9fa3298af24e451680c8c5500ccb3fc11d11c0ea18026188a7d78777c94ae376902060631f5158f240686f72c0acf0d49e85cc9dfed344a6e7def91c2702149d1c3c5e002dcf94b6f3456200af4ce3d84d9ab839011999083fdfd7d15320a85a1aa3e52cc02ed55d6d06c82cc30287589885933acf45741fef632012f7043b362cb446d81c74f15b54e8dda5ba3a40077c38e053bc541014305fe0f90ff3a2856fe3ab8f2f6c7e4af6497cb92411c273f6d0b9abf4f0bf019f62c11960185c22bc29149a1d2735a165d5d835bd7a76f05ccd9f92d811572be221e7589d610ca7e5f162c80ea68dcda2c841aa5ea66a26b32f0e8b1f73cd0634e7b77b7d31d3d480457af2873c59c62b1be76e0c29e2ed4598f7030ef0f218c2d93902ea2045c39fbd2020e477291e06a275b77a50713350c14440f30c7bec12e9c984f8b74b3819ead9859baa6e073788896cfd20dab6f5a57e0ecefd9feb95fa41fa083ec0886068cf9435e01e332cb8bcc3b184d553e44f34332c0d00f16db01b9b9214de97118d381ce0baf7e08d5c41b345462447b42b339d8677086c5c03c24836f47032bb74224124396113f8ac163fcf2031e258bf40b8c7688715bf6d9065b19b1610463e3ec594cc4a1cb4d6ad0e47ce09d983659b40e2030b361b2884f1b435529bef840c23ae9e2d8225e9e5165f69ae1dfef875519c2cdbc00ae0002560bab9ee0c4e25d4c6c00120d535dae6c355ac4297868d08ddd2c624ed06216b1f868a1f8ce482d9a7980b32c5ea281ff06fe1ebf3857950e0175d954e53e7a653165dda2104114b645ad36ad1b52a4ccff196aee17a198c576b714168a783859f49e6115fa76a4636cb13a43967160ecd7d6d82259ccf5fd7bc835bdb8ab3c45707217a1adc1dbcbddd2328df5bfacb84cfbd84b66a631ec9499db3622af98cdf9ca12138431a18964529b6dffb165bc2591ffd358d08c40eb3ae566e557da390c488c4a29533469c7c641a680f848b31c70dbe8fb92e28923587b7f75f7dd31ceb0dc86d8b1211d955de4608d310ddba092f7ab00435c5039c780f456dd268d2809c73a55e20d6451e0f5639a2c8b15b85ce4c0c171ed1fb4302ab081afec5406b1c3d8a90dc25b11b53d5d94c1c0e5a1d4e30cdd3b1acb202d3caa1a5379ff10d3fe60772270dbfb8d8d717d8813ae095a334f1b30492e7d85e2953ce4628d46ad22ea924f1fe1f4960c0da342cad2db25339980ab7641494030c3883e0ab4ddd6d5ca36ad2f40de6eaa60bbda94c7369e0a2b80e4f8db860b53efad780040c681095dc153df4c28cbabdb4594071f612510fbd895800ccd99e30421ff387dfbc6cfd9e665b4d0a89428c406e9a660bbac2b7660207f42ae87d04b01c66cef3de817db1edd6c62b1d730f9234f93e1edad9ea9d8a4b991b783be80372068cc3ab1652dfae52939ae09dbcafd8474a4b66fcf926f7259777ad23212bd95352f33f8275d537e3864ce0f07a863561f18f8a6d62efa6719c4b95d4fc7adaa3e2237378628f8a7033da8af03b5aad8d1c213248f54a103cf39a56841aab310e4328a6382dbf9188ecc68cd2b884b6c3d686ea64993cf37aa580ec0459d80193995c03c9ca16ef6b061ded1b9790e9abf05f22f49bdbb1fe37e6cbcdd712a9adfcbe46863366dc1d76976ac83e4a4cbe71b9cc22525ba4c55a8d322f37398Line truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec3cfd73dbb692bffbaf40756945393265277dbd77519c4eeaa4eff9a5493c71d2bb39d79da14448624d912a3fe2686cffefb70b80243e49da4ef2de9b394d1b4bc062b1582c16fb0160322147e9669b45cb5541bca31179b47ff03df9477091cec84f69b624411292b458d18cccd3a4c8a25959a459ee93e7714c58ab9c6434a7d9471afa3b80ed434e49ba20c52aca499e96d99c42c39012f8b94c3fd22ca121996d012d797dfc7e2f2fb631257134a709b42b564141e65035a3886a9196d07994403925bf1c1fbd7c73fa922ca298fa3b3b93dd3ff2384a0a32cbd24be8fe0929b2928e19915152d2eaf7262e73fc9fff26bb1368b98cd3591093074fc8228873000a9265190799f88d403bc312bee430de79319ceeec7c0c32926f93390c2b5992c3aa85bf4ec332a6deb0ae1b8ec9d9f968ca1a94593c0b00cd2119028b189e1ace074217d1d25b945010a509f11eac8a627392a51fa390662372b543e0a314fa215d04655ce4fea73c5bfc9d0650f62658b30efe67efe8f4ddcf7befd30b9a40471d6d8fd2f422a2555ba5e5cd4827b3c8d238a699373cad4a8f8a2c86814ab4e7f374038c645d56b4230b3619fdf82228b09bfd695dbaa4c5db57508453d294228f82ace00c66330194b08130ec484a42598739005cdd4cb54a60a759bede1ebfc0310e95d2042412919c9d5b901c273850853c51bfc9d2229da7f1d10ae61fe4b8265382a15906ebc3c49d539abcc43a931a10221a9ba46774935a468ac559014c0d5c7527c0f4885edab998501a3e6fb8c8aaf033ccd6c32764f882c2ccca8561948972e2c1f7915c8b628295c82fb9bc48cbf90a2b3e6c42987c5175a393713c771091d135a80a2b1d66554544985e26711a84564282bca059945fd4a4b03fa0634e618927cb1c34ce22cd2899a5699c931896079414d0469dc2a260c030b9acfc2a0a01f72f11204f00112c0910ab792638424e84b8100e419e8721c8784e73002cb61bd051c3827e2a86376309dbebe0d3294dc257b34d2ee17b5b16cb1457c63b5c4cbf44eb08b4f5abe8a7493e6a9025e57a463315dd3b401024c7090ce563109f4a28790da9aa88d78d4aac403b3651790b84274116806689dfd13f4b58fbf278810b04c60c0a2109d9b01b901684d08a2f4d8d7b88ed67d83708afe54c6c619f3cb9e93c889f27c909ac2b09232b262f22100cd8d3b64454b7d056217a9904b398866e5c0d1a144615c9dfd8ce65c5c2abfaa139453dfb13df3865a1c562d2943bdb7f38494e4c0a7809c1cad6c6efcca6cf9334d9aed33207f321c009627a8c6fa71644e7aa4a5b96d1a97d698a1527b3e9c371d7721c573b11b71954e2558e21b6e72598276074cc03b6177e5078d789f024c8f3cb340bdb914a5002f1a62969a5f6fd2ff22a45e3ecefefdf9f9c826d9511e848e36f1bb2e727c7afe8569eb49363c24b048a60135dc06f6d926a2b0176fdd3723e07c54f436f2469fd6841bc6f984d20974a131c2551e18da66a9537fc8f8416c0830bb6ad0e47b88f06b1375c81bd33d4a04d8ba3d9912a121afbe39664340ddb8940d87c5516b853b543da4c2195e81b93b93f07a0e24cceba8795d1a2cc12173bec13e2e2fad52c985f8459ba013980fe4072412e401a66699085c2b0be714c4adb006bc36601e35821706d74cab431c3d307845e65743f24c349be8585be061a7394bb3c97ac6db04b027d70aa804e6d22c0310219d85e2279c4ed3ecf4e9d405e4d90dcaef9fe76f6076c9f3ef02cf7640b70e4c35a7d19cc5712f2283426c6ca006659fe88680e8750401374c53ebc3b3e4ad79b3401058398fab2476203c37b1685e70627f451c9dfed344a667def9942772149d1c245e702ccf94b6f3456200ab4ce3d84d9ab9d9011999083fdfd7d15320a85a2aa3e92cf02edd5a1a1da049ea153ea6211d36658e9af82fced650256e08666c596b1da028f9fca6b9d1ab537464901e6861d0b768a93028a0aec1f20ff7550acfc75f0c9db1f93bf925dce4b06719cfcb42d68fe3e2dc066d8b37858061432af084726854acf695974750d665d9fbe153067e7370476c8f98a78d4c55a8329fb7d8760015467e3c6a621542f5557135d8b817b8fbdd781ee73dabbbb99eee84e22987a45992bea148bf5bd0337f674a1ae7a8483757f086e6c998474112560cad9b7163038928b04773b59bb2b3d98a861a2c07b8035f60d76e1c47c5aa49b0df46cc5ccc235055fc343d47c966e587dd3ba02677fcff6cffd22fd001d64473035a0cc1ff20a9897595e64dec168aa8e43343f240374fd60b31d90eb6bd2941e87311de863e1d50fa19a7883864af4684f683607fd0cc6b098988764f0ed68601dad60893420cb8c1fc560317ef9098f9245fa05663b44bf2dfb6c93adccd83082b971f62c16e2d065263568723ef14e4c9b2c5a07e098d93059d8a7cda12a145f7c22619f748dd8c25e1e5165fa9ae1dfef875599c2cdbc80510104ec165639c185c5bb98d800241aa63a5fd96eb48853b0d0a01bbb5ac498a0452d62f1d142b19d915a54f30067d9bc4403ff0dfc3d7e71ae0a1d02eabca9ca7db4ca62caba4526022b6c9b5aad5a37a44899fd33d4cc2f42318aed6e293414f170b1e83dc32ef4ed48c7d8a275862ce2c0865f6b630b6731d6f7efc1d7f4e2b6fc14cec96d98b6066b2f7773cb54d6ffb2ec32f5632f9e99cab093676edd8863c568ce57e698208c314d0493da74fb8f2df32db1fc9f36044d09b4ee53eea1fc4a3ba701895129658226656c1c640a888f34cb01b78dbe2fc99e3882bdf75777df1df30cdb6d881d1bdc51878b2358a34fc3125472be0a30c40595630c486fd56dd2b09270ac53c5dfc0210abc7e4c9365b102938b1c38465cdb072d0315d8c056760a83c830764a83b056446d4f136530705928f53c43f78ec63248cb185589a9ac7ff0697fb01b1198f67e631bb83ec5099704ad99a74d98c497be4cf14aee72b146a3561675f1a70f737a738686512145e9ed9c994cc054bba024201861441b05da6eeb6a254deb0b90b79bcad9ae92f2d8c653610590ec7fdb7061e8bd150f00c83830a02bc6d43712cae2ea7616e5c147d809441ebb62902139735c20e41fa76fdff8394b5e460b8d4a89426c906e0a96655db10303f9137235845e0a50667bef41be587a74b38945ae61f2479e26c39b1b3d52b14973236e077dc1d880a031ebc416b5e817a7e4b8262c957b8770a496b767c137b9ac3b3c699989dec29a9719fc93ae293f1c32e78703d439ab0f0c7c534b17fdb30ce2dc2ea7e356511f91eb6b8315fcd3811ec4d7815a15ec68e10992472ad361cc39a5a841aab310e4328a6382e97c744766b41e2bb04ba41e3433d3a4c9e7892a160370512760464e21300f67a8c91e36cd3bfa689e83e46f81fc4b5267f763ccc7c6db1da7a0f9bd548e3667d3167c9d6ac73a494eba7c9ee0142629d179aa429d1699Line truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["app.js"] = bs
@@ -63,7 +63,7 @@ func init() {
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["favicon.png"] = bs
 
-	bs, _ = hex.DecodeString("1f8b080000096e8800ffec3dfb7bdc368ebfe7af60667b8db367699c47bb7b8e3d778e9deefada3cbe38b9bdbd7ebdfb38126786b5242a226567ea78fff60340bd1f33f2d84ebc6d7f483c12491004011000096aeffed1ebc3777f7ff3822d4c184ceeeddd779c7b872a5e2672be306cebf0217bbcf3e829fb4f7eaaa6ecb94ae68c473e53662112e6a9c824729a1a9568971d0401a3569a25428be44cf8eebdf75a303563662135d32a4d3c01ad7cc1e071aece4412099f4d970093bd3c7ee768b30c040ba42722686716dc300f8aa6e2de4ca5d0ad8ce0a5603f1c1fbe7875f282cd6420dc7b8e036823f62ce0d17c7f24a2118be60e8fe3fd915e461ef41dcde915e1ab824024fba393bce4d024c1887901d77a7f849502c54f470852707f728fb1bd5018cebc054fb430fba3d4cc9c3f8fca828531b1233ea4f26c7ff4dfcefb03e750853137721a8811514844d0eaf8c5bef0e7a2d22ee2a1d81f9d49711eabc454aa9e4bdf2cf67d71066470e8611b062e8de481a33d1e88fd47ee4e0b902fb497c8d848155560b5aaf1d42c54d2aa11c8e814662d008a41b1f152c3a48790168998ed8f66fc0c1fdd180839b9870d8c3481981444649fd8c5054ef22b98dc57d0d3d6c3cbcbbdb1ad557460814d9532da243c1e7b5a8f8b273794910b6f46191ec80a7a2184b1185ad630cb180661c447838da984b1a9f297ec827e321673df07849ca9324685bbec4f3bf1c76759d90c06edcc782883e52e1bfd550467c2488fb3572215a36d56bcd8660709507b9b691e69075859ce2c88cb7bf4270dfe75f14dd163c893b98c1ca3e25df6c8fd4684b5ba2e22eb842a523ae6c0fd175db8bc1451a0b6d94b15710ffe1eaa482b60c86d363a049991206aafc4396058806974c181d990bb7d941b7f6288754d3241d6699722bdfa4b673021fda505647f25e4ced202b25f5061aa125f249676918a1ae30ad45c35c8bccb769ed567baf286c038df94131e2b2d51227691a74026cf9a1d486d9c4839d314948229baa2d7c4700e329c45add1100616a46154b4f1a58e030e732923e075e14c03e59de678006b5b49067eccf9a3601cd299c03a65c1947ba7f304351ef6a212407f3edd7afce4db6df6f8e90efef7e8e1b33a0513eecb54efb22795c1e7f479147f644fcbf739211fc3ebc7f9ebcbe6b880cd22d7e7a0381a7c1e881960bb53327a6d788f76cad7c4f93c9073a43f0ef2d97a5ae504ce15719bbe3817ecbe0c516bf2c8744802ac1145b3f38534c22199c1a6e7a0686adae05c58ea3fddd9e984e4b7148b1dff63502bebb0f05d1df220706a54ec45286bfc1fa1f025675b21ff98d1f44fdffe29fef8b00090c9152cb131a80960e9897d5395bea23263e33f02efc3426b186785ae65b0921954dbc29dbbbb455df647204a025a660a0b2b8b1740690d42c56010ea9ce1544d13c14f35aec38182e6898813056d0260c1b186151256f37369165588969fc03ef8e3b878dd20420264ca67e5b260c7bd318920acc463bb14dfdba311d2fa03660a7ba762109584a10180ef227e56ace3fc0c4bec1f542ff94f5fcc781ac0720b7680a07a72ce69d1b46bc99e2f0b20b8467218749295e12a045251efc3992660108d267b329ce725a8b7464c271e2e630e3e398f1eff99564f6657f7d193c7b0b612efd9dfe3092b16d33d629b1cd842faa0409d8fb0dad5fbb70b4b6a04f4fe0988054593ce5598c04db21af948d2a0328e9c3a959f24b0c5c06905cf1bf8898a7d751e554aa19c67cbfb1f46cd7a40fff91cad211484eca10ae5852fcdd7d154c7cff6a605ed8197a0fbbdf114fef15a4725e64507a188d21a3684efa4c0c95a7f60579e8205e4fb6f45acb61e02f42a39e7c1325ea095c38a5fcec2c799b584fb5a8480e181ef336c0eeb8a4a9688dade187a1adc35cecca0ae61f8e7c292a0d13d82e8edb8208d3c933e72ee15d003c5634eac62d08370f4d4bc815fdefc8a8491c3e9f22141ffa1d9ed02f4d3f1d1ad50452f52834c36083b359bb550b3cdaf481150ef86276620abcca0faa2d1f15b0ba1abdfbd711a5424bb525a96ec8d815864798f41235805dba31b6d7dd4c8dfc9441b50ade7db4c45c1928133711e31396391f084d63c593e63195eec9c27112e4199f6cec003052490e23ec09fc9f971844ab1502800b854c535640227f441c756f555a51c88220246ff3b59b775ddd5acebe08243b5f6164fea25e4d28c26f9285e09e10b1f56a827938262fd6071fd6aeaa978f26e814e318e374d682d620baec1e9156085f1337490c11d8b14ace01e98b01c14be5b2e162c4c91e4193ab8586795c8538ec4791db4bb378eebacb0166934db2b6b60560d703280a975c8ec43314f53033ebb891c1dd29f6ccd653158d9d9ba723b9c6ed168205ae59340f064263f8e3ae6aafea2f65879c87eb6385eccd300ec0d60d0063fd7383787870dcb4584dc0db685460ada960f4b089d5cfeed2a2677d06d88474cfa48d8ac0729f46a76cf44e3e2029b1c62c116fe728f8fc07ea0b98247c18d8589d61ffefd01d0c659eb257743946af5a0668f6435aa916551331c800e018f756e4fc460296020e30fb5f1e6c608be84817d25c10bfd088369836f5875ebcc0066a9e41ec94478347d9f18c54cde70b3b8bc5c07be94015631ec2ccc13c34d5a257ddd64ab322b6f511335507d269a2c9e4d4ece1a55aad4272227302b28ddea6d88666b566cfa2ddd73617da76a13d6082464cfe0c8c8186ddf0e2808c7fa0a5d65589af41561e162bd2632bc69fa54041a2d1100b2a207bf66c467b676c659c747143af37b911ff7637ffd815967ce51b1881a03fc8e4aae33b24266ae35c0dc4608c10e0c7ecc48f6932ba3331ec83e7e183cfecc3e70b49c3709f02249d4a6e3ef46f64b4eb4a742709b9a0e06da158b4445f2173217ae31db1ddaec4b0d751ea869d365f80bbce341cd97bb89899d13d8ef6420342c0c3c38e74bfd2a0da722b9bc64d240d7dbaca7d1f3a5a1465319711491e75f8e600b1536e9f583f26e815c0142bd22b5a8cd1d229617a8d477d0c70b146fc60b5e83e9ae6664ae6f44b1fefabc470f46e091588a4ed84edd9155e7e8ae1422991b491df35202193c2dd8a463565a964a650844d975a3d8df87614c76f27e77d8f33eb3a880fbc55801e3d80d0678c935784fd7159cdefa0d2a12fdde82c5fd1adcefd1e4ef42af235603c0fd068457eaee523b85a54a78a7a22973c7f3482582bd114928b586554cdf3ecd6d9fd8a5de9cec35207799f214ea7778d0b21eec16c0dfa4596cb83e10644d015a24c9c6660394f439005044fb251d6e55cb63a2d7ddfedb080377dd018f389121e8bf514f8cb51cdd809007d8e19e0c9a962840b181bd2e0ee9f2fc36887754a315189eadc42988003716a88800f8b00845b17b53094960ebc3d91ca3123fe67b1f5b0f7fba3b71093bbc3c20814f0ee23964fba16a86c18a1be5dbLine truncated
+	bs, _ = hex.DecodeString("1f8b080000096e8800ffec3dfb7bdc386ebfe7af60e6b61be76a699cc7e6ae8e3dad6367efdcdd3cbe38e9f5badfb61f47e2cc702d898a48d999737c7f7b0150efc78c3cb613dfedfe90782492200802200012d4defda33787effffaf6255b983098dcdbbbef38f70e55bc4ce47c61d8d6e143f678e7d153f69ffc544dd90b95cc198f7ca6cc4224cc539149e434352ad12e3b080246ad344b8416c999f0dd7b1fb4606ac6cc426aa6559a78025af982c1e35c9d8924123e9b2e01267b75fcded166190816484f44d0ce2cb8611e144dc5bd994aa15b19c14bc17e3c3e7cf9fae4259bc940b8f71c07d046ec59c0a3f9fe48442316cd1d1ec7fb23bd8c3ce83b9ad32bc257058148f6472779c9a1498211f302aef5fe082b058a9f8e10a4e0fee41e637ba1309c790b9e6861f647a999397f1c95050b6362477c4ce5d9fee8bf9d0f07cea10a636ee4341023a29088a0d5f1cb7de1cf45a55dc443b13f3a93e23c5689a9543d97be59ecfbe20cc8e0d0c3360c5c1ac903477b3c10fb8fdc9d16205f682f91b1912aaac06a55e3a959a8a4552390d129cc5a00148362e3a586490f212d1231db1fcdf8193eba311072720f1b186902312988c83eb38b0b9ce4d730b9afa1a7ad8797977b635babe8c0029b2a65b449783cf6b41e174f6e282317de8c323c9015f442086331b4ac6196310cc2884f061b53096353e52fd905fd642ce6be0f083953658c0a77d91f76e24fcfb3b2190cda99f15006cb5d36fab308ce84911e67af452a46dbac78b1cd0e12a0f636d33cd20eb0b29c591097f7e84f1afcebe2bba2c7902773193946c5bbec91fb9d086b755d44d60955a474cc81fb2fba707925a2406db3572ae21efc3d549156c090db6c7408322341d45e8b73c0b000d3e88203b32177fb2837fec410eb9a6482acd32e457af597ce6042fa4b0bc8fe4ac89da50564bfa0c25425be482ced221535c615a8b96a907997ed3cafcf74e50d8171be2b273c565aa244ec224f814c9e353b90da389172a6292805537445af89e11c64388b5aa3210c2c48c3a868e34b1d071ce65246c0ebc29906ca3bcdf100d6b6920cfc98f347c138a4338175ca8229f74ee7096a3cec452580fe7cbaf5f8c9b36df6f8e90efef7e8e1f33a0513eecb54efb22795c1e7f479147f624fcbf739211fc3ebc7f9ebcbe6b880cd22d7e7a0381a7c1e881960bb53327a6d788f76cad7c4f93c9073a43f0ef2f97a5ae504ce15719bbe3817ecbe0c516bf2c8744802ac1145b3f38534c22199c1a6e7a0686adae05c58ea3fddd9e984e4b7148b1dff63502bebb0f05d1df220706a54ec45286bfc1fa1f025675b21ff94d1f40fcffe107f7a5800c8e40a96d818d404b0f4c4bea94a5f5199b1f1ef81f761a1358cb342d73258c90caa6de1cedddda22efb3d1025012d33858595c50ba0b406a162300875ce70aaa689e0a71ad7e14041f344c489823601b0e058c30a09abf9b9348b2a44cb4f601ffc7e5cbc6e10210132e5b37259b0e3de98441056e2b15d8aefedd10869fd013385bd5731884ac2d000c077113f2bd6717e8625f60faa97fca72f663c0d60b9053b40503d39e7b468dab564cf9705105c23390c3ac9ca701502a9a8f7e14c13308846933d19cef312d45b23a6130f9731079f9c478fff48ab27b3abfbe8c963585b89f7eceff184158be91eb14d0e6c217d50a0ce2758edeafddb852535027aff0cc482a249e72a4ce026598d7c24695019474e9dca4f12d862e0b482e70dfc44c5be3a8f2aa550ceb3e5fd77a3663da0ff7c8ed6100a42f65085f2d297e6db68aae3e77bd382f6c04bd0fdde780aff78ada312f3a2835044690d1bc27752e064ad3fb02b4fc102f2fd7722565b0f017a959cf360192fd0ca61c52f67e1e3cc5ac27d2b42c0f0c0f71936877545254b446d6f0c3d0dee1a676650d730fc736149d0e81e41f4765c90469e491f39f70ae881e231275631e841387a6adec02f6f7e45c2c8e174f998a0ffd0ec7601fae9f8e856a8a217a941261b849d9acd5aa8d9e657a408a877c31333905566507dd1e8f89d85d0d5efde380d2a925d292d4bf6c6402cb2bcc7a011ac82edd18db63e6ae4ef65a20da8d6f36da6a260c9c099388f989cb14878426b9e2c9fb30c2f76ce930897a04c7b67e081021248711fe0cfe4fc3842a5582814005caae21a328113faa063abfaaa520e441101a3ff9dacdbbaee6ad67570c1a15a7b8b27f512726946937c14af85f0850f2bd4934941b17eb0b87e35f5543c79bf40a718c79b26b416b105d7e0f40ab0c2f8193ac8e08e450a56700f4c580e0adf2d170b16a648f20c1d5cacb34ae42947e2bc0edadd1bc77556588b349aed953530ab063819c0d43a64f6a198a7a9019fdd448e0ee94fb6e6b218acec6c5db91d4eb7683410adf249207832939f461d73557f517bac3c643f5b1c2fe66900f6063068839f6b9c9bc3c386e52242ee06db4223056dcb8725844e2e7fb68ac91d741be211933e1236eb410abd9add33d1b8b8c0268758b085bfdce323b01f68aee051706361a2f5877f7f04b471d67ac9dd10a55a3da8d923598d6a6459d40c07a043c0639ddb1331580a18c8f85d6dbcb931822f6160df48f0423fc160dae01b56dd3a3380592ab94732111e4ddf67463193b7dc2c2e2fd7812f6580550c3b0bf3c4709356495f37d9aaccca5bd4440d549f89268b679393b346952af589c809cc0a4ab77a1ba2d99a159b7e4bf75c58dfa9da84350209d93338323246dbb7030ac2b1be42571996267d4558b858af890c6f9a3e1581464b0480ace8c1af19f199ad9d71d6f11185cefc5ee4c7fdd85f7f60d69973542ca2c600bfa792eb8cac90996b0d30b71142b003839f3292fdeccae88c07b28f1f068f3fb30f1c2de74d02bc4c12b5e9f8bb91fd9a13eda910dca6a6838176c5225191fc1b990bd798ed0e6df6b5863a0fd4b4e932fc09def1a0e6cbddc4c4ce09ecf732101a16061e9cf3a57e9d8653915c5e3269a0eb6dd6d3e8c5d250a3a98c388ac88baf47b0850a9bf4fa5179b740ae00a15e915ad4e60e11cb0b54ea3be8e3058a37e3056fc074573332d737a2587f7ddea30723f0482c45276ca7eec8aa7374570a91cc8da48e7929810c9e166cd2312b2d4ba53204a2ecba51ecefc330263b79bf3bec459f5954c0fd6aac8071ec0603bce21abca7eb0a4e6ffd0615897eefc0e27e03eef768f257a1d711ab01e07e03c26b7577a99dc25225bc53d194b9e379a412c1de8a24945ac32aa66f9fe6b64fec526f4ef61a90bb4c790af53b3c68590f760be02fd22c365c1f08b2a6002d926463b3014afa1c0028a2fd920eb7aae531d1eb6effaddb7de13d3190389121a8c4514fd8b51cf080280898e69e0c9ac62940e9d1b6bd48f93c9a8b64d4a93cd8b7dfb2a12b0b1ee448a42f3a5696f5421c77ad9a194076b8401475e7c0bac5a3cbeddd20d8530dd5606cba12a4a1d9bfb1284d04c08785678aadLine truncated
 	gr, _ = gzip.NewReader(bytes.NewBuffer(bs))
 	bs, _ = ioutil.ReadAll(gr)
 	Assets["index.html"] = bs

cmd/syncthing/gui.go

@@ -108,6 +108,7 @@ func startGUI(cfg config.GUIConfiguration, assetDir string, m *model.Model) erro
 	router.Post("/rest/error", restPostError)
 	router.Post("/rest/error/clear", restClearErrors)
 	router.Post("/rest/discovery/hint", restPostDiscoveryHint)
+	router.Post("/rest/model/override", restPostOverride)
 
 	mr := martini.New()
 	mr.Use(csrfMiddleware)
@@ -172,6 +173,12 @@ func restGetModel(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	json.NewEncoder(w).Encode(res)
 }
 
+func restPostOverride(m *model.Model, r *http.Request) {
+	var qs = r.URL.Query()
+	var repo = qs.Get("repo")
+	m.Override(repo)
+}
+
 func restGetNeed(m *model.Model, w http.ResponseWriter, r *http.Request) {
 	var qs = r.URL.Query()
 	var repo = qs.Get("repo")

gui/app.js

@@ -627,6 +627,12 @@ syncthing.controller('SyncthingCtrl', function ($scope, $http) {
         }
     };
 
+    $scope.override = function (repo) {
+        $http.post(urlbase + "/model/override?repo=" + encodeURIComponent(repo)).success(function () {
+            $scope.refresh();
+        });
+    };
+
     $scope.init();
     setInterval($scope.refresh, 10000);
 });

gui/index.html

@@ -206,7 +206,10 @@ found in the LICENSE file.
                     </tbody>
                   </table>
                 </div>
-                <span class="pull-right"><a class="btn btn-sm btn-primary" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;Edit</a></span>
+                <span class="pull-right">
+                  <a class="btn btn-sm btn-primary" href="" ng-click="editRepo(repo)"><span class="glyphicon glyphicon-pencil"></span>&emsp;Edit</a>
+                  <a class="btn btn-sm btn-danger" ng-if="repo.ReadOnly && model[repo.ID].needFiles > 0" ng-click="override(repo.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;Override Changes</a>
+                </span>
               </div>
             </div>
           </div>

model/model.go

@@ -851,3 +851,26 @@ func (m *Model) State(repo string) string {
 		return "unknown"
 	}
 }
+
+func (m *Model) Override(repo string) {
+	fs := m.NeedFilesRepo(repo)
+
+	m.rmut.Lock()
+	r := m.repoFiles[repo]
+	for i := range fs {
+		f := &fs[i]
+		h := r.Get(cid.LocalID, f.Name)
+		if h.Name != f.Name {
+			// We are missing the file
+			f.Flags |= protocol.FlagDeleted
+			f.Blocks = nil
+		} else {
+			// We have the file, replace with our version
+			*f = h
+		}
+		f.Version = lamport.Default.Tick(f.Version)
+	}
+	m.rmut.Unlock()
+
+	r.Update(cid.LocalID, fs)
+}