Commit Graph

2059 Commits

Author SHA1 Message Date
Damodaram
9583ba9c5d code refactoring 2020-03-17 11:51:53 +05:30
Damodaram
7928d8a51c Merge branch 'develop' into feature/list_one_column_full_width_text_divider_subsection
* develop: (55 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
  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
  ...
2020-03-17 11:31:43 +05:30
Damodaram
fab1e5f6dc Merge branch 'develop' into feature/list_one_column_full_width_text_divider_subsection 2020-03-17 11:27:57 +05:30
Suresh, Kamlesh Jain
7c82919340 Merge branch 'bugfix/isaac_bugs' into 'develop'
bug fixes

See merge request BPHV_MIPS/mvm_core_ui!308
2020-03-16 21:46:31 -04:00
Pfeil, Scott Robert
f26f414a23 bug fixes 2020-03-16 19:47:29 -04:00
Pfeil, Scott Robert
f42c264869 Merge branch 'feature/list_twocolumn_pricedescription' into 'develop'
Feature/list twocolumn pricedescription

See merge request BPHV_MIPS/mvm_core_ui!302
2020-03-16 14:36:10 -04:00
Pfeil, Scott Robert
3607087ec2 fix typo 2020-03-16 14:34:06 -04:00
Pfeil, Scott Robert
779efbcd07 moved files 2020-03-16 14:32:45 -04:00
Pfeil, Scott Robert
35085217d5 fixes for certain devices 2020-03-16 14:32:04 -04:00
Pfeil, Scott Robert
4d0f4f1278 merge 2020-03-16 14:31:12 -04:00
Pfeil, Scott Robert
c760564eec Merge branch 'feature/list_twocolumn_price_details' into 'develop'
Feature/list twocolumn price details

See merge request BPHV_MIPS/mvm_core_ui!303
2020-03-16 12:53:39 -04:00
Pfeil, Scott Robert
54a12804a5 Minor changes for testing 2020-03-16 12:52:59 -04:00
Pfeil, Scott Robert
de3804b9aa Merge branch 'feature/sticky_footer' into 'develop'
sticky footer

See merge request BPHV_MIPS/mvm_core_ui!307
2020-03-16 12:21:58 -04:00
Pfeil, Scott Robert
f5ecf1bb05 merge 2020-03-16 12:18:36 -04:00
Pfeil, Scott Robert
a26ab4b8c3 Merge branch 'feature/list_twocolumn_comparechanges' into 'develop'
Feature/list twocolumn comparechanges

See merge request BPHV_MIPS/mvm_core_ui!304
2020-03-16 12:11:57 -04:00
Suresh, Kamlesh
144ea2acf1 sticky footer 2020-03-16 12:03:31 -04:00
Pfeil, Scott Robert
d8c52ab8a6 fix molecule protocol type
Update column molecule to allow for matching heights on each side.
2020-03-16 11:58:36 -04:00
Pfeil, Scott Robert
bf39fd564f merge develop 2020-03-16 11:56:42 -04:00
Subhankar Acharya
9b328c3f46 Changes made as per comments 2020-03-16 21:02:59 +05:30
Pfeil, Scott Robert
0fb60b338b Merge branch 'feature/uistackview_molecule' into 'develop'
uistack molecule extension

See merge request BPHV_MIPS/mvm_core_ui!305
2020-03-16 10:38:17 -04:00
Pfeil, Scott Robert
bb0f6c5eba uistack molecule extension 2020-03-16 09:42:04 -04:00
Pan, Xinlei (Ryan)
1cc0830d73 Merge branch 'feature/form_page' into 'develop'
changes

See merge request BPHV_MIPS/mvm_core_ui!289
2020-03-13 20:51:33 -04:00
Kevin G Christiano
dd19a51417 additional change for empty 2020-03-13 19:03:12 -04:00
Kevin G Christiano
86d2669bec changing so that page does not break if server doesn't send the value 2020-03-13 18:05:01 -04:00
Kevin G Christiano
3625a115b9 latest state of validator 2020-03-13 15:32:29 -04:00
Kevin G Christiano
227248afe0 logic for anyRequired 2020-03-13 15:16:19 -04:00
Suresh, Kamlesh
f888358336 refactor 2020-03-13 12:31:32 -04:00
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
41656dccad Merge branch 'develop' into feature/form_page 2020-03-13 11:57:57 -04:00
Kevin G Christiano
6d3946f0e7 anyrequiredmodel 2020-03-13 11:52:09 -04:00
Pfeil, Scott Robert
5429cdc70f Merge branch 'feature/carousel_fixes' into 'develop'
Feature/carousel fixes

See merge request BPHV_MIPS/mvm_core_ui!301
2020-03-13 11:41:34 -04:00
Khan, Arshad
09be34e4f8 Reverted collectioViewHeight constraint. 2020-03-13 20:39:36 +05:30
Khan, Arshad
d99090bc44 Reverted back centerYAnchor 2020-03-13 20:29:02 +05:30
Khan, Arshad
9b8046009a Removed un-necessary code. 2020-03-13 20:23:20 +05:30
Khan, Arshad
022f76b8b2 Removing hard coded width. 2020-03-13 19:28:55 +05:30
Khan, Arshad
73230fa341 implemented feedback 2020-03-13 01:55:58 +05:30
Lekshmi S
4f47e9fa96 Removed extra spaces and added height constraint for stacks. 2020-03-12 12:00:29 +05:30
Lekshmi S
cf9fe4f3e8 Removed extra space. 2020-03-12 10:48:37 +05:30
Subhankar Acharya
47f69aefd1 code improvement 2020-03-12 10:29:24 +05:30
Kevin G Christiano
1ae91f55ae Merge branch 'develop' into feature/form_page 2020-03-11 15:28:06 -04:00
Khan, Arshad
bd4450a7fc making pageIndex public 2020-03-11 22:42:08 +05:30
Suresh, Kamlesh
dfc9157c26 nil check 2020-03-11 10:45:17 -04:00
Lekshmi S
f33fd320ad Refactored code as per the changes in confluence. 2020-03-11 16:22:48 +05:30
Lekshmi S
a16855527f Resolved merge conflicts. 2020-03-11 16:21:52 +05:30
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
Khan, Arshad
fdd6a05528 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/carousel_fixes 2020-03-11 14:42:06 +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
Suresh, Kamlesh
c55a9f3faa rules should be optional 2020-03-10 15:42:44 -04:00