Commit Graph

907 Commits

Author SHA1 Message Date
panxi
ce1559dc15 add decode array method 2019-12-12 17:28:02 -05:00
Kevin G Christiano
b4994b0351 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-09 15:37:09 -05:00
Kevin G Christiano
2fa4f71d31 cool icon. 2019-12-09 15:37:00 -05:00
Suresh, Kamlesh
b7ff1354b8 clean up 2019-12-04 16:21:10 -05:00
Kevin G Christiano
99952db4b3 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2019-12-04 15:28:30 -05:00
Kevin G Christiano
c627901d74 updates to color model and extension. 2019-12-04 15:28:22 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -05:00
Pfeil, Scott Robert
27f2b00956 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/label_molecule_fonting 2019-12-04 13:10:18 -05:00
Pfeil, Scott Robert
d95e42330e moving files 2019-12-04 13:09:50 -05:00
Hedden, Kyle Matthew
3f9b707d37 Add overtaking indicator to openPanel callback method. 2019-12-04 12:56:38 -05:00
Kevin G Christiano
7e48670179 Adding Model for UIColor and supporting UIColor Extension. 2019-12-04 12:38:57 -05:00
Pfeil, Scott Robert
44fd2dffac Merge branch 'bugfix/label_molecule_fonting' into 'develop'
label font bugfix caused by the dissonance between label and styler setting....

See merge request BPHV_MIPS/mvm_core_ui!192
2019-12-02 10:16:42 -05:00
Pfeil, Scott Robert
3e46438fd0 label font bugfix caused by the dissonance between label and styler setting.... 2019-12-02 10:11:04 -05:00
Khan, Arshad
dc5174cbe4 key name mismatch fix. 2019-11-28 20:48:07 +05:30
Pan, Xinlei (Ryan)
ad8b48b699 Merge branch 'feature/dropdown_line_item_legacy' into 'develop'
Feature/dropdown line item legacy

See merge request BPHV_MIPS/mvm_core_ui!190
2019-11-27 21:49:46 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -05:00
Hedden, Kyle Matthew
f5270ae12e remove navigation bar check for manual inset calculation as it impacts presented controllers 2019-11-27 14:03:51 -05:00
Pfeil, Scott Robert
63556707bc temporary dropdown molecule
label reuse font fixes
2019-11-27 13:49:01 -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
1ec603e969 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/dropdown_line_item_legacy 2019-11-26 08:54:47 -05:00
Pfeil, Scott Robert
392ab144ac small fixes 2019-11-25 16:01:43 -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