Commit Graph

342 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
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
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
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
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
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
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
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
Suresh, Kamlesh
8d2348fe63 swiftify MoleculeDelegateProtocol 2020-01-09 15:59:56 -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
Suresh, Kamlesh
dba412c7d9 Merge branch 'feature/model_wip_kamlesh' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/model_wip_kamlesh 2020-01-09 13:45:27 -05:00
Suresh, Kamlesh
2365a2fab4 fixes 2020-01-09 13:45:17 -05:00
Arora, Prateek
b037d23adb Code changes 2020-01-09 22:25:53 +05:30
Pfeil, Scott Robert
3e8b69a0bc Line and image update 2020-01-09 11:38:32 -05:00
Pfeil, Scott Robert
f40335ce19 progress, multi progress, caret 2020-01-09 10:46:00 -05:00
Arora, Prateek
20f62ce4c5 Code clean 2020-01-09 20:10:39 +05:30
Arora, Prateek
b8a162da54 Code cleaning removing duplicate constraint 2020-01-09 20:10:17 +05:30
Arora, Prateek
7b49224abd Caret link bottom spacing 2020-01-09 18:19:52 +05:30
Arora, Prateek
03aeb1fc63 headline body width 85% having max as 350px 2020-01-09 16:35:56 +05:30
Arora, Prateek
67304b7657 Changes as suggested by Ryan 2020-01-09 13:26:09 +05:30
Suresh, Kamlesh
54d0ea3e5c ModuleMolecule fixes 2020-01-08 16:50:47 -05:00
Pfeil, Scott Robert
2e514a7de5 Colors 2020-01-08 13:22:45 -05:00
Kevin G Christiano
b6cb83a146 Merge branch 'develop' into feature/swiftified_textField 2020-01-08 13:08:46 -05:00
Suresh, Kamlesh Jain
f0c7fbcb9e Merge branch 'feature/textfield_list_update_drop_down' into 'develop'
Feature/textfield list update drop down

See merge request BPHV_MIPS/mvm_core_ui!211
2020-01-08 11:58:08 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Arora, Prateek
203484b288 Code clean 2020-01-08 18:49:36 +05:30
Arora, Prateek
0226eb2cac Review comments : added default padding 2020-01-08 18:46:02 +05:30
Arora, Prateek
4c60ea2f1f Review comment changes 2020-01-08 14:53:59 +05:30
Arora, Prateek
c908606b79 Review Comment Changes 2020-01-08 13:08:09 +05:30
Arora, Prateek
f32cc7d05c Code cleaning 2020-01-08 12:21:28 +05:30
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Kevin G Christiano
30bb405b3f Merge branch 'develop' into feature/swiftified_textField 2020-01-07 11:36:38 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Arora, Prateek
d891d7ba1a Code cleaning 2020-01-07 19:29:26 +05:30
Arora, Prateek
129a0e9241 New molecule -> headLineBodyCaretLinkImage 2020-01-07 12:34:29 +05:30