81b0206146db7e7cd359e5722d4638dff77e03a7 387d283b56db68b300a17861a76e3f01f37fe666 Igor Vinogradov 1547337773 +0200 merge origin/staging: Fast-forward 387d283b56db68b300a17861a76e3f01f37fe666 6e7b51d68598903dff206738ed9bc9aacbe1af7b Igor Vinogradov 1547340534 +0200 commit: UI: [PVSTREAM-1116 - Strings - Create string - Link modules by line (Draw string) -- PVSTREAM-1117 - FE work] Added included and not included module highlighting 6e7b51d68598903dff206738ed9bc9aacbe1af7b 0a5ff627649aae0ec59725f14adad1493dbe9540 Igor Vinogradov 1547761643 +0200 merge origin/staging: Fast-forward 0a5ff627649aae0ec59725f14adad1493dbe9540 50ed9089c7c52616bcbdfbe27af7b77c5bacc932 Igor Vinogradov 1547762851 +0200 commit: UI: [Fixed] Inverter model change should update inverter, clear all strings and wire. 50ed9089c7c52616bcbdfbe27af7b77c5bacc932 5f52bed7490362fd74583974833bdfb9f1ff907b Igor Vinogradov 1547764409 +0200 commit: UI: [Fixed] When linking available modules to MPPT MPPT should not collapse (also check if when drawing strings MPPT is not collapsing) 5f52bed7490362fd74583974833bdfb9f1ff907b 4748fc8c8540770c595f73be2e01e364470f4d0b Igor Vinogradov 1547764849 +0200 commit: UI: [Fixed] When clearing MPPT - MPPT should not collapse 4748fc8c8540770c595f73be2e01e364470f4d0b e4893772d74a957f80d1ae12edef9911d70e0713 Igor Vinogradov 1547765097 +0200 commit: UI: [Fixed] After calling generate proposal (which forces layout update) cleanup electrical design. On backend this is already happening e4893772d74a957f80d1ae12edef9911d70e0713 98404ee31850c4cb2bef01f162050d8f69bf0c53 Igor Vinogradov 1548254837 +0200 merge origin/staging: Fast-forward 98404ee31850c4cb2bef01f162050d8f69bf0c53 7dd1d7a30b2166887330723777ab42872edfda1a Igor Vinogradov 1548254856 +0200 checkout: moving from staging to sld 7dd1d7a30b2166887330723777ab42872edfda1a 98404ee31850c4cb2bef01f162050d8f69bf0c53 Igor Vinogradov 1548254885 +0200 merge staging: Fast-forward 98404ee31850c4cb2bef01f162050d8f69bf0c53 0785e1606d95e60729600a972cce09350147b66e Igor Vinogradov 1548256922 +0200 commit: UI: SLD - the graph is now being updated when electrical design changes 0785e1606d95e60729600a972cce09350147b66e 98404ee31850c4cb2bef01f162050d8f69bf0c53 Igor Vinogradov 1548256963 +0200 checkout: moving from sld to staging 98404ee31850c4cb2bef01f162050d8f69bf0c53 41a12955d59368593975693a4f1ccb7a72b4e931 Igor Vinogradov 1548257064 +0200 commit: UI: [Fixed] DC switches from nowhere when electrical design contains Inverters with empty MPPTs 41a12955d59368593975693a4f1ccb7a72b4e931 b7b49ec04f94eea172bea6e075ad19ca33ac73fd Igor Vinogradov 1548257638 +0200 commit: UI: [Fixed] LayoutUnit arrows missing b7b49ec04f94eea172bea6e075ad19ca33ac73fd 34bd114ccaebe4083ac1a79d6b816f044f4570dd Igor Vinogradov 1548282049 +0200 merge sld: Merge made by the 'recursive' strategy. 34bd114ccaebe4083ac1a79d6b816f044f4570dd 860464e93c7a11e7bd4aae410e5d364ce3f58769 Igor Vinogradov 1548282631 +0200 commit: UI: [Fixed] MPPT list is not updated when selecting ModuleString 860464e93c7a11e7bd4aae410e5d364ce3f58769 d446d347f7d7cdfa6750b101ae7641b9995e4870 Igor Vinogradov 1548324601 +0200 merge origin/staging: Fast-forward d446d347f7d7cdfa6750b101ae7641b9995e4870 ad7f5072cb22fb9f3cd992516a86e45bf3c19fa6 Igor Vinogradov 1548325499 +0200 commit: UI: Electrical section fixes ad7f5072cb22fb9f3cd992516a86e45bf3c19fa6 38faff56d831d0c2c5e941bcc2a18bfca46ab25c Igor Vinogradov 1548331666 +0200 commit: UI: [Fixed] MPPT list is not updated after link available modules 38faff56d831d0c2c5e941bcc2a18bfca46ab25c 9985240c1a93943078057be2ddda2a001cddd18c Igor Vinogradov 1548331692 +0200 merge origin/staging: Merge made by the 'recursive' strategy. 9985240c1a93943078057be2ddda2a001cddd18c cd0d4417116a4014a4eaa3528b74369e2e684474 Igor Vinogradov 1548754134 +0200 merge origin/staging: Fast-forward cd0d4417116a4014a4eaa3528b74369e2e684474 56046fdbfc8ea008acde3ad131af2ac22415fdb4 Igor Vinogradov 1551101239 +0200 merge origin/staging: Fast-forward 56046fdbfc8ea008acde3ad131af2ac22415fdb4 3c6fc2f2c550dbabfd71a0e5268dfd6bfa289df7 Igor Vinogradov 1551103386 +0200 commit: UI: [Fixed][PVSTREAM-1501 - Error when switching to SLD] 3c6fc2f2c550dbabfd71a0e5268dfd6bfa289df7 f4f9176d3b65668baca51b48eb1369b57b230d88 Igor Vinogradov 1551103585 +0200 commit: UI: [Fixed][PVSTREAM-1497 - In some scenarios annotations disappear after moving them] f4f9176d3b65668baca51b48eb1369b57b230d88 cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 Igor Vinogradov 1551443048 +0200 merge origin/staging: Fast-forward cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 Igor Vinogradov 1551446363 +0200 reset: moving to HEAD cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 d1582c0d578861e00a241920f4a5790ba868a2ac Igor Vinogradov 1551446364 +0200 checkout: moving from staging to master d1582c0d578861e00a241920f4a5790ba868a2ac d559af649983797edee9e0506ad7bce707e5ce82 Igor Vinogradov 1551446390 +0200 commit: Merge branch 'master' of G:\Development\Work\SWDFactory\pvstream_pilot with conflicts. d559af649983797edee9e0506ad7bce707e5ce82 5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d Igor Vinogradov 1551446511 +0200 commit (merge): Merge remote-tracking branch 'origin/master' 5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d a47098bc0c6377346bd24a8671f2c41b8c3d564d Igor Vinogradov 1551446544 +0200 checkout: moving from master to patch-firefox-annotations a47098bc0c6377346bd24a8671f2c41b8c3d564d 11eace85d644800953dda63e26565c688f8a64ba Igor Vinogradov 1551446578 +0200 commit: UI: [Fixed][PVSTREAM-1510 - Annotations are not scaled on Firefox] 11eace85d644800953dda63e26565c688f8a64ba 086e368c99fcea180704d81ffb3689a84a3a1de6 Igor Vinogradov 1551447876 +0200 commit: UI: [Fixed][PVSTREAM-151 - Cannot move annotation on Firefox] 086e368c99fcea180704d81ffb3689a84a3a1de6 5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d Igor Vinogradov 1552342642 +0200 checkout: moving from patch-firefox-annotations to master 5beb9d1bc10a5eb4c6f15b9b8dd04359cb904d3d ed96dde688e24fcc8bbb57d0841f32281604f250 Igor Vinogradov 1552342658 +0200 merge origin/master: Merge made by the 'recursive' strategy. ed96dde688e24fcc8bbb57d0841f32281604f250 56982f79ee69149833448267995caa084f9c3638 Igor Vinogradov 1552342679 +0200 checkout: moving from master to production-hot-fixes 56982f79ee69149833448267995caa084f9c3638 31edea70a2f6a4f3f732da58cab2d43c873a6b7d Igor Vinogradov 1552343224 +0200 commit: UI: [Fixed][PVSTREAM-1525 - Critical: Savings summary - scroll is not working] 31edea70a2f6a4f3f732da58cab2d43c873a6b7d 592ccfd84a904e212c0afc1b29a3d6077c067bee Igor Vinogradov 1552485718 +0200 merge origin/production-hot-fixes: Fast-forward 592ccfd84a904e212c0afc1b29a3d6077c067bee a33c9cf14df7b4fa9c9377891fbd09ff4a542d06 Igor Vinogradov 1552486626 +0200 commit: UI: [Fixed] Economy savings full window scroll fix a33c9cf14df7b4fa9c9377891fbd09ff4a542d06 cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 Igor Vinogradov 1553523406 +0200 checkout: moving from production-hot-fixes to staging cca02c0a37a769c63c35d6dd06ce84f11fb3fc64 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d Igor Vinogradov 1553523409 +0200 merge origin/staging: Fast-forward 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d Igor Vinogradov 1554240059 +0300 reset: moving to HEAD 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d 683542e3971738bfb95d672a0248cd07be3aa351 Igor Vinogradov 1554240071 +0300 checkout: moving from staging to change-layout-direction 683542e3971738bfb95d672a0248cd07be3aa351 683542e3971738bfb95d672a0248cd07be3aa351 Igor Vinogradov 1554320001 +0300 reset: moving to HEAD 683542e3971738bfb95d672a0248cd07be3aa351 6d390d1981f171a5cebf8f4873ba6d69d26c2bf8 Igor Vinogradov 1554320002 +0300 merge origin/change-layout-direction: Fast-forward 6d390d1981f171a5cebf8f4873ba6d69d26c2bf8 9f51182610cad23e43cbdf53dc8439cbfed45234 Igor Vinogradov 1554453628 +0300 commit: API: Change layout direction 9f51182610cad23e43cbdf53dc8439cbfed45234 1bc902df430f715c21f149c52f483802c5851876 Igor Vinogradov 1554747936 +0300 commit: API: Layout direction round 2 1bc902df430f715c21f149c52f483802c5851876 615ce02e9ddf98f445df31a6feea1b13caf88af3 Igor Vinogradov 1555066247 +0300 merge origin/change-layout-direction: Fast-forward 615ce02e9ddf98f445df31a6feea1b13caf88af3 d1e3bcbd87a01041e16a15ca2dc616ae224ed01c Igor Vinogradov 1555067604 +0300 commit: API: Moved layout direction from BusinessModelData to RackingTypeSettings d1e3bcbd87a01041e16a15ca2dc616ae224ed01c b7d13109eb6719a3948aa55d13d29a27889d32d3 Igor Vinogradov 1555069474 +0300 commit: API: [Fixed] Layout direction is not set to DOWN by default, if user does not have this parameter in business model racking settings b7d13109eb6719a3948aa55d13d29a27889d32d3 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d Igor Vinogradov 1584954335 +0200 checkout: moving from change-layout-direction to staging 4e471fb1a334ec8e5f89bb6008d3fe4c243a442d 64a2e8d530b8ae926b6dedee8155b762c8fe977f Igor Vinogradov 1584954475 +0200 merge origin/staging: Fast-forward 64a2e8d530b8ae926b6dedee8155b762c8fe977f 6c2ca51f69500fc97c43e2feae9b3dc31e0dc319 Igor Vinogradov 1585555682 +0300 merge origin/staging: Fast-forward 6c2ca51f69500fc97c43e2feae9b3dc31e0dc319 59bf28ebc2d7b03d74bd7eb60478222facb5ccb4 Igor Vinogradov 1585813518 +0300 merge origin/staging: Fast-forward 59bf28ebc2d7b03d74bd7eb60478222facb5ccb4 f3a2fdf938d19829cce32915c1d212a17d36d32f Igor Vinogradov 1587367395 +0300 merge origin/staging: Fast-forward f3a2fdf938d19829cce32915c1d212a17d36d32f fa4de070f6bfeccaef0a66cd07d0e2938bf9e619 Igor Vinogradov 1587972761 +0300 merge origin/staging: Fast-forward fa4de070f6bfeccaef0a66cd07d0e2938bf9e619 0032d6c183d572725aa23d7008fb81fc01e7fe05 Igor Vinogradov 1588839061 +0300 merge origin/staging: Fast-forward