Commit Graph

81 Commits

Author SHA1 Message Date
Kevin G Christiano
338a3c8a03 fixed merge issue 2020-03-30 14:48:28 -04:00
Kevin G Christiano
130c25f119 merging 2020-03-30 14:09:08 -04:00
Kevin G Christiano
dcbfcf033f latest 2020-03-30 09:53:38 -04:00
Kevin G Christiano
cb4fff6031 merging fix 2020-03-26 13:46:20 -04:00
Pfeil, Scott Robert
14af105ad7 fix to margins 2020-03-25 09:31:40 -04:00
Kevin G Christiano
f3ed68beed accessibilty start 2020-03-24 15:21:21 -04:00
Pfeil, Scott Robert
7a86b0356b Further cleaning 2020-03-24 12:45:01 -04:00
Pfeil, Scott Robert
39fc20ef79 cleanup 2020-03-20 15:54:55 -04:00
Kevin G Christiano
90d98fdc2e merging 2020-03-11 13:32:04 -04:00
Kevin G Christiano
9bce3f02a1 shifting and improving 2020-03-06 17:06:20 -05:00
Kevin G Christiano
0a6b316198 the latest 2020-03-05 13:57:45 -05:00
Kevin G Christiano
2d84b89af9 addressing issue where cell resizes but accessory does not follow. 2020-02-28 13:38:27 -05:00
Kevin G Christiano
3470e77b76 latest state 2020-02-28 13:10:15 -05:00
Kevin G Christiano
1196dee4de resolving merge conflicts 2020-02-28 10:32:19 -05:00
Pfeil, Scott Robert
0b6fe7059a Cleanup for names and stack 2020-02-27 13:45:15 -05:00
Kevin G Christiano
bd9391f401 resolving merge conflicts 2020-02-27 13:11:30 -05:00
Kevin G Christiano
9b53796266 undoing removal 2020-02-24 10:13:45 -05:00
Kevin G Christiano
e33fe346c6 mild updates 2020-02-24 09:58:47 -05:00
Kevin G Christiano
17583c107c moved hero is setWithModel. Was not being set. Mild changes. 2020-02-21 14:31:46 -05:00
Pfeil, Scott Robert
ee66dbe8d5 Caret fix in table view cell
code condensing
extra init functions
2020-02-21 09:27:30 -05:00
Subhankar Acharya
4803e20363 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/ListLeftVar_Checkbox-_Right_Caret
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-02-20 14:52:57 +05:30
Kevin G Christiano
faa9c94f90 latest carousel state 2020-02-17 13:33:25 -05:00
Kevin G Christiano
5558cc8324 adding new base class. improving carousel logic. 2020-02-13 15:33:55 -05:00
Kevin G Christiano
664b4fd230 merging from develop 2020-02-13 12:44:31 -05:00
Pfeil, Scott Robert
adaa9ca1f3 Bug fixes 2020-02-13 10:45:00 -05:00
Kevin G Christiano
d02586f613 merge from develop 2020-02-07 09:20:39 -05:00
Kevin G Christiano
977bff851e latest and greatest. 2020-02-06 15:51:13 -05:00
Kevin G Christiano
8832bbd0b7 shaping up the page control (carouselIndicator) 2020-01-31 14:26:37 -05:00
Pfeil, Scott Robert
ba8058cceb button swift 2020-01-28 12:58:51 -05:00
Pfeil, Scott Robert
1b4646df31 cleaning 2020-01-24 08:49:04 -05:00
Pfeil, Scott Robert
a2b62767bd base classes open ModelMoleculeViewProtocol functions 2020-01-23 10:33:56 -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
Pfeil, Scott Robert
db0cb77756 Update button to model 2020-01-22 09:22:57 -05:00
Xinlei(Ryan) Pan
eb1cc491b3 Merge branch 'feature/coding' into feature/link 2020-01-21 15:38:28 -05:00
Pfeil, Scott Robert
f5ed509a39 renaming 2020-01-21 15:33:27 -05:00
Xinlei(Ryan) Pan
e3b0b43272 update link method 2020-01-16 10:30:20 -05:00
Xinlei(Ryan) Pan
56b37255c2 merge from feature/coding 2020-01-16 09:59:14 -05:00
Suresh, Kamlesh
47ccd681ae merge 2020-01-15 16:49:42 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -05:00
Pfeil, Scott Robert
27793931f5 fix for static functions 2020-01-14 15:55:18 -05:00
Pfeil, Scott Robert
3d2fd02ac5 undo view constraining removal code
fix molecule table cell
fix corner labels
2020-01-14 13:58:18 -05:00
Kevin G Christiano
874addef63 Changed name. New disabled KV. mild updates. 2020-01-14 09:06:39 -05:00
Kevin G Christiano
32f85dfbf1 renamed func. changed location of action. 2020-01-13 16:30:29 -05:00
Kevin G Christiano
aea8bc5f7b Merge branch 'develop' into feature/swiftify_switch
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 16:02:18 -05:00
Ryan
255fce072b merge from develop 2020-01-13 15:47:27 -05:00
Kevin G Christiano
223ab11783 Merge branch 'develop' into feature/button
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-13 14:35:23 -05:00
Ryan
cea1ecd52c merge from develop 2020-01-13 14:02:20 -05:00