Commit Graph

2067 Commits

Author SHA1 Message Date
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
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
c55a9f3faa rules should be optional 2020-03-10 15:42:44 -04:00
Suresh, Kamlesh
7965c4ac6a clean up 2020-03-10 15:25:49 -04:00
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
Suresh, Kamlesh
c1047d42b8 regex 2020-03-10 11:37:08 -04:00
Khan, Arshad
d6ea42fb95 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/carousel_fixes 2020-03-10 20:12:55 +05:30
Khan, Arshad
955d398262 making properties and function public 2020-03-10 20:11:25 +05:30
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
Khan, Arshad
d22147106b Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/carousel_fixes 2020-03-10 11:44:19 +05:30
Suresh, Kamlesh
f8589aabfc merge 2020-03-09 22:44:19 -04:00
Kruthika KP
2489c95710 Merge branch 'develop' into feature/list_rightvariable_totaldata
* develop:
  name update
  fix link
  update link to not have padding
  decode fixes
2020-03-10 08:10:14 +05:30
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
Suresh, Kamlesh
21f38af0c3 equal rules 2020-03-09 22:26:01 -04:00
Suresh, Kamlesh
2ce25e340c optimise 2020-03-09 22:04:41 -04:00
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
Khan, Arshad
3970b34719 Making few properties public.
Constraint fixes.
2020-03-10 01:15:37 +05:30
Suresh, Kamlesh
c53c76d7f3 fixes 2020-03-09 12:02:04 -04:00
Pfeil, Scott Robert
c96e2fa3c2 index path update 2020-03-09 11:29:35 -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
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
Suresh, Kamlesh
8df94a2f56 moving back to any 2020-03-08 19:14:51 -04:00
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
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
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
Kruthika KP
edc362526c code cleanup 2020-03-05 12:22:26 +05:30