Commit Graph

880 Commits

Author SHA1 Message Date
Prateek Arora
f8fea032b5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/circular_progress_bar 2020-02-18 13:42:31 +05:30
Suresh, Kamlesh Jain
6d819897bd Merge branch 'feature/model_fixes' into 'develop'
fixes

See merge request BPHV_MIPS/mvm_core_ui!262
2020-02-17 17:46:42 -05:00
Suresh, Kamlesh
68bf45f583 content mode 2020-02-17 17:35:20 -05:00
Suresh, Kamlesh
79eceb693e moleculeName 2020-02-17 15:06:33 -05:00
Suresh, Kamlesh
438661dfe1 moleculeName 2020-02-17 15:05:02 -05:00
Suresh, Kamlesh
87dcde3317 WIP 2020-02-17 12:11:57 -05:00
Suresh, Kamlesh
e431ea2de9 fixes 2020-02-14 15:56:36 -05:00
Kevin G Christiano
ee85a8972e relaigning key name with legacy name. 2020-02-14 08:58:32 -05:00
Pfeil, Scott Robert
f94056bc9a Merge branch 'bugfix/label_model_fix' into 'develop'
Codable Change

See merge request BPHV_MIPS/mvm_core_ui!254
2020-02-12 22:06:34 -05:00
Xinlei(Ryan) Pan
e1d56bcc0c update image method 2020-02-12 15:32:33 -05:00
Xinlei(Ryan) Pan
0113387f00 add new image method 2020-02-12 15:31:45 -05:00
Kevin G Christiano
e0bb0e45dc integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 11:25:37 -05:00
Pan, Xinlei (Ryan)
c163e963d2 Merge branch 'bugfix/dropdown_issue' into 'develop'
type change to support equatable dictionaries.

See merge request BPHV_MIPS/mvm_core_ui!249
2020-02-07 09:15:24 -05:00
Prateek Arora
7572bf0214 Fixes as per Review comments 2020-02-07 13:48:35 +05:30
Pan, Xinlei (Ryan)
e95fffbe82 Merge branch 'bugfix/misbehaving_entry' into 'develop'
EntryField responder fix.

See merge request BPHV_MIPS/mvm_core_ui!250
2020-02-06 14:16:46 -05:00
Kevin G Christiano
61a5932a88 fixing bug where textfield was not being recognized when resigning responder. 2020-02-06 13:25:52 -05:00
Kevin G Christiano
1e9b228730 Merge branch 'develop' 2020-02-06 11:19:27 -05:00
Kevin G Christiano
a31d5ccfd8 redundant statement removed. 2020-02-06 11:07:09 -05:00
Pfeil, Scott Robert
0d4008dec7 CaretLink 2020-02-06 09:55:18 -05:00
Pfeil, Scott Robert
59707ef781 merge 2020-02-06 09:52:05 -05:00
Pfeil, Scott Robert
595dc99936 button minimum
caretLink
2020-02-06 09:50:03 -05:00
Kevin G Christiano
15bfb6b481 Bug fix and general shape-up 2020-02-06 09:31:23 -05:00
Pfeil, Scott Robert
fe15372437 defect fixes 2020-02-04 12:08:26 -05:00
Pfeil, Scott Robert
37228669e0 Two button remove legacy 2020-01-31 16:27:20 -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
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
ba8058cceb button swift 2020-01-28 12:58:51 -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
Pfeil, Scott Robert
fe10b40148 reorg 2020-01-24 16:48:28 -05:00
Kevin G Christiano
a932e554d5 timing fix 2020-01-24 15:32:40 -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
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
a16a362c03 dash color 2020-01-24 12:10:43 -05:00
Kevin G Christiano
af7e813e18 model reuse again 2020-01-24 10:41: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
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
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Kevin G Christiano
304b4cbc4c models encode properly 2020-01-24 09:41:34 -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