Commit Graph

133 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
422e041c45 change to make git happy 2020-03-18 14:49:46 -04:00
Pfeil, Scott Robert
72ac6adeb9 merge 2020-03-18 14:28:34 -04:00
Pfeil, Scott Robert
6d7c403536 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_text_with_whitespace_divider_tall 2020-03-18 14:19:42 -04:00
Pfeil, Scott Robert
3210d8cc88 cleanup 2020-03-18 13:25:44 -04:00
Damodaram
4b6891851c ListOneColumnTextWithWhitespaceDividerShort Molecule implemented 2020-03-18 18:32:09 +05:30
Damodaram
43accdfa79 Added code in mapping class 2020-03-18 16:34:22 +05:30
Xinlei(Ryan) Pan
0f6ded4591 move action models 2020-03-17 15:08:27 -04:00
Pfeil, Scott Robert
ef7190de56 merge 2020-03-17 12:25:00 -04:00
Pfeil, Scott Robert
76b855db42 minor changes 2020-03-17 12:11:17 -04:00
Pfeil, Scott Robert
a9319ba005 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_one_column_full_width_text_divider_subsection 2020-03-17 11:40:49 -04:00
Pfeil, Scott Robert
ee7a2e2539 minor 2020-03-17 11:38:40 -04:00
Lekshmi S
31a11aa03e Conforming to HeaderView and HeaderModel as per review comments. 2020-03-17 16:11:01 +05:30
Lekshmi S
ce9d2be44f Merge branch 'develop' into feature/Headers_H2_NoButtons_BodyText
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-17 15:38:15 +05:30
Kruthika KP
e9569b0623 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop: (28 commits)
  bug fixes
  fix typo
  moved files
  fixes for certain devices
  Minor changes for testing
  sticky footer
  fix molecule protocol type Update column molecule to allow for matching heights on each side.
  Changes made as per comments
  uistack molecule extension
  Removed extra spaces and added height constraint for stacks.
  Removed extra space.
  code improvement
  Refactored code as per the changes in confluence.
  Resolved merge conflicts.
  19006 - List - Two Column - Price Description - Files added to new branch
  Code cleanup
  Code cleanup.
  Code refactoring.
  Created folder structure
  Added ListTwoCloumnPriceDetails molecule
  ...
2020-03-17 15:13:26 +05:30
Damodaram
9583ba9c5d code refactoring 2020-03-17 11:51:53 +05:30
Pfeil, Scott Robert
4d0f4f1278 merge 2020-03-16 14:31:12 -04:00
Pfeil, Scott Robert
f5ecf1bb05 merge 2020-03-16 12:18:36 -04:00
Pfeil, Scott Robert
bf39fd564f merge develop 2020-03-16 11:56:42 -04:00
Kruthika KP
ab4eaa3fdd Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop: (27 commits)
  additional change for empty
  changing so that page does not break if server doesn't send the value
  logic for anyRequired
  refactor
  merge
  anyrequiredmodel
  Reverted collectioViewHeight constraint.
  Reverted back centerYAnchor
  Removed un-necessary code.
  Removing hard coded width.
  implemented feedback
  making pageIndex public
  nil check
  rules should be optional
  clean up
  regex
  making properties and function public
  equal  rules
  optimise
  Making few properties public. Constraint fixes.
  ...
2020-03-16 14:35:03 +05:30
Kevin G Christiano
6d3946f0e7 anyrequiredmodel 2020-03-13 11:52:09 -04:00
Kevin G Christiano
1ae91f55ae Merge branch 'develop' into feature/form_page 2020-03-11 15:28:06 -04:00
Kruthika KP
7561797211 19006 - List - Two Column - Price Description - Files added to new branch 2020-03-11 16:14:52 +05:30
Lekshmi S
9636ce9f95 Merge branch 'develop' into feature/list_twocolumn_comparechanges
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-03-11 14:49:36 +05:30
Lekshmi S
33b224add0 Merge branch 'develop' into feature/list_twocolumn_price_details
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-03-11 14:23:59 +05:30
Kruthika KP
5ff8d98e5b Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  Removed initializers
  index path update
  Removed stack
  shifting and improving
  code cleanup and identation
  the latest
  code cleanup
  Code commit for List- OneColumn- Full Width Text - BodyText

# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-03-11 08:15:09 +05:30
Suresh, Kamlesh
22b0b7259f merge conflicts 2020-03-06 18:04:30 -05:00
Suresh, Kamlesh
521ad8711d value changed rules 2020-03-06 17:26:42 -05:00
Kruthika KP
b4f36b03c7 Merge branch 'develop' into feature/list_onecolumn_fulwidthtext_bodytext
* develop:
  slight cleanup
  Remove right panel protocol
  Added files to LockUps and constraint changes.
  Code improvement.
  Constraints added
  Change in reference file, indentation and removal of extra spaces.
  Change in molecule name
  19096 - List - Progress Bar - Data - Initial commit
2020-03-06 10:40:31 +05:30
Subhankar Acharya
b2615b43c7 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/Headers_H2_NoButtons_BodyText 2020-03-05 19:59:54 +05:30
Lekshmi S
9090a30c85 Headers - H2 - No Buttons - Body Text story initial commit 2020-03-05 12:23:48 +05:30
Kruthika KP
fe959f09e5 Code commit for List- OneColumn- Full Width Text - BodyText 2020-03-05 11:24:05 +05:30
Kruthika KP
00625fe2b6 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  slight cleanup
  Remove right panel protocol
  Helps resolve CXTDT-63501
  Added files to LockUps and constraint changes.
  Code improvement.
  Constraints added
  Change in reference file, indentation and removal of extra spaces.
  Change in molecule name
  19096 - List - Progress Bar - Data - Initial commit

# Conflicts:
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-05 08:32:15 +05:30
Pfeil, Scott Robert
c8183103f7 merge 2020-03-04 09:13:06 -05:00
Suresh, Kamlesh
3ec024ff27 changes 2020-03-03 20:32:57 -05:00
Lekshmi S
f21cac7a41 Code cleanup 2020-03-03 16:06:04 +05:30
Subhankar Acharya
188277742a Code refactoring. 2020-03-02 16:44:49 +05:30
Kruthika KP
1d1bcf1b4a 19084 - List Right variable Total Data 2020-03-02 11:43:50 +05:30
Pfeil, Scott Robert
27e1a97a80 order update 2020-02-28 12:21:13 -05:00
Pfeil, Scott Robert
4c25b8a160 merge 2020-02-28 12:11:51 -05:00
Pfeil, Scott Robert
2b85991bfd merge dev 2020-02-28 09:53:14 -05:00
Kevin G Christiano
435c6cfa55 conflict resolution 2020-02-27 12:04:58 -05:00
Kevin G Christiano
411d72a152 Merge branch 'develop' into feature/arrow 2020-02-27 11:56:49 -05:00
Subhankar Acharya
207d1915d5 Added ListLeftVariableRadioButtonAndPaymentMethod molecule. 2020-02-27 21:37:02 +05:30
Subhankar Acharya
bf2438d112 Merge branch 'feature/radio_model' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_leftvariable_radiobutton_paymentmethod 2020-02-27 21:20:55 +05:30
Kevin G Christiano
b6af3ced00 latest state 2020-02-27 10:12:43 -05:00
Suresh, Kamlesh
a9bec2df9c radio model 2020-02-26 17:45:02 -05:00
Kevin G Christiano
f8608e7252 resolving merge 2020-02-26 13:37:46 -05:00
Subhankar Acharya
224148d36f Code improvement. 2020-02-26 19:03:42 +05:30
Subhankar Acharya
4d6a3b273c Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_progressbar_data
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-02-26 11:37:56 +05:30
Kruthika KP
5dd1c229f9 Merge branch 'develop' into feature/list_onecolumn_fullwidthtext_bodytextonly
* develop:
  header updates
  undoing removal
  mild updates
  hero is working. commenting done.
  rolled back change.
  moved hero is setWithModel. Was not being set. Mild changes.
  undo commented code
  Caret fix in table view cell code condensing extra init functions
2020-02-25 09:37:28 +05:30