Commit Graph

93 Commits

Author SHA1 Message Date
Pfeil, Scott Robert
7a86b0356b Further cleaning 2020-03-24 12:45:01 -04:00
Pfeil, Scott Robert
9381e41906 merge 2020-03-23 17:08:26 -04:00
Pfeil, Scott Robert
7b36f466fa navigation item update to fix crash 2020-03-23 15:01:31 -04:00
Pfeil, Scott Robert
39fc20ef79 cleanup 2020-03-20 15:54:55 -04:00
Pfeil, Scott Robert
18dcf3072f required identifiers 2020-03-19 16:28:35 -04:00
Pfeil, Scott Robert
2c6f9667a5 small changes 2020-03-16 16:47:39 -04:00
Pfeil, Scott Robert
87fb08fb72 Navigation model 2020-03-16 09:15:49 -04:00
Pfeil, Scott Robert
335ec160b5 swift 2020-03-13 10:04:47 -04:00
Suresh, Kamlesh
22b0b7259f merge conflicts 2020-03-06 18:04:30 -05:00
Suresh, Kamlesh
1bbfb0390a fixes 2020-03-06 10:51:09 -05:00
Suresh, Kamlesh
3ec024ff27 changes 2020-03-03 20:32:57 -05:00
Pfeil, Scott Robert
4b9cd27cab change the base decode functions 2020-03-02 14:54:48 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
633eb4ec21 adding a new action type. updated action map flow. 2020-02-18 15:19:28 -05:00
Pfeil, Scott Robert
adaa9ca1f3 Bug fixes 2020-02-13 10:45:00 -05:00
Pfeil, Scott Robert
24f44e5829 Small cleaning 2020-02-12 22:03:46 -05:00
Kevin G Christiano
e0bb0e45dc integrating changes to make fan out instance models into categories due to name conflicts 2020-02-12 11:25:37 -05:00
Kevin G Christiano
15bfb6b481 Bug fix and general shape-up 2020-02-06 09:31:23 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
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
Suresh, Kamlesh
4d155b9f97 ActionModelProtocol 2020-01-21 18:23:32 -05:00
Pfeil, Scott Robert
74b09fa51d name change 2020-01-21 15:47:02 -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
Kevin G Christiano
703e0cd32b Convenience to access cgColor. 2020-01-15 12:38:31 -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
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
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
Pfeil, Scott Robert
57753f6697 Change keys 2020-01-13 15:26:51 -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
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -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
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