Commit Graph

42 Commits

Author SHA1 Message Date
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Pfeil, Scott Robert
045cfeb7f9 pull 2020-01-22 09:11:21 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Pfeil, Scott Robert
42b57dcd5d Cleaning 2020-01-21 12:10:48 -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
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -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
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
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
panxi
d17ab73d34 update encode decode method 2019-12-19 14:02:52 -05:00
Suresh, Kamlesh
1db2a5b058 fixes 2019-12-18 12:06:13 -05:00
Pfeil, Scott Robert
e41f3039e4 Name changes and cleanup 2019-12-17 14:12:04 -05:00
panxi
8612b34ac7 update listitem 2019-12-13 11:26:48 -05:00
Suresh, Kamlesh
58ec1abcfe list model protocol 2019-12-13 11:07:32 -05:00
panxi
52186bf089 add protocol func into view 2019-12-12 17:22:26 -05:00
Suresh, Kamlesh
3a1e3356bf module molecule 2019-12-06 14:30:19 -05:00
Suresh, Kamlesh
9676f41633 container model protocol 2019-12-04 16:59:02 -05:00
Suresh, Kamlesh
b7ff1354b8 clean up 2019-12-04 16:21:10 -05:00
Kevin G Christiano
7e48670179 Adding Model for UIColor and supporting UIColor Extension. 2019-12-04 12:38:57 -05:00
Suresh, Kamlesh
d00a04831d fixes 2019-12-03 09:19:55 -05:00
Suresh, Kamlesh
0648ec0191 fixes 2019-11-27 17:25:23 -05:00
Suresh, Kamlesh
9195f96a68 fixes 2019-11-27 14:29:20 -05:00
Suresh, Kamlesh
9a6fd85405 merge 2019-11-27 11:05:52 -05:00
Suresh, Kamlesh
5446fb0785 WIP 2019-11-26 19:20:38 -05:00
Pfeil, Scott Robert
cc2e4751f5 merge 2019-11-25 09:09:45 -05:00
Pfeil, Scott Robert
d884602d87 tweaks 2019-11-25 09:06:09 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Suresh, Kamlesh
bf20fb3104 fixes 2019-11-19 15:32:35 -05:00
panxi
1a3d3eb36f update with new code, move core code to mvmcore 2019-11-12 17:36:00 -05:00
Pfeil, Scott Robert
347ebbed8c typo fixes 2019-11-07 10:05:17 -05:00
Suresh, Kamlesh
205c83c097 intial draft 2019-10-28 14:47:42 -04:00