Commit Graph

2263 Commits

Author SHA1 Message Date
Xinlei(Ryan) Pan
9d90125476 Merge branch 'develop' into feature/chatbotremove 2020-03-04 13:04:21 -05:00
Suresh, Kamlesh
9d8953d229 clean up 2020-03-04 10:52:40 -05:00
Pfeil, Scott Robert
db734dc92e Merge branch 'feature/list_progressbar_data' into 'develop'
Feature/list progressbar data

See merge request BPHV_MIPS/mvm_core_ui!278
2020-03-04 09:18:25 -05:00
Pfeil, Scott Robert
1e03009142 slight cleanup 2020-03-04 09:15:57 -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
Pfeil, Scott Robert
eef6d3bf74 Merge branch 'bugfix/cxtdt-63501' into 'develop'
Helps resolve CXTDT-63501

See merge request BPHV_MIPS/mvm_core_ui!288
2020-03-03 16:16:27 -05:00
Pfeil, Scott Robert
61fea9ae8a Remove right panel protocol 2020-03-03 15:58:26 -05:00
Robinson, Blake
d04e87edaf Helps resolve CXTDT-63501
Gesture recognizer on Page Control needs to be public so that subclass, MFTextPageControl, can add it and remove it as needed
2020-03-03 15:37:58 -05:00
Lekshmi S
f21cac7a41 Code cleanup 2020-03-03 16:06:04 +05:30
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
Kruthika KP
ff382f0ef8 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  opening access to prevent error
2020-03-03 14:52:12 +05:30
Lekshmi S
361e1f043f Code cleanup. 2020-03-03 13:27:04 +05:30
Lekshmi S
09af9d6661 Merge branch 'develop' into feature/list_twocolumn_comparechanges 2020-03-03 11:25:19 +05:30
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
Pfeil, Scott Robert
b4a5ec2ded Merge branch 'feature/access_fix' into 'develop'
Opening access to prevent error

See merge request BPHV_MIPS/mvm_core_ui!287
2020-03-02 11:02:21 -05:00
Kevin G Christiano
6b93270431 opening access to prevent error 2020-03-02 10:59:24 -05:00
Subhankar Acharya
188277742a Code refactoring. 2020-03-02 16:44:49 +05:30
Subhankar Acharya
2e690a6061 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_twocolumn_comparechanges
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-03-02 16:32:40 +05:30
Kruthika KP
1d1bcf1b4a 19084 - List Right variable Total Data 2020-03-02 11:43:50 +05:30
Pan, Xinlei (Ryan)
52d7a31d49 Merge branch 'feature/testing' into 'develop'
Feature/testing

See merge request BPHV_MIPS/mvm_core_ui!286
2020-02-28 15:22:28 -05:00
Pfeil, Scott Robert
2e99d980e8 open for mobile first 2020-02-28 14:08:38 -05:00
Pfeil, Scott Robert
01a36a0245 remove test file 2020-02-28 13:50:06 -05:00
Pfeil, Scott Robert
201fa2be81 remove file testing 2020-02-28 13:48:23 -05:00
Pfeil, Scott Robert
7345dce4b9 Dropdown filter fix 2020-02-28 13:46:33 -05:00
Kevin G Christiano
2d84b89af9 addressing issue where cell resizes but accessory does not follow. 2020-02-28 13:38:27 -05:00
Pfeil, Scott Robert
cfd6cb1358 Teting 2020-02-28 13:06:11 -05:00
Pfeil, Scott Robert
d8845081fe Merge branch 'feature/list_fourcolumn_datausage_divider' into 'develop'
List Four ColumnData UsageDivider

See merge request BPHV_MIPS/mvm_core_ui!277
2020-02-28 12:22:15 -05:00
Pfeil, Scott Robert
27e1a97a80 order update 2020-02-28 12:21:13 -05:00
Pfeil, Scott Robert
527cdc684d Small updates 2020-02-28 12:17:44 -05:00
Pfeil, Scott Robert
fea104adc8 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_fourcolumn_datausage_divider 2020-02-28 12:12:09 -05:00
Pfeil, Scott Robert
4c25b8a160 merge 2020-02-28 12:11:51 -05:00
Pfeil, Scott Robert
d77ce25aa1 Merge branch 'feature/color_update' into 'develop'
Feature/color update

See merge request BPHV_MIPS/mvm_core_ui!285
2020-02-28 12:10:22 -05:00
Pfeil, Scott Robert
f230291e47 color 2020-02-28 11:36:14 -05:00
Pfeil, Scott Robert
320c72ba1f Merge branch 'feature/list_leftvariable_radiobutton_paymentmethod' into 'develop'
Feature/list leftvariable radiobutton paymentmethod

See merge request BPHV_MIPS/mvm_core_ui!282
2020-02-28 10:33:52 -05:00
Pfeil, Scott Robert
f779478cc5 update 2020-02-28 10:32:27 -05:00
Pfeil, Scott Robert
36e34e1726 fixes 2020-02-28 10:30:57 -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
0b870ca282 Merge branch 'feature/cleanup' into 'develop'
Feature/cleanup

See merge request BPHV_MIPS/mvm_core_ui!284
2020-02-28 09:49:23 -05:00
Subhankar Acharya
19ce1087eb Removing percentage. 2020-02-28 19:44:23 +05:30
Lekshmi S
1c8c452fbe Created folder structure 2020-02-28 12:28:49 +05:30
Lekshmi S
1b2f867f5f Merge branch 'feature/cleanup' into feature/list_twocolumn_comparechanges 2020-02-28 12:01:52 +05:30
Pfeil, Scott Robert
6a28585765 merge fix 2020-02-27 13:58:44 -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
e7b7012708 constraint convenience 2020-02-27 13:00:39 -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
Pan, Xinlei (Ryan)
d57550986d Merge branch 'feature/release_7_4_0_clone' into 'develop'
Merge release/7_4_0 into develop

See merge request BPHV_MIPS/mvm_core_ui!281
2020-02-27 12:01:42 -05:00