Commit Graph

3515 Commits

Author SHA1 Message Date
Kevin G Christiano
bc9b54c1d1 design 2020-05-26 14:21:49 -04:00
Kevin G Christiano
c6cfe39c30 testing removed 2020-05-26 14:00:17 -04:00
Pfeil, Scott Robert
088c50075a Merge branch 'release/7_7_0' into 'develop'
Release/7 7 0

See merge request BPHV_MIPS/mvm_core_ui!464
2020-05-26 12:49:48 -04:00
Kevin G Christiano
c0f3e8a450 renaming 2020-05-26 10:40:34 -04:00
Kevin G Christiano
b05b6c20c0 looking bette 2020-05-26 09:38:08 -04:00
Kevin G Christiano
92651cd960 Merge branch 'develop' into feature/new_loading_spinner 2020-05-26 09:17:37 -04:00
Lekshmi S
68891f48e3 Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-05-26 14:23:58 +05:30
Pan, Xinlei (Ryan)
27dc753bb4 Merge branch 'feature/transparent_clean_up' into 'develop'
remove transparency, unused

See merge request BPHV_MIPS/mvm_core_ui!463
2020-05-22 18:56:49 -04:00
Pfeil, Scott Robert
ba0a748ad3 remove duplicate 2020-05-22 18:38:57 -04:00
Pfeil, Scott Robert
0efd49e6f4 color add 2020-05-22 18:37:10 -04:00
Pfeil, Scott Robert
4b9ea6a799 adds background color to tabs 2020-05-22 18:36:21 -04:00
Pfeil, Scott Robert
428baa0012 remove transparency, unused 2020-05-22 18:31:32 -04:00
Pfeil, Scott Robert
58a174fd91 Merge branch 'bugfix/attrib_fixfont' into 'release/7_7_0'
font fix for 3.0

See merge request BPHV_MIPS/mvm_core_ui!462
2020-05-22 16:35:57 -04:00
Pfeil, Scott Robert
771fde7c8b Merge branch 'bugfix/label_stack_list_layout' into 'develop'
Bugfix/label stack list layout

See merge request BPHV_MIPS/mvm_core_ui!461
2020-05-22 16:34:51 -04:00
Kevin G Christiano
eb195afe1d fix for 3.0 2020-05-22 16:30:14 -04:00
Pfeil, Scott Robert
1588644577 comment 2020-05-22 16:28:05 -04:00
Pfeil, Scott Robert
528ae8a685 Fix for specific molecule 2020-05-22 16:25:12 -04:00
Kevin G Christiano
05346d81fa loosk pretty good on device 2020-05-22 16:13:01 -04:00
Pfeil, Scott Robert
740545e9c3 Try again 2020-05-22 15:30:02 -04:00
Kevin G Christiano
8a5a248628 latestest state. almost there 2020-05-22 09:26:13 -04:00
Kevin G Christiano
cf5610ea26 Merge branch 'develop' into feature/new_loading_spinner 2020-05-22 09:00:02 -04:00
Kevin G Christiano
3f0828fa44 disabled and init 2020-05-21 16:46:01 -04:00
Kevin G Christiano
c6a2bbaf74 merge resolution 2020-05-21 16:31:21 -04:00
Kevin G Christiano
b0172ff1f6 bu 2 2020-05-21 16:28:21 -04:00
Kevin G Christiano
9803f04a78 current 2020-05-21 16:21:19 -04:00
Pfeil, Scott Robert
8fdb4c3e14 Merge branch 'bugfix/label_stack_list_layout' into 'develop'
Bugfix/label stack list layout

See merge request BPHV_MIPS/mvm_core_ui!459
2020-05-21 16:00:45 -04:00
Pfeil, Scott Robert
ed6bfede8e Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/label_stack_list_layout 2020-05-21 15:29:34 -04:00
Pfeil, Scott Robert
648da2bd3f Bug fix in label 2020-05-21 15:29:24 -04:00
Pfeil, Scott Robert
91d391d98e Merge branch 'bugfix/carousel' into 'develop'
cleaning

See merge request BPHV_MIPS/mvm_core_ui!451
2020-05-21 15:19:10 -04:00
Pfeil, Scott Robert
36578534da Merge branch 'feature/list_leftvariable_numberedlist_alltextlinks_3' into 'develop'
squash feature/list_leftvariable_numberedlist_alltextlinks

See merge request BPHV_MIPS/mvm_core_ui!458
2020-05-21 15:13:05 -04:00
Kyle Matthew Hedden
5f1fa847db squash feature/list_leftvariable_numberedlist_alltextlinks 2020-05-21 15:09:04 -04:00
Pfeil, Scott Robert
a58d9d233b merge 2020-05-21 15:07:38 -04:00
Pfeil, Scott Robert
7ce534de10 Merge branch 'bugfix/top_alert_setter_button_color' into 'release/7_7_0'
add button border and text color change to actionhandler setter.

See merge request BPHV_MIPS/mvm_core_ui!456
2020-05-21 14:43:28 -04:00
Kyle Matthew Hedden
7bf03d9418 add button border and text color change to actionhandler setter. 2020-05-21 14:38:56 -04:00
Pfeil, Scott Robert
698e1a2745 Merge branch 'bugfix/additional_nav_items' into 'develop'
Bugfix/additional nav items

See merge request BPHV_MIPS/mvm_core_ui!448
2020-05-21 14:25:40 -04:00
Kevin G Christiano
898877a051 curent working order 2020-05-21 10:44:21 -04:00
Kevin G Christiano
ee5f0dfdc2 Merge branch 'develop' into feature/new_loading_spinner 2020-05-21 09:57:06 -04:00
Lekshmi S
b5bd23c38c 21042(iOS - List - Left Variable - Icon - With Right Caret - Body Text) initial commit.
Added model and molecule class files.
2020-05-21 15:41:24 +05:30
Lekshmi S
24d0390e25 Code clean as per review comment. 2020-05-21 13:03:36 +05:30
Lekshmi S
7741e1abe7 Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-05-21 12:54:24 +05:30
Subhankar Acharya
ffd26b651a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-05-21 11:18:50 +05:30
Pfeil, Scott Robert
518672f4f3 addressing review comments 2020-05-20 20:40:22 -04:00
Pfeil, Scott Robert
79127889dd name change 2020-05-20 20:28:13 -04:00
Pfeil, Scott Robert
bbe3d7693a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/carousel 2020-05-20 19:39:26 -04:00
Pfeil, Scott Robert
d40f41e7bb cleaning 2020-05-20 19:38:37 -04:00
Suresh, Kamlesh Jain
804faf53dd Merge branch 'bugfix/carousel' into 'develop'
first change

See merge request BPHV_MIPS/mvm_core_ui!450
2020-05-20 17:30:10 -04:00
Pfeil, Scott Robert
93e84cf3e4 first change 2020-05-20 17:25:49 -04:00
Kevin G Christiano
eda9379e37 adjusment 2020-05-20 17:08:43 -04:00
Kevin G Christiano
15a51bd86f adding to src 2020-05-20 16:36:41 -04:00
Kevin G Christiano
f3cc8c479a new addition 2020-05-20 16:34:40 -04:00