Commit Graph

565 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
6846bcb4ce merge 2020-04-13 16:07:56 -04:00
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
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
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
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
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
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
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
Pfeil, Scott Robert
24bce846f4 progress updates 2020-04-03 11:42:31 -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
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
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