Commit Graph

2182 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
13a8c58f27 Merge branch 'feature/font' into 'develop'
add 2.0 font back for march release

See merge request BPHV_MIPS/mvm_core_ui!292
2020-03-06 13:29:31 -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
Pan, Xinlei (Ryan)
b470ae67f5 Merge branch 'bugfix/category_collision' into 'develop'
change the base decode functions

See merge request BPHV_MIPS/mvm_core_ui!291
2020-03-06 09:33:57 -05:00
Pfeil, Scott Robert
c6e6d28903 merge and cleanup 2020-03-06 08:44:30 -05:00
Subhankar Acharya
c891b6763e code cleanup and identation 2020-03-06 16:19:54 +05:30
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
Kevin G Christiano
d3aacadb71 Merge branch 'develop' into feature/isaac_screen 2020-03-05 15:34:39 -05:00
Kevin G Christiano
0a6b316198 the latest 2020-03-05 13:57:45 -05:00
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
Subhankar Acharya
23fe4cbe3d Created folder for designed headers. 2020-03-05 20:24:01 +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
edc362526c code cleanup 2020-03-05 12:22:26 +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
Pan, Xinlei (Ryan)
b54694690e Merge branch 'feature/chatbotremove' into 'develop'
Remove right panel protocol

See merge request BPHV_MIPS/mvm_core_ui!290
2020-03-04 15:27:20 -05:00
Suresh, Kamlesh
97cf39eaee textfield enhancement 2020-03-04 15:17:45 -05:00
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