Commit Graph

1656 Commits

Author SHA1 Message Date
Kevin G Christiano
a31d5ccfd8 redundant statement removed. 2020-02-06 11:07:09 -05:00
Kevin G Christiano
b2241e47e1 fixing change 2020-02-06 10:29:52 -05:00
Kevin G Christiano
15bfb6b481 Bug fix and general shape-up 2020-02-06 09:31:23 -05:00
Pfeil, Scott Robert
8d6e448817 Merge branch 'bugfix/stackmodel_fix' into 'develop'
Stack model bug fix from molecueStack to stack

See merge request BPHV_MIPS/mvm_core_ui!241
2020-02-04 09:10:01 -05:00
Chintakrinda, Arun Kumar (Arun)
c83302ec08 Stack model bug fix from molecueStack to stack 2020-02-04 14:37:31 +05:30
Pfeil, Scott Robert
6fa74c11cf Merge branch 'feature/new_color' into 'develop'
Adding color and removing pointless func.

See merge request BPHV_MIPS/mvm_core_ui!239
2020-02-03 15:44:19 -05:00
Pan, Xinlei (Ryan)
a6856d2229 Merge branch 'bugfix/primarybutton' into 'develop'
fix typo

See merge request BPHV_MIPS/mvm_core_ui!240
2020-02-03 09:44:09 -05:00
Xinlei(Ryan) Pan
9110c842a5 fix typo 2020-02-03 09:42:11 -05:00
Kevin G Christiano
be2e9473b3 Removing func as the static dictionary can carry the weight. 2020-02-03 09:00:03 -05:00
Kevin G Christiano
c81f68d66d adding color and removing pointless loop. 2020-02-03 08:54:41 -05:00
Pan, Xinlei (Ryan)
ae00d57bd3 Merge branch 'feature/primarybuttonview' into 'develop'
Feature/primarybuttonview

See merge request BPHV_MIPS/mvm_core_ui!237
2020-01-31 15:11:52 -05:00
Pfeil, Scott Robert
a19a06e7b6 Merge branch 'feature/button_swifty' into 'develop'
Feature/button swifty

See merge request BPHV_MIPS/mvm_core_ui!235
2020-01-30 13:55:25 -05:00
Pfeil, Scott Robert
521fc75e59 remove unused 2020-01-30 11:56:57 -05:00
Pfeil, Scott Robert
58a40a7752 fixes and color addition 2020-01-30 11:56:37 -05:00
Pfeil, Scott Robert
f367b03233 Review comments 2020-01-30 11:41:43 -05:00
Xinlei(Ryan) Pan
54dc30a41a update based on Scott's comments 2020-01-29 15:47:37 -05:00
Xinlei(Ryan) Pan
347f054ed1 merge from develop 2020-01-29 15:44:42 -05:00
Pan, Xinlei (Ryan)
cd0277bf16 Merge branch 'feature/name_checkbox_label' into 'develop'
missed CheckboxLabel name change

See merge request BPHV_MIPS/mvm_core_ui!236
2020-01-29 15:08:56 -05:00
Xinlei(Ryan) Pan
9ce1e7ec93 add PrimaryButtonView back to prepay legacy view/ view controller 2020-01-29 11:27:24 -05:00
Xinlei(Ryan) Pan
e6ae064c44 add PrimaryButtonView back into legacy view and view controller 2020-01-29 10:30:01 -05:00
Pfeil, Scott Robert
5f40942468 missed CheckboxLabel name change 2020-01-29 10:13:30 -05:00
Pfeil, Scott Robert
ad8d18eabe buttonmodelprotocol 2020-01-29 09:17:36 -05:00
Pfeil, Scott Robert
2ebce1b93b swift button 2020-01-28 14:04:56 -05:00
Pfeil, Scott Robert
c0ca81c568 Pill button 2020-01-28 13:55:55 -05:00
Pfeil, Scott Robert
a35b99b332 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/button_swifty 2020-01-28 13:00:14 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
Pan, Xinlei (Ryan)
80b45df27b Merge branch 'feature/switch_to_toggle' into 'develop'
switch to toggle

See merge request BPHV_MIPS/mvm_core_ui!234
2020-01-27 12:34:36 -05:00
Pfeil, Scott Robert
98d0dc26f6 name update 2020-01-27 12:28:18 -05:00
Pfeil, Scott Robert
41a60d552d link name change 2020-01-27 12:19:52 -05:00
Pfeil, Scott Robert
1f48ad485f update comment 2020-01-27 12:15:14 -05:00
Pfeil, Scott Robert
ecb381e943 switch to toggle 2020-01-27 12:10:48 -05:00
Pan, Xinlei (Ryan)
0438f02a08 Merge branch 'bugfix/graphview' into 'develop'
Bugfix/graphview

See merge request BPHV_MIPS/mvm_core_ui!233
2020-01-27 10:05:01 -05:00
Suresh, Kamlesh Jain
fddd6640e4 Merge branch 'feature/coding' into 'develop'
Feature/coding

See merge request BPHV_MIPS/mvm_core_ui!197
2020-01-24 17:11:36 -05:00
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Pfeil, Scott Robert
3951669ec6 Merge branch 'feature/entry_fields_models' into 'feature/coding'
Entry field models

See merge request BPHV_MIPS/mvm_core_ui!232
2020-01-24 15:40:21 -05:00
Kevin G Christiano
a932e554d5 timing fix 2020-01-24 15:32:40 -05:00
Xinlei(Ryan) Pan
a3a3d4b66a add file back 2020-01-24 15:14:02 -05:00
Xinlei(Ryan) Pan
085aa62c8b merge from feature/coding 2020-01-24 15:13:04 -05:00
Kevin G Christiano
3eb97d65c9 fixing reuse error in setWithModel 2020-01-24 15:06:45 -05:00
Kevin G Christiano
11aaedfa6b pr fixes 2020-01-24 13:25:59 -05:00
Kevin G Christiano
c250769620 using existing model encoding func 2020-01-24 13:20:02 -05:00
Kevin G Christiano
7b8b2a059f no need for val 2020-01-24 12:43:38 -05:00
Kevin G Christiano
e5948e05e5 pr fixes 2020-01-24 12:33:22 -05:00
Suresh, Kamlesh
9748e38296 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 12:10:58 -05:00
Suresh, Kamlesh
a16a362c03 dash color 2020-01-24 12:10:43 -05:00
Kevin G Christiano
7019bdaa78 no longer needed. 2020-01-24 11:54:23 -05:00
Kevin G Christiano
bb2464821e Merge branch 'feature/entry_fields_models' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/entry_fields_models 2020-01-24 11:48:14 -05:00
Kevin G Christiano
451e28cdfd removed conflict file 2020-01-24 11:47:25 -05:00
Xinlei(Ryan) Pan
86e6a0aba7 Merge branch 'feature/entry_fields_models' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/entry_fields_models 2020-01-24 11:46:00 -05:00
Xinlei(Ryan) Pan
f41ad328d2 remove conflict files 2020-01-24 11:44:48 -05:00