Commit Graph

87 Commits

Author SHA1 Message Date
Lekshmi S
3422ee00fd Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-30 18:58:58 +05:30
Pfeil, Scott Robert
44a6f2d867 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_device_complex_buttonSmall 2020-04-29 18:40:22 -04:00
Pfeil, Scott Robert
0f215abc4a Two Link 2020-04-29 18:23:10 -04:00
Lekshmi S
07e5005657 Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-29 19:12:12 +05:30
Pfeil, Scott Robert
d11260f453 remove extra registry 2020-04-28 18:09:44 -04:00
Kevin G Christiano
077d94edd1 merging 2020-04-28 14:53:59 -04:00
Pfeil, Scott Robert
9a2b6405d0 Merge branch 'feature/bg_image_container' into 'develop'
BGImage

See merge request BPHV_MIPS/mvm_core_ui!413
2020-04-28 14:00:52 -04:00
Pfeil, Scott Robert
7da3898ced Merge branch 'develop' into feature/text_view_atom 2020-04-28 11:26:21 -04:00
Pfeil, Scott Robert
587b3bb6f3 BGImage 2020-04-28 11:08:44 -04:00
Lekshmi S
675ff41dce Merge branch 'develop' into feature/HeadersH2TinyButton
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-28 12:16:55 +05:30
Damodaram
78918ecf80 Merge branch 'develop' into feature/list_device_complex_buttonSmall
* develop:
  update acc before do animation
  update tabs model
  weak delegate
  update legacy font
  revised
  updates and revision
  adding accessibility state to radio button
  add new tabs
2020-04-28 11:09:29 +05:30
Xinlei(Ryan) Pan
a1ca758c1b Merge branch 'develop' into feature/tabsmodel 2020-04-27 13:34:39 -04:00
Damodaram
d2bd8067ee class added in mapping class 2020-04-27 12:06:59 +05:30
Pfeil, Scott Robert
439a97c5d6 merge 2020-04-24 16:02:21 -04:00
Pfeil, Scott Robert
c0f1aac91c Merge branch 'feature/list_device_complex_link_small' into 'develop'
Feature/list device complex link small

See merge request BPHV_MIPS/mvm_core_ui!407
2020-04-24 15:53:42 -04:00
Lekshmi S
283524d72b 19121(iOS - List - Device - Complex - Link - Small) story commit 2020-04-24 16:47:42 +05:30
Lekshmi S
0f4c11e2f2 Code cleanup and realigned file structure. 2020-04-24 12:40:11 +05:30
Lekshmi S
e34e859aa1 Merge branch 'develop' into feature/list_device_complex_link_medium
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-04-24 12:08:32 +05:30
Pfeil, Scott Robert
d3a73939f0 container protocol updates and container model 2020-04-23 15:13:29 -04:00
Kevin G Christiano
75c47d0692 merging 2020-04-23 13:17:36 -04:00
Pfeil, Scott Robert
a475075cd8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_device_complex_button_medium 2020-04-23 10:49:56 -04:00
Pfeil, Scott Robert
a89511f10c code fixes 2020-04-23 10:43:55 -04:00
Kruthika KP
1d9e9761f1 Merge branch 'develop' into feature/list_threecolumn_datausage_listitem
* develop: (27 commits)
  correcting spacing issue
  not needed
  required
  required now works due to changes
  changes to improve
  removed unneded optional wrapper
  toggle changes
  update parentheses
  fix for CXTDT_74295
  disable tap if radio is disabled
  small fix encoding numbered list
  remove previous items
  corner  labels defect fix
  merge
  remove bad remove items
  reuse issue fix
  remove unneeded comment
  Encode fix
  MoleculeStack
  Key changes
  ...
2020-04-22 12:21:43 +05:30
Kruthika KP
211e3b6e58 19024 - List - Three Column - Data Usage - Initial commit 2020-04-22 11:27:11 +05:30
Kevin G Christiano
2701e79484 Merge branch 'develop' into feature/text_view_atom 2020-04-21 09:04:18 -04:00
Lekshmi S
92ca8f2326 Added model and molecule class files. 2020-04-21 18:33:41 +05:30
Damodaram
e5a5415dd3 initial commi 2020-04-21 11:06:25 +05:30
Suresh, Kamlesh Jain
d38d97a64b Merge branch 'release/7_6_0' into 'develop'
Release/7 6 0

See merge request BPHV_MIPS/mvm_core_ui!394
2020-04-20 13:40:47 -04:00
Pfeil, Scott Robert
17b5c6401a merge 2020-04-18 19:22:11 -04:00
Pfeil, Scott Robert
0bfd72f384 recorder 2020-04-18 19:10:15 -04:00
Pfeil, Scott Robert
09769a3bc6 merge 2020-04-18 18:15:42 -04:00
Pfeil, Scott Robert
b061952e02 organize 2020-04-18 18:10:51 -04:00
Pfeil, Scott Robert
c4824a7b01 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_rightvariable_pricechange_alltextlinks 2020-04-17 20:36:24 -04:00
Lekshmi S
979886cd09 Restructured folder after merge from develop. 2020-04-16 13:12:10 +05:30
Kevin G Christiano
9fcf59d9e0 Merge branch 'develop' into feature/text_view_atom 2020-04-14 14:46:10 -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
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
Pfeil, Scott Robert
cf5b554b85 remove old comment no longer applicable 2020-04-10 20:36:42 -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
891e78eaf1 Merge branch 'develop' into feature/text_view_atom 2020-04-09 16:21:16 -04:00
Pfeil, Scott Robert
c9835475bd merge 2020-04-08 16:55:23 -04:00
Kruthika KP
3051d38ec5 added files 2020-04-08 16:02:44 +05:30
Damodaram
e4494748be Merge branch 'develop' into feature/radio_boxes 2020-04-08 10:13:03 +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
Pfeil, Scott Robert
f7b6d5d0f0 merge 2020-04-07 10:31:23 -04:00