Commit Graph

1631 Commits

Author SHA1 Message Date
Xinlei(Ryan) Pan
e6ae064c44 add PrimaryButtonView back into legacy view and view controller 2020-01-29 10:30:01 -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
Kevin G Christiano
851d5b57ff remvoe explicit unwrapping 2020-01-24 10:58:03 -05:00
Xinlei(Ryan) Pan
5e4f976a1c re add entry field container for fixing odd behavior 2020-01-24 10:42:13 -05:00
Kevin G Christiano
af7e813e18 model reuse again 2020-01-24 10:41:38 -05:00
Xinlei(Ryan) Pan
af20b0a8a4 remove entryfieldcontainer for odd behavior 2020-01-24 10:41:04 -05:00
Kevin G Christiano
f43e018e21 model reuse 2020-01-24 10:38:38 -05:00
Suresh, Kamlesh
0808d63e24 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:34:27 -05:00
Pfeil, Scott Robert
5a1aad63c7 remove axis property wrapper 2020-01-24 10:33:16 -05:00
Pfeil, Scott Robert
ebf089888b Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 10:30:50 -05:00
Pfeil, Scott Robert
9384e28eb8 fix on rotate margin issue 2020-01-24 10:29:36 -05:00
Pfeil, Scott Robert
8b8ec937b1 caret link hiding 2020-01-24 10:24:49 -05:00
Pan, Xinlei (Ryan)
b20212ccd4 Merge branch 'feature/checkbox_label_fix' into 'feature/coding'
Checkbox models added

See merge request BPHV_MIPS/mvm_core_ui!231
2020-01-24 10:23:17 -05:00
Pfeil, Scott Robert
4a194d4e6f fixes for the banner 2020-01-24 10:21:42 -05:00
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Kevin G Christiano
86f60bccf8 adding height override 2020-01-24 10:11:42 -05:00
Kevin G Christiano
304b4cbc4c models encode properly 2020-01-24 09:41:34 -05:00
Pfeil, Scott Robert
d7f955c991 fix to error check 2020-01-24 09:35:38 -05:00
Xinlei(Ryan) Pan
6602ac505a Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 09:26:00 -05:00
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Pfeil, Scott Robert
c0c5eef9e1 dash update 2020-01-24 09:22:45 -05:00
Pfeil, Scott Robert
633bcf9fd0 dash line update 2020-01-24 09:21:03 -05:00
Pfeil, Scott Robert
203b049829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 08:49:13 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
6139f31e54 wring label 2020-01-23 22:42:19 -05:00
Kevin G Christiano
c5e80d602e temp fix for arch issue 2020-01-23 21:04:48 -05:00
Kevin G Christiano
83d5721e68 temp fix for arch issue 2020-01-23 19:59:05 -05:00