mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,986 Commits 64 Branches 0 Tags 46 MiB
cf9fe4f3e8
Commit Graph

1986 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lekshmi S
cf9fe4f3e8 Removed extra space. 2020-03-12 10:48:37 +05:30
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
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
Pfeil, Scott Robert
164546ef23 Merge branch 'feature/isaac_screen' into 'develop' 
isaac screen dashboard

See merge request BPHV_MIPS/mvm_core_ui!298
 2020-03-10 14:24:04 -04:00
Kevin G Christiano
fa38447def Merge branch 'develop' 2020-03-10 08:31:20 -04:00
Pfeil, Scott Robert
c07136b62d Merge branch 'feature/list_onecolumn_fulwidthtext_bodytext' into 'develop' 
Feature/list onecolumn fulwidthtext bodytext

See merge request BPHV_MIPS/mvm_core_ui!294
 2020-03-10 08:03:49 -04:00
Kruthika KP
b9409e3a9e Merge branch 'develop' into feature/list_onecolumn_fulwidthtext_bodytext 
* develop:
  name update
  fix link
  update link to not have padding
  decode fixes
 2020-03-10 08:09:49 +05:30
Kruthika KP
b672632057 Removed initializers 2020-03-10 08:09:33 +05:30
Pfeil, Scott Robert
8998dc910c Merge branch 'bugfix/apo' into 'develop' 
Bugfix/apo

See merge request BPHV_MIPS/mvm_core_ui!299
 2020-03-09 18:34:15 -04:00
Pfeil, Scott Robert
6aef009eba name update 2020-03-09 16:58:01 -04:00
Pfeil, Scott Robert
fc7a64f3df fix link 2020-03-09 16:52:24 -04:00
Pfeil, Scott Robert
b30c08f467 update link to not have padding 2020-03-09 16:33:25 -04:00
Pfeil, Scott Robert
24961cb50e decode fixes 2020-03-09 16:11:21 -04:00
Pfeil, Scott Robert
c96e2fa3c2 index path update 2020-03-09 11:29:35 -04:00
Kruthika KP
f3314af68f Removed stack 2020-03-09 10:18:20 +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
Kevin G Christiano
e48a0e3af9 Merge branch 'develop' into feature/isaac_screen 2020-03-06 17:07:21 -05:00
Kevin G Christiano
9bce3f02a1 shifting and improving 2020-03-06 17:06:20 -05:00
Suresh, Kamlesh Jain
50d20704e7 Merge branch 'feature/modal' into 'develop' 
add modal template

See merge request BPHV_MIPS/mvm_core_ui!297
 2020-03-06 16:53:08 -05:00
Xinlei(Ryan) Pan
59cb32d281 add modal template 2020-03-06 16:26:35 -05:00
Suresh, Kamlesh Jain
d9905c8cd5 Merge branch 'feature/checkbox_keys' into 'develop' 
Feature/checkbox keys

See merge request BPHV_MIPS/mvm_core_ui!296
 2020-03-06 14:28:34 -05:00
Pfeil, Scott Robert
4ae6a393d3 key update 2020-03-06 14:20:58 -05:00
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
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
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
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
Xinlei(Ryan) Pan
9d90125476 Merge branch 'develop' into feature/chatbotremove 2020-03-04 13:04:21 -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
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
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
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