Commit Graph

3091 Commits

Author SHA1 Message Date
Kevin G Christiano
4782efc13f merging 2020-06-01 14:06:26 -04:00
Pfeil, Scott Robert
3a5ab5552a Merge branch 'feature/list_leftvariable_radiobutton_alltextlinks' into 'develop'
Feature/list leftvariable radiobutton alltextlinks

See merge request BPHV_MIPS/mvm_core_ui!443
2020-05-28 20:42:44 -04:00
Pfeil, Scott Robert
6068d5b1c5 changes after discuss with Ryan 2020-05-28 20:42:02 -04:00
Kevin G Christiano
e7b6028321 merging 2020-05-28 10:55:45 -04:00
Kevin G Christiano
20b42ce91c Merge branch 'develop' into feature/designed_accessibility 2020-05-28 10:55:36 -04:00
Pfeil, Scott Robert
0220f1b152 Merge branch 'feature/list_leftvariable_icon_withrightcaret_bodytext' into 'develop'
Feature/list leftvariable icon withrightcaret bodytext

See merge request BPHV_MIPS/mvm_core_ui!452
2020-05-27 18:36:30 -04:00
Pfeil, Scott Robert
50a87cd864 code simplification 2020-05-27 18:35:05 -04:00
Pan, Xinlei (Ryan)
27295c940e Merge branch 'bugfix/missing_model_register' into 'develop'
update to match documentation

See merge request BPHV_MIPS/mvm_core_ui!467
2020-05-27 17:43:30 -04:00
Pfeil, Scott Robert
4be261e318 update to match documentation 2020-05-27 17:37:17 -04:00
Pfeil, Scott Robert
b408d1a24c Merge branch 'bugfix/missing_model_register' into 'develop'
Bugfix/missing model register

See merge request BPHV_MIPS/mvm_core_ui!466
2020-05-27 16:52:49 -04:00
Pfeil, Scott Robert
336a0bb983 fix return type 2020-05-27 16:13:20 -04:00
Pfeil, Scott Robert
bf6a81f367 remove excess internal 2020-05-27 16:12:43 -04:00
Pfeil, Scott Robert
f2498a53f9 comment 2020-05-27 16:00:46 -04:00
Pfeil, Scott Robert
632f6a825c comment 2020-05-27 15:58:31 -04:00
Pfeil, Scott Robert
db3f8a5bec ordering of left buttons 2020-05-27 14:45:35 -04:00
Pfeil, Scott Robert
27e7235e0b fixes for navigation item setter 2020-05-27 14:39:57 -04:00
Pfeil, Scott Robert
51b327a6d6 fixes for decoding 2020-05-27 14:21:14 -04:00
Pfeil, Scott Robert
abbe26b4bd Move enable able from button protocol
added navigation button atoms and protocol.
Changed the way split handles additional buttons
2020-05-27 14:05:48 -04:00
Pfeil, Scott Robert
729a73a1a0 remove panel from navigation setting. 2020-05-27 10:51:23 -04:00
Lekshmi S
42b1305930 Merge branch 'develop' into feature/list_leftvariable_icon_withrightcaret_bodytext
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-05-27 20:15:31 +05:30
Kevin G Christiano
b84a6b4ccd formatting 2020-05-27 10:42:37 -04:00
Pfeil, Scott Robert
3ec07412c2 Merge branch 'feature/more_inversion' into 'develop'
More inversion

See merge request BPHV_MIPS/mvm_core_ui!439
2020-05-27 10:02:08 -04:00
Kevin G Christiano
e020a39574 corrections made 2020-05-27 09:56:22 -04:00
Kevin G Christiano
3ab8969b1b Merge branch 'develop' into feature/more_inversion 2020-05-27 09:42:14 -04:00
Lekshmi S
b35fb69e18 Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks 2020-05-27 18:21:15 +05:30
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
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
Pfeil, Scott Robert
740545e9c3 Try again 2020-05-22 15:30: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
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