Commit Graph

446 Commits

Author SHA1 Message Date
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
Pfeil, Scott Robert
35085217d5 fixes for certain devices 2020-03-16 14:32:04 -04:00
Pfeil, Scott Robert
54a12804a5 Minor changes for testing 2020-03-16 12:52:59 -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
Pfeil, Scott Robert
bb0f6c5eba uistack molecule extension 2020-03-16 09:42:04 -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
Suresh, Kamlesh
8b1b6ea454 Merge branch 'feature/form_page' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/form_page 2020-03-13 12:13:45 -04:00
Suresh, Kamlesh
62fd6c988e merge 2020-03-13 12:13:32 -04:00
Kevin G Christiano
6d3946f0e7 anyrequiredmodel 2020-03-13 11:52:09 -04:00
Kruthika KP
ffbbe5df35 Added view and model classes 2020-03-13 11:29:58 +05:30
Kevin G Christiano
1ae91f55ae Merge branch 'develop' into feature/form_page 2020-03-11 15:28:06 -04:00
Lekshmi S
a16855527f Resolved merge conflicts. 2020-03-11 16:21: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
7965c4ac6a clean up 2020-03-10 15:25:49 -04:00
Kruthika KP
304d5e1cc5 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  add modal template
  key update
  merge and cleanup
  add 2.0 font back for march release
  change the base decode functions
2020-03-09 10:21:06 +05:30
Kruthika KP
4ef184ddc1 Merge branch 'develop' into feature/list_onecolumn_fulwidthtext_bodytext
* develop:
  add modal template
  key update
  merge and cleanup
  add 2.0 font back for march release
  change the base decode functions
2020-03-09 08:20:02 +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
Xinlei(Ryan) Pan
59cb32d281 add modal template 2020-03-06 16:26:35 -05:00
Xinlei(Ryan) Pan
c46ec10e76 merge from develop 2020-03-06 13:25:14 -05:00
Suresh, Kamlesh
1bbfb0390a fixes 2020-03-06 10:51:09 -05:00
Pfeil, Scott Robert
c6e6d28903 merge and cleanup 2020-03-06 08:44:30 -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
Xinlei(Ryan) Pan
bd4f00561e add 2.0 font back for march release 2020-03-05 09:58:32 -05:00
Pfeil, Scott Robert
b027333a46 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into bugfix/category_collision 2020-03-05 09:56:51 -05:00
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
Suresh, Kamlesh
9d8953d229 clean up 2020-03-04 10:52:40 -05:00
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
2855e643ac Merge branch 'develop' into feature/list_twocolumn_price_details
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-03 15:09:05 +05:30
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
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
201fa2be81 remove file testing 2020-02-28 13:48:23 -05:00
Pfeil, Scott Robert
cfd6cb1358 Teting 2020-02-28 13:06:11 -05:00
Pfeil, Scott Robert
4c25b8a160 merge 2020-02-28 12:11:51 -05:00
Pfeil, Scott Robert
f779478cc5 update 2020-02-28 10:32:27 -05:00
Pfeil, Scott Robert
2b85991bfd merge dev 2020-02-28 09:53:14 -05:00
Pan, Xinlei (Ryan)
1540fb4bed Merge branch 'feature/arrow' into 'develop'
Arrow Icon

See merge request BPHV_MIPS/mvm_core_ui!283
2020-02-28 09:50:16 -05:00
Pfeil, Scott Robert
757395ad1d merge 2020-02-27 13:58:30 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
6c92652f01 moved files 2020-02-27 12:31:47 -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