Commit Graph

1059 Commits

Author SHA1 Message Date
Suresh, Kamlesh
3a1e3356bf module molecule 2019-12-06 14:30:19 -05:00
Suresh, Kamlesh
9676f41633 container model protocol 2019-12-04 16:59:02 -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
Suresh, Kamlesh
0288943746 fixes 2019-12-04 14:27:45 -05:00
Pfeil, Scott Robert
a10c1a6161 merge develop 2019-12-04 13:43:24 -05:00
Pfeil, Scott Robert
6cc31113f7 Merge branch 'feature/move_legacy_files' into 'develop'
Feature/move legacy files

See merge request BPHV_MIPS/mvm_core_ui!196
2019-12-04 13:39:35 -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
Pfeil, Scott Robert
0cadf5c358 Merge branch 'feature/add_open_panel_callback_overtake_indicator' into 'develop'
Add overtaking indicator to openPanel callback method.

See merge request BPHV_MIPS/mvm_core_ui!195
2019-12-04 12:56:39 -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
Suresh, Kamlesh
d00a04831d fixes 2019-12-03 09:19:55 -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
Pfeil, Scott Robert
09b467cac4 Merge branch 'bugfix/dropdown_key_name_fix' into 'develop'
key name mismatch fix.

See merge request BPHV_MIPS/mvm_core_ui!191
2019-12-02 09:13:28 -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
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Pfeil, Scott Robert
ee773eed89 key change 2019-11-27 15:02:03 -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
Pfeil, Scott Robert
0915333878 Merge branch 'bugfix/scrollview_content_adjustment_fix' into 'develop'
remove navigation bar check for manual inset calculation as it impacts presented controllers

See merge request BPHV_MIPS/mvm_core_ui!187
2019-11-27 14:03:52 -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
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
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
88e079e6be Merge branch 'bugfix/header_line' into 'develop'
line fix in header

See merge request BPHV_MIPS/mvm_core_ui!185
2019-11-25 12:07:06 -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
Suresh, Kamlesh Jain
8be65d4f57 Merge branch 'bugfix/bad_project_import' into 'develop'
Remote Scott's missing test controller.

See merge request BPHV_MIPS/mvm_core_ui!184
2019-11-20 17:30:52 -05:00
Hedden, Kyle Matthew
3944e02863 Remote Scott's missing test controller. 2019-11-20 17:30:52 -05:00
panxi
715b5f0167 add image, move label model next to label 2019-11-20 15:48:14 -05:00