Commit Graph

1910 Commits

Author SHA1 Message Date
Kevin G Christiano
3470e77b76 latest state 2020-02-28 13:10:15 -05:00
Kevin G Christiano
1196dee4de resolving merge conflicts 2020-02-28 10:32:19 -05:00
Kevin G Christiano
edf1a478f7 adjusting 2020-02-28 10:16:40 -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
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
bd9391f401 resolving merge conflicts 2020-02-27 13:11:30 -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
Kevin G Christiano
c2baebe483 removed testing code 2020-02-27 12:00:45 -05:00
Kevin G Christiano
1ee8c244cd merging 2020-02-27 11:57:10 -05:00
Kevin G Christiano
411d72a152 Merge branch 'develop' into feature/arrow 2020-02-27 11:56:49 -05:00
Kevin G Christiano
78673b824e removed test code 2020-02-27 11:46:17 -05:00
Kevin G Christiano
5640129cdf working state of arrow 2020-02-27 11:44:24 -05:00
Kevin G Christiano
b6af3ced00 latest state 2020-02-27 10:12:43 -05:00
Pan, Xinlei (Ryan)
830a93be2c Merge branch 'feature/external_link' into 'develop'
External link

See merge request BPHV_MIPS/mvm_core_ui!280
2020-02-27 10:08:42 -05:00
Pan, Xinlei (Ryan)
b14fe5db30 Merge branch 'feature/newfont' into 'develop'
Feature/newfont

See merge request BPHV_MIPS/mvm_core_ui!276
2020-02-27 09:49:10 -05:00
Xinlei(Ryan) Pan
6efbd196a8 add error log 2020-02-26 14:02:26 -05:00
Kevin G Christiano
10e4711c90 wipppp 2020-02-26 13:44:17 -05:00
Kevin G Christiano
1fa8cfd16a opening up funcs 2020-02-26 13:39:44 -05:00
Kevin G Christiano
f8608e7252 resolving merge 2020-02-26 13:37:46 -05:00
Xinlei(Ryan) Pan
a96427b793 add comment 2020-02-26 13:36:20 -05:00
Kevin G Christiano
73bd5ebafc wipppp 2020-02-26 13:36:02 -05:00
Xinlei(Ryan) Pan
fcc21ebf28 fix typo 2020-02-26 13:34:01 -05:00
Xinlei(Ryan) Pan
80b2513feb fix semi colon paste in m file 2020-02-26 13:28:23 -05:00
Kevin G Christiano
8ff8f9aa3a external icon convenience 2020-02-26 13:21:43 -05:00
Xinlei(Ryan) Pan
4b31b19174 update font 2020-02-26 13:00:40 -05:00
Xinlei(Ryan) Pan
1d7fb0d219 change font of top navigation from 14 to 13 for new design 2020-02-26 12:45:06 -05:00
Xinlei(Ryan) Pan
16f49329f7 update create label method name 2020-02-26 12:35:44 -05:00
Pan, Xinlei (Ryan)
363d7c4568 Merge branch 'bugfix/top_message_status_color' into 'develop'
Bugfix/top message status color

See merge request BPHV_MIPS/mvm_core_ui!279
2020-02-26 12:11:42 -05:00
Pfeil, Scott Robert
b1c87f2e14 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/rightVariable_payments_list 2020-02-26 11:50:06 -05:00
Pfeil, Scott Robert
cfcff1aa6e Top Alert Fixes for top color and status bar color 2020-02-26 11:49:31 -05:00
Xinlei(Ryan) Pan
e54c87becf update font 2020-02-26 11:06:34 -05:00
Pfeil, Scott Robert
628321e466 Merge branch 'feature/list_onecolumn_fullwidthtext_bodytextonly' into 'develop'
ListOneColumnFullWidthTextAllTextAndLinks

See merge request BPHV_MIPS/mvm_core_ui!273
2020-02-25 14:25:43 -05:00
Pfeil, Scott Robert
7be08fe9be Stack fixes 2020-02-25 14:20:46 -05:00
Xinlei(Ryan) Pan
455507626c add new fonts method,
change font from nullable to non null for better swift typing
2020-02-25 13:59:24 -05:00
Xinlei(Ryan) Pan
4ad4eb7f46 add new font 2020-02-25 11:49:26 -05:00
Subhankar Acharya
2ec429974a removing updateView. 2020-02-25 21:24:04 +05:30
Subhankar Acharya
54782b1871 Changes in init method and spacing 2020-02-25 20:11:22 +05:30
Kruthika KP
fea1c2e997 added subHeadline and changed the files order 2020-02-25 13:33:40 +05:30
Kruthika KP
5dd1c229f9 Merge branch 'develop' into feature/list_onecolumn_fullwidthtext_bodytextonly
* develop:
  header updates
  undoing removal
  mild updates
  hero is working. commenting done.
  rolled back change.
  moved hero is setWithModel. Was not being set. Mild changes.
  undo commented code
  Caret fix in table view cell code condensing extra init functions
2020-02-25 09:37:28 +05:30
Pfeil, Scott Robert
877cdd1dd4 Merge branch 'feature/header_subclass' into 'develop'
Feature/header subclass

See merge request BPHV_MIPS/mvm_core_ui!275
2020-02-24 17:09:56 -05:00
Pfeil, Scott Robert
b255b1acac header updates 2020-02-24 16:53:42 -05:00
Pfeil, Scott Robert
a132a51903 Merge branch 'feature/code_condensing' into 'develop'
Feature/code condensing

See merge request BPHV_MIPS/mvm_core_ui!274
2020-02-24 14:35:14 -05:00
Subhankar Acharya
9a8c510b7f minor change 2020-02-24 22:06:31 +05:30
Subhankar Acharya
2f94f3435a Code changes as per condensed code feature branch. 2020-02-24 22:04:28 +05:30