Commit Graph

84 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
d26d3b1e40 merge 2020-01-17 09:32:58 -05:00
Pfeil, Scott Robert
0529c9d357 merge 2020-01-16 15:03:16 -05:00
Pfeil, Scott Robert
db0d9f4353 Container protocol
Doughnut chart model
Break stack into regular and dynamic components
2020-01-16 14:59:24 -05:00
Suresh, Kamlesh
ef1215c130 merge 2020-01-15 18:37:36 -05:00
Kevin G Christiano
703e0cd32b Convenience to access cgColor. 2020-01-15 12:38:31 -05:00
Suresh, Kamlesh
c3433c2f80 merge 2020-01-14 19:29:37 -05:00
Pfeil, Scott Robert
7255c0c354 Merge remote-tracking branch 'refs/remotes/origin/feature/coding'
Conflicts:
	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
	MVMCoreUI/Molecules/Items/TableViewCell.swift
	MVMCoreUI/Molecules/ModelMoleculeViewProtocol.swift
	MVMCoreUI/Organisms/MoleculeStackView.swift
2020-01-14 15:58:12 -05:00
Pfeil, Scott Robert
979718d4b8 Defaults, percent fix 2020-01-14 11:56:50 -05:00
Murugan, Vimal
31aabef3ae Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/unordered_numbered_list_from_coding 2020-01-14 21:57:12 +05:30
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Murugan, Vimal
46b37a5f56 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 20:50:24 +05:30
Murugan, Vimal
7e38657b63 review comments updated
models updated
2020-01-14 20:48:15 +05:30
Pfeil, Scott Robert
77af932f5d update old key 2020-01-14 09:26:04 -05:00
Pfeil, Scott Robert
447df655df make the error throwable 2020-01-14 09:12:09 -05:00
panxi
a6dc16889c fix error from merging 2020-01-13 17:07:16 -05:00
panxi
53e00a7654 Merge branch 'feature/coding' into feature/unordered_numbered_list_from_coding 2020-01-13 17:03:00 -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
Murugan, Vimal
e6079eab55 updated model 2020-01-14 00:11:41 +05:30
Murugan, Vimal
ec451d1f2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/doughnutchart_from_coding 2020-01-14 00:04:39 +05:30
Murugan, Vimal
be094b3cf9 review comments updated 2020-01-13 22:49:51 +05:30
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
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Murugan, Vimal
396c22f243 doughnut chart model added
doughnut chart view added
doughnut chart added
2020-01-11 16:06:25 +05:30
Murugan, Vimal
30d864749a unordered list added
numbered list added
2020-01-11 10:30:40 +05:30
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
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
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
Pfeil, Scott Robert
0e6a2202ea Remove old file 2020-01-09 15:51:42 -05:00
Suresh, Kamlesh
c8f8f8136d model changes 2020-01-09 15:11:03 -05:00
Pfeil, Scott Robert
3e8b69a0bc Line and image update 2020-01-09 11:38:32 -05:00
Pfeil, Scott Robert
2e514a7de5 Colors 2020-01-08 13:22:45 -05:00
Pfeil, Scott Robert
b620a533d5 Color
CaretLink model change name
2020-01-08 11:22:34 -05:00
Kevin G Christiano
84462a197e changed comment. 2020-01-08 09:37:47 -05:00
Kevin G Christiano
2d0377acfc small format. 2020-01-08 09:30:55 -05:00
Kevin G Christiano
2abd6a866a Explaining use case of Color. 2020-01-08 09:28:54 -05:00
Suresh, Kamlesh
1230854311 merge fixes 2020-01-07 14:08:45 -05:00
Pfeil, Scott Robert
d3e3a6809c container fixes for modal 2020-01-07 11:08:00 -05:00
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Pfeil, Scott Robert
5a8584342a merge 2020-01-02 09:31:58 -05:00
Suresh, Kamlesh
7b0e423759 conflict 2019-12-20 12:07:59 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -05:00
panxi
bf27d19ae1 change float to cgfloat for nslayoutconstraint 2019-12-19 14:25:26 -05:00