Commit Graph

2342 Commits

Author SHA1 Message Date
Pan, Xinlei (Ryan)
c2e52ea313 Revert "Merge branch 'feature/usenewfont' into 'develop'"
This reverts merge request !353
2020-04-08 11:51:14 -04:00
Pan, Xinlei (Ryan)
7c099a5bfa Merge branch 'feature/usenewfont' into 'develop'
use new font for legacy

See merge request BPHV_MIPS/mvm_core_ui!353
2020-04-08 10:24:51 -04:00
Pfeil, Scott Robert
8322c27034 Merge branch 'feature/designed_external_link' into 'develop'
images and links and stuff

See merge request BPHV_MIPS/mvm_core_ui!300
2020-04-08 08:59:22 -04:00
Kevin G Christiano
b88e23be1b Merge branch 'develop' into feature/designed_external_link 2020-04-08 08:57:16 -04:00
Hedden, Kyle Matthew
8265f16c07 Merge branch 'feature/green_color' into 'develop'
Green color

See merge request BPHV_MIPS/mvm_core_ui!366
2020-04-08 08:48:12 -04:00
Kevin G Christiano
3e38234d12 green 2020-04-08 08:09:30 -04:00
Pfeil, Scott Robert
ef7a184afc Merge branch 'bugfix/tabs' into 'develop'
fix navigation bar

See merge request BPHV_MIPS/mvm_core_ui!364
2020-04-07 17:09:59 -04:00
Pfeil, Scott Robert
76aaa8c881 fix navigation bar 2020-04-07 16:55:42 -04:00
Kevin G Christiano
da173d31ab Merge branch 'develop' into feature/designed_external_link 2020-04-07 14:44:35 -04:00
Pfeil, Scott Robert
1d6ed35d84 Merge branch 'feature/list_twocolumn_subsection_divider' into 'develop'
Feature/list twocolumn subsection divider

See merge request BPHV_MIPS/mvm_core_ui!361
2020-04-07 10:32:15 -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
4f841889a7 Merge branch 'feature/list_threeColumn_billChanges_divider' into 'develop'
Feature/list three column bill changes divider

See merge request BPHV_MIPS/mvm_core_ui!347
2020-04-07 10:25:43 -04:00
Pfeil, Scott Robert
6a4c221dea Merge branch 'feature/list_threeColumn_billChanges_divider' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_threeColumn_billChanges_divider 2020-04-07 10:24:38 -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
Damodaram
d131694444 duplicate files removed. 2020-04-07 14:26:14 +05:30
Lekshmi S
5be18cb66e Code changes after merge 2020-04-07 13:24:48 +05:30
Damodaram
9493deb97d Merge branch 'develop' into feature/list_threeColumn_billChanges_divider
* develop:
  changing the priority as per feedback.
  remove bad commit
  cleanup mistakes
  toggle
  cleanup
  mild entryfield changes
  removed
  revised to common patteren
  List Three Column International Data - List Item - Added files
  align with anroid changes
  move Footer and Label adapters to MF
  BGImageHeadlineBodyButton molecule for 3.0 Addons banner
  updated blue hex
  removed requested colors
  code review - extra spacing
  code review
  link only handling
  add convenience initializers for creating a legacy footer
  19078 - List - Three Column - International Data - Updated to latest
  190780 - List- Three Column - International Data Divider - Initial commit
2020-04-07 12:34:20 +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
Lekshmi S
dda506f94a Removed duplicate files. 2020-04-07 12:08:30 +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
Khan, Arshad
7d740c5cce changing the priority as per feedback. 2020-04-06 22:39:19 +05:30
Pfeil, Scott Robert
f4d4ce6fea Merge branch 'feature/q1_changes' into 'develop'
mild entryfield changes

See merge request BPHV_MIPS/mvm_core_ui!358
2020-04-06 12:18:35 -04:00
Pfeil, Scott Robert
97ba281ecf Merge branch 'feature/list_threecolumn_internationaldatadivider_listitem' into 'develop'
List - Three Column - International Data

See merge request BPHV_MIPS/mvm_core_ui!357
2020-04-06 12:01:15 -04:00
Pfeil, Scott Robert
8e0641c547 remove bad commit 2020-04-06 12:00:08 -04:00
Pfeil, Scott Robert
d6d1046cd8 cleanup mistakes 2020-04-06 11:57:40 -04:00
Kevin G Christiano
79dd73ed44 toggle 2020-04-06 11:57:38 -04:00
Pfeil, Scott Robert
a601041c5f cleanup 2020-04-06 11:54:14 -04:00
Kevin G Christiano
4d03ef2447 mild entryfield changes 2020-04-06 11:48:55 -04:00
Pfeil, Scott Robert
9e2b9ea950 Merge branch 'feature/android_mole_alignment' into 'develop'
align with Android changes

See merge request BPHV_MIPS/mvm_core_ui!356
2020-04-06 09:39:33 -04:00
Kevin G Christiano
47c5343219 removed 2020-04-06 09:38:27 -04:00
Kevin G Christiano
51f6dc417c revised to common patteren 2020-04-06 09:35:32 -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
Kevin G Christiano
bebc0e11bd align with anroid changes 2020-04-05 10:51:13 -04:00
Pfeil, Scott Robert
ef68e781a7 Merge branch 'feature/requested_color_change' into 'develop'
Requested color change

See merge request BPHV_MIPS/mvm_core_ui!351
2020-04-03 17:26:40 -04:00
Pfeil, Scott Robert
48b026971d Merge branch 'feature/bottom_buttons_model_adapter' into 'develop'
add convenience initializers for creating a legacy footer

See merge request BPHV_MIPS/mvm_core_ui!331
2020-04-03 17:02:44 -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
Xinlei(Ryan) Pan
29805d347a use new font for legacy 2020-04-03 14:41:22 -04:00
Kyle Matthew Hedden
eee0b65036 Merge remote-tracking branch 'origin/develop' into feature/bottom_buttons_model_adapter 2020-04-03 13:54:45 -04:00
Kevin G Christiano
3d85f826dc updated blue hex 2020-04-03 13:48:59 -04:00
Kevin G Christiano
e0395bea0d removed requested colors 2020-04-03 13:34:42 -04:00
Kevin G Christiano
3bed045b5d Merge branch 'develop' into feature/designed_external_link 2020-04-03 11:42:25 -04:00
Lekshmi S
1efffcf33d Removed spacing 2020-04-03 17:40:46 +05:30
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
Damodaram
b350e98b19 Merge branch 'develop' into feature/list_threeColumn_billChanges_divider 2020-04-03 16:06:14 +05:30