Commit Graph

1184 Commits

Author SHA1 Message Date
panxi
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Pfeil, Scott Robert
4437338620 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:29:07 -05:00
Pfeil, Scott Robert
5c2f93e06f move register to init for now
dash line update temporary for legacy
2020-01-13 15:28:53 -05:00
Pfeil, Scott Robert
f64424a2c5 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-13 15:27:27 -05:00
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -05:00
Pfeil, Scott Robert
9a18346fca Merge branch 'feature/button' into 'develop'
Translates MFCustomButton to Button

See merge request BPHV_MIPS/mvm_core_ui!205
2020-01-13 14:51:05 -05:00
Kevin G Christiano
ad4eddb450 some class is using a xib. 2020-01-13 14:43:16 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Ryan
a2d5474b10 merge feature/coding 2020-01-13 14:12:16 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00
Murugan, Vimal
e6079eab55 updated model 2020-01-14 00:11:41 +05:30
Kevin G Christiano
b79ddf7346 additions for accessibility. 2020-01-13 12:45:49 -05:00
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Pfeil, Scott Robert
73c19383b6 Scroller update 2020-01-13 11:08:58 -05:00
Kevin G Christiano
f81b50d077 Merge branch 'develop' into feature/swiftified_textField 2020-01-13 11:05:31 -05:00
Pfeil, Scott Robert
3edb1a583f module molecule update 2020-01-13 10:53:52 -05:00
Pfeil, Scott Robert
1feee6aa9a three layer model fix 2020-01-13 10:48:35 -05:00
Pfeil, Scott Robert
824e077097 stack model fixes 2020-01-13 10:46:18 -05:00
Pfeil, Scott Robert
f9620e4bc7 List template fix 2020-01-13 10:40:53 -05:00
Pfeil, Scott Robert
fe9131f3c6 update json func 2020-01-13 10:22:04 -05:00
Pfeil, Scott Robert
1b06d7007b circle progress 2020-01-13 10:20:11 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Murugan, Vimal
b4859988c2 set with json removed 2020-01-13 19:52:04 +05:30
Kevin G Christiano
85f210abe8 Accessibility fixes. 2020-01-13 08:49:51 -05:00
Murugan, Vimal
30d864749a unordered list added
numbered list added
2020-01-11 10:30:40 +05:30
Pan, Xinlei (Ryan)
a2ef7e026f Merge branch 'feature/headline_body_caret_link_image_molecule' into 'develop'
Feature/headline body caret link image molecule

See merge request BPHV_MIPS/mvm_core_ui!212
2020-01-10 11:38:32 -05:00
panxi
c4112665d9 add bottom padding 2020-01-10 11:35:29 -05:00
Khan, Arshad
7a48633cce Implemented Ryan's feedback, as Prateek is out of office for next week. 2020-01-10 10:59:13 -05:00
Pfeil, Scott Robert
90d7b188d1 each template must parse themselves... 2020-01-10 09:55:42 -05:00
Pfeil, Scott Robert
99a258c0f8 Template associated type testing 2020-01-10 08:57:56 -05:00
Arora, Prateek
61d36b25a7 Code changes 2020-01-10 11:04:07 +05:30
Pfeil, Scott Robert
629f30e073 container updates 2020-01-09 16:38:14 -05:00
Pfeil, Scott Robert
c098914309 pull 2020-01-09 16:37:54 -05:00
Pfeil, Scott Robert
826cb7f284 container change footer 2020-01-09 16:28:00 -05:00
Pfeil, Scott Robert
7fb22648c0 Container updates 2020-01-09 16:27:02 -05:00
panxi
83b0a55404 merge from feature/coding 2020-01-09 16:22:47 -05:00
panxi
99b97fd934 merge from develop 2020-01-09 16:17:29 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Suresh, Kamlesh
49a7df70e1 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 16:00:09 -05:00
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -05:00
Pfeil, Scott Robert
0e6a2202ea Remove old file 2020-01-09 15:51:42 -05:00
Kevin G Christiano
0b9f641d87 reset super. 2020-01-09 15:43:10 -05:00
Kevin G Christiano
47b82f7e87 date formatting exposure. 2020-01-09 15:32:35 -05:00
Suresh, Kamlesh
c8f8f8136d model changes 2020-01-09 15:11:03 -05:00
Pfeil, Scott Robert
40def6e19b control default 2020-01-09 14:30:25 -05:00
Pfeil, Scott Robert
b3b37db848 remove deprecated 2020-01-09 14:26:26 -05:00
Suresh, Kamlesh
e310a2b74e Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 14:22:03 -05:00
Pfeil, Scott Robert
f6c3a02f0e remove old extension 2020-01-09 14:20:58 -05:00