Commit Graph

3276 Commits

Author SHA1 Message Date
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
Pfeil, Scott Robert
ac7576a74c Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/bottom_tab_bar 2020-05-28 12:53:17 -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
Kevin G Christiano
0a375ddb93 changes 2020-05-28 09:06:40 -04:00
Khan, Arshad
db771ba3bd Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/bottom_tab_bar 2020-05-28 17:03:00 +05:30
Subhankar Acharya
9742b155e6 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-05-28 13:44:23 +05:30
Damodaram
00c114bb46 Intial commit 2020-05-28 08:46:19 +05:30
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
Subhankar Acharya
4d1fb559eb Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-05-27 20:26:46 +05:30
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
Kevin G Christiano
53660f17b9 unsused func 2020-05-26 14:28:09 -04:00
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