Commit Graph

738 Commits

Author SHA1 Message Date
Lekshmi S
e92201e048 Merge branch 'develop' into feature/Headers_H1_LandingPageHeader 2020-06-03 09:29:27 +05:30
Lekshmi S
fadce1c2aa Merge branch 'develop' into feature/Headers_H1_LandingPageHeader
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-06-02 16:40:46 +05:30
Pfeil, Scott Robert
c5664d80e4 Tabs update 2020-06-01 17:20:17 -04:00
Pfeil, Scott Robert
5d877a453a Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/bottom_tab_bar 2020-06-01 11:51:44 -04:00
Pfeil, Scott Robert
059696141c Tab updates 2020-05-29 15:51:28 -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
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
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
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
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
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
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
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
7741e1abe7 Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-05-21 12:54:24 +05:30
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
Lekshmi S
4453b24d4d 21041(iOS - List - Left Variable - Icon - All Text & Links) initial commit.
Created Model and Molecule class.
2020-05-20 16:00:44 +05:30
Pfeil, Scott Robert
cde8218e43 navigation item button fixes 2020-05-18 21:10:50 -04:00
Pfeil, Scott Robert
d293b93adc merge 2020-05-18 20:51:24 -04:00
Pfeil, Scott Robert
d476b9ce14 Navigation fixing 2020-05-18 14:55:29 -04:00
Lekshmi S
f6bfb21b90 Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks
# Conflicts:
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-05-18 17:19:36 +05:30
Kyle Matthew Hedden
d36284e57f Merge remote-tracking branch 'origin/develop' into feature/page_behavior_poc 2020-05-15 17:39:46 -04:00
Kevin G Christiano
7e3c9fdcdb new rule equalsignorecase 2020-05-15 15:20:03 -04:00
Pfeil, Scott Robert
8a9b38f2f7 Merge branch 'feature/list_progressbar_thin' into 'develop'
Feature/list progressbar thin

See merge request BPHV_MIPS/mvm_core_ui!436
2020-05-14 10:56:41 -04:00
Pan, Xinlei (Ryan)
28956c6270 Merge branch 'feature/font' into 'develop'
remove NHaasGroteskDSStd font

See merge request BPHV_MIPS/mvm_core_ui!435
2020-05-14 10:37:18 -04:00
Lekshmi S
8a741d2e6a Merge branch 'develop' into feature/list_leftvariable_radiobutton_alltextlinks 2020-05-14 12:58:13 +05:30
Lekshmi S
e1a5ac8faf Merge branch 'develop' into feature/list_progressbar_thin 2020-05-14 12:57:08 +05:30
Lekshmi S
614c166e8e 18931(iOS - List - Left Variable - Radio Button - All Text & Links) initial commit 2020-05-13 18:04:34 +05:30
Lekshmi S
8bada91766 Merge branch 'develop' into feature/list_progressbar_thin 2020-05-13 11:27:58 +05:30
Kevin G Christiano
4352d97d94 Merge branch 'develop' into feature/new_take_textview 2020-05-12 17:07:00 -04:00
Xinlei(Ryan) Pan
a47bb11bb6 remove NHaasGroteskDSStd font 2020-05-12 16:59:19 -04:00
Lekshmi S
3cbd9b53a8 18972(iOS - List - ProgressBar - Thin) story initial commit. 2020-05-12 18:56:10 +05:30
Lekshmi S
a2a1f95631 Code changes as per review comments. 2020-05-12 18:25:43 +05:30
Kyle Matthew Hedden
72f1d48eeb page behavior protocol 2020-05-11 11:52:18 -04:00
Kevin G Christiano
7f6bcfc712 generall stable 2020-05-08 11:15:50 -04:00
Kevin G Christiano
fcca1e3e83 beginning stages of change 2020-05-07 13:01:04 -04:00
Lekshmi S
eb5bc41bfc Merge branch 'develop' into feature/Headers_H2_Buttons
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-05-07 13:01:04 +05:30
Kevin G Christiano
b3ab4fe7f1 Merge branch 'develop' into feature/inverted_state 2020-05-06 14:17:27 -04:00
Kevin G Christiano
4ffd07dd3d beginning rework 2020-05-05 12:43:54 -04:00
Kevin G Christiano
0268767554 Merge branch 'develop' into feature/inverted_state 2020-05-04 09:50:12 -04:00
Kevin G Christiano
c8155a57db resolving gitlab 2020-05-01 16:47:45 -04:00
Kevin G Christiano
35531a2f9b merging 2020-04-30 15:53:20 -04:00
Kevin G Christiano
80b9f985b1 latest updated for color inversion 2020-04-30 14:26:25 -04:00
Pfeil, Scott Robert
0ab732a4f5 merge develop 2020-04-30 12:48:47 -04:00
Pfeil, Scott Robert
ffab78a05e minor clean 2020-04-30 12:27:51 -04:00
Pfeil, Scott Robert
4d12820bc8 merge develop 2020-04-30 11:52:30 -04:00