Commit Graph

1576 Commits

Author SHA1 Message Date
Kevin G Christiano
451e28cdfd removed conflict file 2020-01-24 11:47:25 -05:00
Kevin G Christiano
851d5b57ff remvoe explicit unwrapping 2020-01-24 10:58:03 -05:00
Kevin G Christiano
af7e813e18 model reuse again 2020-01-24 10:41:38 -05:00
Kevin G Christiano
f43e018e21 model reuse 2020-01-24 10:38:38 -05:00
Kevin G Christiano
02107a3498 merging 2020-01-24 10:19:23 -05:00
Kevin G Christiano
86f60bccf8 adding height override 2020-01-24 10:11:42 -05:00
Kevin G Christiano
304b4cbc4c models encode properly 2020-01-24 09:41:34 -05:00
Pfeil, Scott Robert
d7f955c991 fix to error check 2020-01-24 09:35:38 -05:00
Xinlei(Ryan) Pan
6602ac505a Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 09:26:00 -05:00
Xinlei(Ryan) Pan
d6a7e98718 remove conflicts file 2020-01-24 09:25:09 -05:00
Pfeil, Scott Robert
c0c5eef9e1 dash update 2020-01-24 09:22:45 -05:00
Pfeil, Scott Robert
633bcf9fd0 dash line update 2020-01-24 09:21:03 -05:00
Pfeil, Scott Robert
203b049829 Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-24 08:49:13 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Kevin G Christiano
6139f31e54 wring label 2020-01-23 22:42:19 -05:00
Kevin G Christiano
c5e80d602e temp fix for arch issue 2020-01-23 21:04:48 -05:00
Kevin G Christiano
83d5721e68 temp fix for arch issue 2020-01-23 19:59:05 -05:00
Kevin G Christiano
8fb8694b82 merge fix 2020-01-23 14:30:11 -05:00
Kevin G Christiano
0c7a2940d9 Fixing issues for model reuse. 2020-01-23 14:26:04 -05:00
Xinlei(Ryan) Pan
0069f38d4e update toggle alignment 2020-01-23 14:06:25 -05:00
Xinlei(Ryan) Pan
2f68dcb695 update horizontal alignment 2020-01-23 14:05:36 -05:00
Kevin G Christiano
e143c75215 redirect type 2020-01-23 13:10:57 -05:00
Kevin G Christiano
af83a2aa1e alighing with merge. 2020-01-23 13:10:27 -05:00
Pfeil, Scott Robert
5d23b8329f list item fix 2020-01-23 12:54:34 -05:00
Suresh, Kamlesh
ac17015a09 container model 2020-01-23 11:10:28 -05:00
Pfeil, Scott Robert
6d81705c2e Merge branch 'feature/coding' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/coding 2020-01-23 11:01:49 -05:00
Pfeil, Scott Robert
abc854e152 List template change to molecules not required (for now) 2020-01-23 11:01:36 -05:00
Pfeil, Scott Robert
d3edf62a94 toggle name change 2020-01-23 10:42:39 -05:00
Pfeil, Scott Robert
e0abe4c8cd More opening 2020-01-23 10:40:17 -05:00
Pfeil, Scott Robert
a2b62767bd base classes open ModelMoleculeViewProtocol functions 2020-01-23 10:33:56 -05:00
Kevin G Christiano
8a09424dbe Removed and added file back. Something was corrupted with the path name. 2020-01-23 10:27:36 -05:00
Pfeil, Scott Robert
b80cd421cf height fixes 2020-01-23 10:24:11 -05:00
Pfeil, Scott Robert
15a943d2e7 Changed stack to use a percent modifier to compensate for spacing. 2020-01-23 09:31:33 -05:00
Kevin G Christiano
ccb8a2cf52 weak change 2020-01-22 15:39:39 -05:00
Kevin G Christiano
86ce3c9d4f modeling entryField 2020-01-22 14:51:27 -05:00
Pfeil, Scott Robert
c6ba48397c Add some missing models 2020-01-22 14:31:33 -05:00
Kevin G Christiano
1eec90e8e1 align model. 2020-01-22 11:57:16 -05:00
Kevin G Christiano
6522472be2 Merge branch 'feature/coding' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
2020-01-22 11:50:52 -05:00
Kevin G Christiano
f7ce81874e EntryField Models. Updated dropdown for new dropdown. 2020-01-22 11:47:21 -05:00
Pfeil, Scott Robert
d22715585e Eyebrow headline body to link 2020-01-22 11:44:02 -05:00
Xinlei(Ryan) Pan
6a8221ff4d merge from feature/coding 2020-01-22 11:32:25 -05:00
Xinlei(Ryan) Pan
d30f6314a5 remove unneeded property 2020-01-22 11:27:24 -05:00
Pfeil, Scott Robert
712d18d123 Model organizing 2020-01-22 11:12:07 -05:00
Xinlei(Ryan) Pan
b512db7b92 remove space 2020-01-22 10:52:57 -05:00
Xinlei(Ryan) Pan
ab66cfae3c update method 2020-01-22 10:42:01 -05:00
Xinlei(Ryan) Pan
17983b51f5 merge from feature/coding 2020-01-22 10:29:54 -05:00
Xinlei(Ryan) Pan
85675a1d0e merge feature/coding 2020-01-22 10:24:18 -05:00
Pfeil, Scott Robert
016c6edc06 Cleanup 2020-01-22 10:24:04 -05:00
Xinlei(Ryan) Pan
cd231746cf update link model 2020-01-22 10:16:18 -05:00
Pfeil, Scott Robert
db0cb77756 Update button to model 2020-01-22 09:22:57 -05:00