Kevin G Christiano
da7ebdd5a2
merging
2020-04-16 08:40:37 -04:00
Lekshmi S
979886cd09
Restructured folder after merge from develop.
2020-04-16 13:12:10 +05:30
Lekshmi S
55d31590e0
Merge branch 'develop' into feature/HeadersH2TinyButton
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-16 12:56:33 +05:30
Lekshmi S
21af3227c9
Restructured folder after merge from develop.
2020-04-15 19:32:34 +05:30
Lekshmi S
181856c702
Merge branch 'develop' into feature/Headers_H2_Buttons
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-15 19:26:27 +05:30
Kevin G Christiano
f5bc188f95
carousel merging
2020-04-14 15:22:10 -04:00
Kevin G Christiano
9fcf59d9e0
Merge branch 'develop' into feature/text_view_atom
2020-04-14 14:46:10 -04:00
Kevin G Christiano
5f539aa6b7
extending picker classes for more logical separation and modernization
2020-04-14 11:57:51 -04:00
Kruthika KP
f138c0a256
18965 - List - Right Variable - Price Change - All Text & Links - Initial commit
2020-04-14 16:30:13 +05:30
Lekshmi S
0e2417b1a1
Code changes after merge from develop.
2020-04-14 15:50:30 +05:30
Lekshmi S
643eb5f9cf
Merge branch 'develop' into feature/list_leftvariable_checkbox_bodytext
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-14 14:39:50 +05:30
Damodaram
5f125524be
Initial commit
2020-04-14 08:47:47 +05:30
Pfeil, Scott Robert
6846bcb4ce
merge
2020-04-13 16:07:56 -04:00
Lekshmi S
1635353989
Code refactoring by using collection base classes.
2020-04-13 18:07:54 +05:30
Kevin G Christiano
bcb296fa5d
Merge branch 'develop' into feature/toolbar_entry_field
2020-04-13 08:18:36 -04:00
Lekshmi S
3daf3bc438
Merge branch 'develop' into feature/radio_swatches
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-13 10:26:50 +05:30
Lekshmi S
5a30f99d62
Re-arranged folder structure.
2020-04-13 10:22:30 +05:30
Pfeil, Scott Robert
c718cfa92a
selectors folder
2020-04-10 20:34:06 -04:00
Pfeil, Scott Robert
5ce98da559
improvements
2020-04-10 16:59:40 -04:00
Kevin G Christiano
8572b1c718
current state
2020-04-10 16:03:01 -04:00
Pfeil, Scott Robert
d46c5ef4ca
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/radio_boxes
2020-04-10 14:57:24 -04:00
Pfeil, Scott Robert
6fdfcaf539
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/collection
2020-04-10 11:54:56 -04:00
Kevin G Christiano
a8b1d71a14
Merge branch 'develop' into feature/new_modern_page_control
2020-04-09 16:28:42 -04:00
Kevin G Christiano
891e78eaf1
Merge branch 'develop' into feature/text_view_atom
2020-04-09 16:21:16 -04:00
Pfeil, Scott Robert
806b97c86a
Merge branch 'feature/list_threecolumn_datausage_divider' into 'develop'
...
List - Three Column - Data Usage - Divider
See merge request BPHV_MIPS/mvm_core_ui!365
2020-04-09 14:23:23 -04:00
Kevin G Christiano
5c80bb9c90
merging develop
2020-04-09 12:56:35 -04:00
Pfeil, Scott Robert
b7edafc5d8
columns
2020-04-09 11:17:10 -04:00
Pfeil, Scott Robert
2357d9c475
Merge branch 'feature/modern_styler' into 'develop'
...
Modern styler
See merge request BPHV_MIPS/mvm_core_ui!349
2020-04-09 10:46:19 -04:00
Pfeil, Scott Robert
c9835475bd
merge
2020-04-08 16:55:23 -04:00
Pfeil, Scott Robert
ce8cc3d430
comments
2020-04-08 16:51:30 -04:00
Pfeil, Scott Robert
8c9ab45951
Fixes for sizing and base classes
2020-04-08 16:14:40 -04:00
Kevin G Christiano
eb762d8b41
Merge branch 'develop' into feature/vds_gts_sync_updates
2020-04-08 09:00:21 -04:00
Kruthika KP
3051d38ec5
added files
2020-04-08 16:02:44 +05:30
Lekshmi S
d0ea5d828b
Merge branch 'develop' into feature/radio_swatches
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
2020-04-08 15:39:29 +05:30
Kruthika KP
188af7e00a
Merge branch 'develop' into feature/list_threecolumn_datausage_divider
2020-04-08 12:07:02 +05:30
Damodaram
88defbc75c
file paths added
2020-04-08 10:16:33 +05:30
Pfeil, Scott Robert
d53b212241
fiddling with three layer
2020-04-07 15:29:23 -04:00
Kevin G Christiano
6936f6f94e
Merge branch 'develop' into feature/text_view_atom
2020-04-07 14:56:35 -04:00
Kevin G Christiano
e3954e97d1
Merge branch 'develop' into feature/new_modern_page_control
2020-04-07 14:55:57 -04:00
Kevin G Christiano
7eba678eeb
merging
2020-04-07 14:41:52 -04:00
Kevin G Christiano
d9337cadff
cleaning and revising donut
2020-04-07 13:37:12 -04:00
Pfeil, Scott Robert
5443d3ae62
organize
2020-04-07 10:31:32 -04:00
Pfeil, Scott Robert
f7b6d5d0f0
merge
2020-04-07 10:31:23 -04:00
Pfeil, Scott Robert
293cb041d3
Very minor changes
2020-04-07 10:24:20 -04:00
Pfeil, Scott Robert
8bf11f2cfb
merge
2020-04-07 10:16:41 -04:00
Pfeil, Scott Robert
e4f109ef99
Merge branch 'feature/list_threecolumn_speedtest_divider' into 'develop'
...
Feature/list threecolumn speedtest divider
See merge request BPHV_MIPS/mvm_core_ui!348
2020-04-07 10:14:30 -04:00
Pfeil, Scott Robert
b0be1dbce3
Collection changes
2020-04-07 10:08:07 -04:00
Lekshmi S
237ddb8225
Added folder structure
2020-04-07 18:07:40 +05:30
Lekshmi S
93fabdee53
Merge branch 'develop' into feature/radio_swatches
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
2020-04-07 18:02:07 +05:30
Lekshmi S
63f225398b
Added Radioswatches and radioswatchitem class files.
2020-04-07 17:59:28 +05:30
Lekshmi S
5be18cb66e
Code changes after merge
2020-04-07 13:24:48 +05:30
Lekshmi S
a3e09cc412
Merge branch 'develop' into feature/list_twocolumn_subsection_divider
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-07 12:33:19 +05:30
Pfeil, Scott Robert
1ec11d9006
Merge branch 'feature/BGImageHeadlineBodyButton' into 'develop'
...
BGImageHeadlineBodyButton molecule for 3.0 Addons banner
See merge request BPHV_MIPS/mvm_core_ui!352
2020-04-06 14:16:30 -04:00
Pfeil, Scott Robert
d6d1046cd8
cleanup mistakes
2020-04-06 11:57:40 -04:00
Pfeil, Scott Robert
a601041c5f
cleanup
2020-04-06 11:54:14 -04:00
Kruthika KP
3ec2150afe
List Three Column International Data - List Item - Added files
2020-04-06 17:15:43 +05:30
Kruthika KP
4d8d075da6
Merge branch 'develop' into feature/list_threecolumn_internationaldatadivider_listitem
2020-04-06 15:45:47 +05:30
Pfeil, Scott Robert
6a7d12a6bd
merge
2020-04-03 17:13:03 -04:00
Pfeil, Scott Robert
cbf0f85ea7
Fix to progress bar spacing MOBFIRST-20303
...
Brought back molecule stack
2020-04-03 17:00:16 -04:00
Kyle Matthew Hedden
74258f642d
move Footer and Label adapters to MF
2020-04-03 15:13:07 -04:00
Khan, Arshad
39b7682323
BGImageHeadlineBodyButton molecule for 3.0 Addons banner
2020-04-04 00:17:29 +05:30
Kyle Matthew Hedden
eee0b65036
Merge remote-tracking branch 'origin/develop' into feature/bottom_buttons_model_adapter
2020-04-03 13:54:45 -04:00
Xinlei(Ryan) Pan
1e67404748
add new tabs
2020-04-03 12:03:13 -04:00
Kevin G Christiano
45b4b0d594
Merge branch 'develop' into feature/text_view_atom
2020-04-03 11:43:01 -04:00
Pfeil, Scott Robert
24bce846f4
progress updates
2020-04-03 11:42:31 -04:00
Kevin G Christiano
4c57ff1450
Merge branch 'develop' into feature/new_modern_page_control
2020-04-03 11:31:33 -04:00
Kevin G Christiano
de6fe50c82
updates
2020-04-03 11:19:51 -04:00
Kevin G Christiano
9f026b73be
Merge branch 'develop' into feature/modern_styler
2020-04-03 10:54:49 -04:00
Kevin G Christiano
daa37c5add
textview stuff
2020-04-03 10:46:32 -04:00
Lekshmi S
dae31e77da
19180(List - Three Column - Speed Test - Divider) commit
2020-04-03 16:40:40 +05:30
Damodaram
e122b8ce23
files added
2020-04-03 16:17:40 +05:30
Lekshmi S
e88e661e1f
Resolving conflicts
2020-04-03 14:38:24 +05:30
Lekshmi S
96cd22e66d
Merge branch 'develop' into feature/list_threecolumn_speedtest_divider
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-03 14:31:55 +05:30
Pfeil, Scott Robert
a82f9b4aca
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_threecolumn_International_datadivider
2020-04-02 20:02:58 -04:00
Pfeil, Scott Robert
b302d2ff61
april jira tasks
2020-04-02 19:47:52 -04:00
Xinlei(Ryan) Pan
5068c6d9b5
Merge branch 'develop' into feature/webviewmodel
2020-04-02 18:45:49 -04:00
Kyle Matthew Hedden
1d725bb6b8
Merge remote-tracking branch 'origin/develop' into feature/bottom_buttons_model_adapter
2020-04-02 09:48:20 -04:00
Kevin G Christiano
79d0700485
gerging
2020-04-02 08:46:12 -04:00
Kevin G Christiano
20d23483fe
Merge branch 'develop' into feature/modern_pagecontrol
2020-04-02 08:44:27 -04:00
Kruthika KP
59e33c5410
Merge branch 'develop' into feature/list_threecolumn_International_datadivider
...
* develop: (26 commits)
remove extra file
removing redundant code.
typo fix
rules are optional
more
more
more additions for radio label
Button changes committed
move files
move files
move files
move files
use another stack
Minor fixs
Merge conflicts resolved
MF-18985 - ListFourColumnDataUsageListItem
Code cleanup - spacing issues.
Form Cleaning
spacing change
files added after merging
...
2020-04-02 12:16:41 +05:30
Pfeil, Scott Robert
322f5caee5
removing redundant code.
2020-04-01 18:10:48 -04:00
Pfeil, Scott Robert
bed696b3e7
merge
2020-04-01 17:57:17 -04:00
Pan, Xinlei (Ryan)
eca9213d4a
Merge branch 'feature/radio_label' into 'develop'
...
Radio label component
See merge request BPHV_MIPS/mvm_core_ui!340
2020-04-01 17:19:14 -04:00
Kevin G Christiano
1758192edf
decent state
2020-04-01 17:03:03 -04:00
Kevin G Christiano
a8e411472f
dramatic alteration
2020-04-01 16:40:58 -04:00
Pfeil, Scott Robert
86612a318c
Merge branch 'feature/form_cleaning' into 'develop'
...
Feature/form cleaning
See merge request BPHV_MIPS/mvm_core_ui!341
2020-04-01 16:12:03 -04:00
Pfeil, Scott Robert
7f25dd7356
merge
2020-04-01 16:10:28 -04:00
Kevin G Christiano
4248538a16
removed ghost file
2020-04-01 14:26:18 -04:00
Kevin G Christiano
29465f8281
refresh styler
2020-04-01 14:18:51 -04:00
Kevin G Christiano
0021156086
resolving merge
2020-04-01 12:16:09 -04:00
Kevin G Christiano
d961e4d5dc
more additions for radio label
2020-04-01 11:52:01 -04:00
Damodaram
aaec6da327
Button changes committed
2020-04-01 20:17:17 +05:30
Pfeil, Scott Robert
b0ab074675
move files
2020-04-01 10:46:54 -04:00
Pfeil, Scott Robert
ed957cb894
merge
2020-04-01 10:43:40 -04:00
Pfeil, Scott Robert
5a3ff449df
merge develop
2020-04-01 10:41:40 -04:00
Pfeil, Scott Robert
a3f81511b6
move files
2020-04-01 10:21:42 -04:00
Damodaram
1dc79330ec
Merge branch 'develop' into feature/list_right_variable_button_all_text_and_links
2020-04-01 19:39:59 +05:30
Pfeil, Scott Robert
dccf576f7a
Minor fixs
2020-04-01 10:05:32 -04:00
Kruthika KP
bffd2475df
Initial Commit of List - Three Column - International Data - Divider
2020-04-01 12:42:41 +05:30
Pfeil, Scott Robert
28cbcfee85
move legacy files
2020-03-31 11:05:13 -04:00
Kevin G Christiano
d19653557f
organized files
2020-03-31 10:30:13 -04:00
Kevin G Christiano
94a8ac405e
readding?
2020-03-31 09:16:32 -04:00
Lekshmi S
c180abf302
Radioswatches model initial commit
2020-03-31 13:50:34 +05:30
Damodaram
ab18db4a96
Merge conflicts resolved
2020-03-31 11:31:45 +05:30
Damodaram
dbaec80436
Merge
2020-03-31 10:41:21 +05:30
Kevin G Christiano
290b5276b2
adding again
2020-03-30 16:17:14 -04:00
Kevin G Christiano
338a3c8a03
fixed merge issue
2020-03-30 14:48:28 -04:00
Kevin G Christiano
130c25f119
merging
2020-03-30 14:09:08 -04:00
Xinlei(Ryan) Pan
710adec037
add web view
2020-03-30 10:58:47 -04:00
Kevin G Christiano
b1106c58ff
merge resolution
2020-03-27 11:12:33 -04:00
Kruthika KP
c7344b166d
MF-18985 - ListFourColumnDataUsageListItem
2020-03-27 18:23:03 +05:30
Lekshmi S
9b72cde7a6
Merge branch 'develop' into feature/list_right_variable_textLink_alltext_and_links
2020-03-26 18:38:56 +05:30
Kyle Matthew Hedden
11069d3f73
add convenience initializers for creating a legacy footer
2020-03-25 12:59:26 -04:00
Pfeil, Scott Robert
26a530af2c
Form Cleaning
2020-03-24 17:20:19 -04:00
Pfeil, Scott Robert
438277b37f
missing file move
2020-03-24 12:50:45 -04:00
Pfeil, Scott Robert
7a86b0356b
Further cleaning
2020-03-24 12:45:01 -04:00
Lekshmi S
0131137ae6
19060(List - Left Variable - Checkbox - Body Text Only) initial commit
2020-03-24 18:21:52 +05:30
Kruthika KP
95d705abb4
19078 - List - Three Column - International Data - Updated to latest
2020-03-24 17:02:29 +05:30
Kruthika KP
2226d9beed
190780 - List- Three Column - International Data Divider - Initial commit
2020-03-24 10:37:48 +05:30
Pfeil, Scott Robert
9381e41906
merge
2020-03-23 17:08:26 -04:00
Pfeil, Scott Robert
c39e344f25
crash fix
2020-03-23 11:03:41 -04:00
Kruthika KP
f750fd129c
MF-19186 : List -Three Column - Data Usage - Divider - Initial Commit
2020-03-23 11:19:40 +05:30
Pfeil, Scott Robert
39fc20ef79
cleanup
2020-03-20 15:54:55 -04:00
Lekshmi S
8e4d42e67b
19180(List - Three Column - Speed Test - Divider) story initial commit
...
Added model class and molecule class.
2020-03-20 17:41:08 +05:30
Damodaram
d1a9841912
files added after merging
2020-03-20 11:32:33 +05:30
Damodaram
23f9f4a3fa
Merge branch 'develop' into feature/list_right_variable_button_all_text_and_links
2020-03-20 11:26:05 +05:30
Pfeil, Scott Robert
db542b170d
merge
2020-03-19 10:24:46 -04:00
Lekshmi S
23bd844e8e
Folder structure changes and conforming to headerView and headermodel.
2020-03-19 14:55:33 +05:30
Lekshmi S
4a7dbb6add
Merge branch 'develop' into feature/HeadersH2TinyButton
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-19 11:30:48 +05:30
Lekshmi S
d161fbf9fb
Folder structure changes and conforming to headerView and headermodel.
2020-03-19 11:26:25 +05:30
Lekshmi S
4d5a6d9505
Merge branch 'develop' into feature/Headers_H2_Buttons
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-19 10:51:30 +05:30
Damodaram
e8eba296d5
ListRightVariableTextLinkAllTextAndLinks Molecule implemented
2020-03-19 10:18:57 +05:30
Pfeil, Scott Robert
8a6cd89845
spacing
2020-03-18 14:31:56 -04:00
Pfeil, Scott Robert
72ac6adeb9
merge
2020-03-18 14:28:34 -04:00
Pfeil, Scott Robert
6d7c403536
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_text_with_whitespace_divider_tall
2020-03-18 14:19:42 -04:00
Pfeil, Scott Robert
3210d8cc88
cleanup
2020-03-18 13:25:44 -04:00
Damodaram
4b6891851c
ListOneColumnTextWithWhitespaceDividerShort Molecule implemented
2020-03-18 18:32:09 +05:30
Damodaram
45805ebd23
files moved to subsections folder
2020-03-18 16:19:08 +05:30
Damodaram
b481dd9dfb
Merge branch 'develop' into feature/list_one_column_text_with_whitespace_divider_tall
2020-03-18 16:09:28 +05:30
Xinlei(Ryan) Pan
0f6ded4591
move action models
2020-03-17 15:08:27 -04:00
Pfeil, Scott Robert
1e6ae3dcfc
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/swift_controllers
2020-03-17 13:38:55 -04:00
Pfeil, Scott Robert
ef7190de56
merge
2020-03-17 12:25:00 -04:00
Pfeil, Scott Robert
76b855db42
minor changes
2020-03-17 12:11:17 -04:00
Pfeil, Scott Robert
a9319ba005
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_full_width_text_divider_subsection
2020-03-17 11:40:49 -04:00
Subhankar Acharya
a24ea44e3c
Moved to Section Dividers folder.
2020-03-17 20:41:14 +05:30
Subhankar Acharya
b30d582c12
Removed the null additions.
2020-03-17 20:37:11 +05:30
Pfeil, Scott Robert
883f2385b9
merge
2020-03-17 09:34:57 -04:00
Kruthika KP
e9569b0623
Merge branch 'develop' into feature/list_rightvariable_totaldata
...
* develop: (28 commits)
bug fixes
fix typo
moved files
fixes for certain devices
Minor changes for testing
sticky footer
fix molecule protocol type Update column molecule to allow for matching heights on each side.
Changes made as per comments
uistack molecule extension
Removed extra spaces and added height constraint for stacks.
Removed extra space.
code improvement
Refactored code as per the changes in confluence.
Resolved merge conflicts.
19006 - List - Two Column - Price Description - Files added to new branch
Code cleanup
Code cleanup.
Code refactoring.
Created folder structure
Added ListTwoCloumnPriceDetails molecule
...
2020-03-17 15:13:26 +05:30
Damodaram
fc741e38df
initial commit
2020-03-17 14:54:26 +05:30
Damodaram
7928d8a51c
Merge branch 'develop' into feature/list_one_column_full_width_text_divider_subsection
...
* develop: (55 commits)
bug fixes
fix typo
moved files
fixes for certain devices
Minor changes for testing
sticky footer
fix molecule protocol type Update column molecule to allow for matching heights on each side.
Changes made as per comments
uistack molecule extension
additional change for empty
changing so that page does not break if server doesn't send the value
logic for anyRequired
refactor
merge
anyrequiredmodel
Reverted collectioViewHeight constraint.
Reverted back centerYAnchor
Removed un-necessary code.
Removing hard coded width.
implemented feedback
...
2020-03-17 11:31:43 +05:30