mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,394 Commits 64 Branches 0 Tags 46 MiB
5c80bb9c90
Commit Graph

549 Commits

Author SHA1 Message Date
Kevin G Christiano
5c80bb9c90 merging develop 2020-04-09 12:56:35 -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
Kevin G Christiano
eb762d8b41 Merge branch 'develop' into feature/vds_gts_sync_updates 2020-04-08 09:00:21 -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
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
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
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
Kevin G Christiano
45b4b0d594 Merge branch 'develop' into feature/text_view_atom 2020-04-03 11:43:01 -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
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
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
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