Commit Graph

893 Commits

Author SHA1 Message Date
Suresh, Kamlesh
d00a04831d fixes 2019-12-03 09:19:55 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Suresh, Kamlesh
7a09e4b830 merge 2019-11-27 14:38:01 -05:00
Suresh, Kamlesh
9195f96a68 fixes 2019-11-27 14:29:20 -05:00
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
panxi
876a07650b remove space 2019-11-26 14:16:12 -05:00
panxi
1bbad6ca15 fix merge conflict 2019-11-26 14:14:53 -05:00
panxi
269898f566 fix conflicts 2019-11-26 13:57:24 -05:00
panxi
1a5c819a2a fix conflict 2019-11-26 13:55:29 -05:00
panxi
437138007f merge 2019-11-26 13:54:00 -05:00
panxi
b53f7e7786 update 2019-11-26 13:30:06 -05:00
panxi
8422362e77 merge from develop 2019-11-26 11:30:43 -05:00
panxi
25336b0a16 Merge branch 'develop' into feature/models 2019-11-26 11:20:45 -05:00
Pfeil, Scott Robert
664d3195bb line fix in header 2019-11-25 09:20:05 -05:00
Pfeil, Scott Robert
cc2e4751f5 merge 2019-11-25 09:09:45 -05:00
Pfeil, Scott Robert
d884602d87 tweaks 2019-11-25 09:06:09 -05:00
Pfeil, Scott Robert
dd85a134ac merge 2019-11-25 09:05:32 -05:00
panxi
ea69ba67ea update array decoding method 2019-11-24 23:14:25 -05:00
panxi
9ec661ae3b add label model 2019-11-22 14:31:17 -05:00
panxi
6303c3f92d update label model 2019-11-21 13:15:27 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00
panxi
28a04218f9 create image model 2019-11-20 15:43:26 -05:00
panxi
dde5f1d1a4 add caret view model and dash line model 2019-11-20 15:30:42 -05:00
panxi
5fd74b695f create model for progress bar, using ModelMoleculeViewProtocol 2019-11-20 14:58:58 -05:00
Pfeil, Scott Robert
095b1d7a86 Merge branch 'feature/modernize' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 13:29:41 -05:00
Pfeil, Scott Robert
e32b9cfdda PR comments 2019-11-20 13:29:16 -05:00
Pfeil, Scott Robert
947af9b3c7 why? 2019-11-20 11:08:30 -05:00
Pfeil, Scott Robert
654be26b2c remove test file 2019-11-20 11:06:47 -05:00
Pfeil, Scott Robert
279dbd9b08 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-20 10:59:35 -05:00
Pfeil, Scott Robert
c96f5050a8 Line to swift 2019-11-20 10:20:24 -05:00
Hedden, Kyle Matthew
a714100b73 Merge branch 'release/7_1_0' into 'develop'
Release/7 1 0

See merge request BPHV_MIPS/mvm_core_ui!179
2019-11-19 17:02:45 -05:00
Suresh, Kamlesh
bf20fb3104 fixes 2019-11-19 15:32:35 -05:00
panxi
a409b331c5 revert 2019-11-19 12:56:07 -05:00
panxi
3851ad036a change to equal 2019-11-19 12:53:48 -05:00
panxi
3cb075499e make checkbox expandable 2019-11-19 10:39:30 -05:00
Pfeil, Scott Robert
d29e8ea3bd small changes 2019-11-19 09:18:15 -05:00
Suresh, Kamlesh Jain
8376e5c79e Revert "Merge branch 'feature/top_accessory' into 'develop'"
This reverts merge request !175
2019-11-15 16:53:18 -05:00
Suresh, Kamlesh
a865664cff add top accessory view 2019-11-15 16:52:13 -05:00
Suresh, Kamlesh
89cbfe00ba clean up 2019-11-15 12:09:20 -05:00
Suresh, Kamlesh
cd5f66875d Merge branch 'feature/top_accessory' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/top_accessory 2019-11-15 11:42:34 -05:00
Suresh, Kamlesh
84f50f3b80 optimize 2019-11-15 11:42:29 -05:00
Murugan, Vimal
76cd37d121 code cleanup 2019-11-15 21:10:37 +05:30
Suresh, Kamlesh
627114ded8 top accessory in tableview controller 2019-11-14 19:27:56 -05:00
Suresh, Kamlesh
f1b8a61e04 top accessory view 2019-11-14 18:15:22 -05:00
panxi
478498a9b6 Separate action and molecule name 2019-11-13 18:02:40 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
panxi
4111080497 Merge branch 'develop' into feature/models 2019-11-12 15:28:38 -05:00
Pfeil, Scott Robert
716dcff566 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/modernize 2019-11-12 14:45:48 -05:00