Commit Graph

112 Commits

Author SHA1 Message Date
Lekshmi S
eb5bc41bfc Merge branch 'develop' into feature/Headers_H2_Buttons
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-05-07 13:01:04 +05:30
Kevin G Christiano
35531a2f9b merging 2020-04-30 15:53:20 -04:00
Pfeil, Scott Robert
0ab732a4f5 merge develop 2020-04-30 12:48:47 -04:00
Pfeil, Scott Robert
4d12820bc8 merge develop 2020-04-30 11:52:30 -04:00
Lekshmi S
3422ee00fd Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-30 18:58:58 +05:30
Kruthika KP
bd1ccb251c Merge branch 'develop' into feature/list_twocolumn_dropdownselectors
* develop: (41 commits)
  Image fixes Two link fixes
  Two Link
  delegateing
  using new toolbar
  enode
  additional check
  altered isEditable to editable to align with android
  latest state of text view
  removing Line model change.
  Implemented Scott feedback
  managing hidden border
  further developmet of textView.
  little fixes and delegate updates.
  reverting set method super call in Line.
  remove extra registry
  functioning border
  revised how fields clear themselves
  aligning with android changes
  updating to align with android. changing super.
  three layer fill
  ...
2020-04-30 18:49:16 +05:30
Pfeil, Scott Robert
8cc67991ed merge 2020-04-29 19:14:09 -04:00
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
ea67a6f5d0 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/move_legacy 2020-04-29 18:39:06 -04:00
Pfeil, Scott Robert
0f215abc4a Two Link 2020-04-29 18:23:10 -04:00
Pfeil, Scott Robert
775fdda762 merge 2020-04-29 16:12:31 -04:00
Lekshmi S
07e5005657 Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-29 19:12:12 +05:30
Pfeil, Scott Robert
6b1d065263 merge 2020-04-28 18:15:42 -04:00
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
Kevin G Christiano
05d8ff0ba6 Merge branch 'develop' into feature/new_modern_page_control 2020-04-28 14:16:37 -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
Kruthika KP
9a5ef15779 Merge branch 'develop' into feature/list_twocolumn_dropdownselectors
* develop: (32 commits)
  update acc before do animation
  update tabs model
  weak delegate
  update legacy font
  revised
  remove space
  add convenience inits.
  updates and revision
  adding accessibility state to radio button
  Removed extra line.
  19121(iOS - List - Device - Complex - Link - Small) story commit
  Minor changes
  Code cleanup and realigned file structure.
  container protocol updates and container model
  fix sizing defect
  use convenience function
  update collection for sizing properly
  three layer fixes
  remove safe area for now until i can find consistency with contentView
  New TableView base
  ...
2020-04-28 17:45:17 +05:30
Kruthika KP
918065300e 19012 - List Two Column Dropdown Selectors - Initial commit 2020-04-28 16:06:44 +05:30
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
Lekshmi S
91a5b3d36c Merge branch 'develop' into feature/Headers_H2_Buttons
# Conflicts:
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-28 12:13:54 +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
Pfeil, Scott Robert
f63b0c9b80 merge 2020-04-27 13:05:28 -04:00
Kevin G Christiano
00d196c0db Merge branch 'develop' into feature/new_modern_page_control 2020-04-27 09:13:20 -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
Kevin G Christiano
9503f109f9 merging 2020-04-23 13:15: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
Kevin G Christiano
e53cc6e57c merging 2020-04-21 09:03:32 -04:00
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