Commit Graph

104 Commits

Author SHA1 Message Date
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
Xinlei(Ryan) Pan
0c7726bcc3 fix caretbutton 2020-01-17 17:32:32 -05:00
Suresh, Kamlesh
c2f3a7a2db primary button and top bottom pin 2020-01-17 14:31:32 -05:00
Suresh, Kamlesh
13dbb28357 caret title 2020-01-17 11:04:35 -05:00
Suresh, Kamlesh
4dde423d2f button fixes 2020-01-16 17:32:00 -05:00
Pfeil, Scott Robert
fc2326e9a8 button size 2020-01-14 16:32:42 -05:00
Pfeil, Scott Robert
2f6859f543 button model fix 2020-01-14 11:17:10 -05:00
Pfeil, Scott Robert
9c0bea033c actionType fix 2020-01-14 10:13:19 -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
Pfeil, Scott Robert
788145332f Two button view temporary model fix
primary button model
2020-01-13 12:44:05 -05:00
Pfeil, Scott Robert
bb0be72519 Link update 2020-01-13 11:33:44 -05:00
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Kevin G Christiano
0b9f641d87 reset super. 2020-01-09 15:43:10 -05:00
Kevin G Christiano
6b983d2f69 Moved out. 2020-01-09 14:11:50 -05:00
Pfeil, Scott Robert
78461d0557 CaretLink 2020-01-09 13:48:35 -05:00
Kevin G Christiano
e674fe4d94 Adding protocols, comments, and mild reworks. 2020-01-08 14:19:37 -05:00
Kevin G Christiano
468f58b88e Merge branch 'develop' into feature/button 2020-01-08 13:34:31 -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
Suresh, Kamlesh
d5cf307de4 merge fixes 2020-01-06 17:30:02 -05:00
Suresh, Kamlesh
ba76fedff4 fixes 2019-12-20 10:24:36 -05:00
Kevin G Christiano
cf41609210 correcting alignment func. 2019-12-19 16:09:41 -05:00
Kevin G Christiano
3b59e03695 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
#	MVMCoreUI/Molecules/Items/MoleculeTableViewCell.swift
2019-12-19 15:11:48 -05:00
Robinson, Blake
82c76c6084 Removed self where unnecessary 2019-12-19 10:37:57 -05:00
Robinson, Blake
1de7618e5c Changed to MVMCoreUIDelegateObject 2019-12-19 10:36:57 -05:00
Robinson, Blake
6cf4ba0594 Improved swifty-ness of these lines 2019-12-19 10:30:14 -05:00
Robinson, Blake
8f23dd391c Removes disabled logic from Button because it won't be in the actionMap going forward 2019-12-19 10:19:42 -05:00
Robinson, Blake
2c5e2286b1 Removed line setting title because title won't be part of actionMap in the future 2019-12-19 10:06:54 -05:00
Robinson, Blake
109ef54479 Rewrote ButtonTapBlock in swift 2019-12-19 09:53:09 -05:00
Robinson, Blake
4b855a1a63 Removes unused property heightConstraint 2019-12-19 09:28:41 -05:00
Robinson, Blake
39c96849c8 Translates MFCustomButton to Button 2019-12-18 17:58:53 -05:00
Suresh, Kamlesh
1db2a5b058 fixes 2019-12-18 12:06:13 -05:00
Pfeil, Scott Robert
dc8910c61d add height constraint 2019-12-16 13:54:52 -05:00
Suresh, Kamlesh
c6d5775d57 CaretButtonModel 2019-12-16 13:51:37 -05:00
Pfeil, Scott Robert
092dfd6ad0 List item updates 2019-12-16 13:40:04 -05:00
Pfeil, Scott Robert
f610264327 alignment updates 2019-12-16 11:19:30 -05:00
Kevin G Christiano
30a56923c0 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-11-12 11:08:55 -05:00
Suresh, Kamlesh
a212dff80f fixes 2019-11-07 10:45:40 -05:00
Kevin G Christiano
bb3277e1ba latest and greatest. 2019-11-04 11:39:32 -05:00
Kevin G Christiano
ba602c1c86 Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2019-10-30 09:35:39 -04:00
Pfeil, Scott Robert
48a940f160 fix to typos 2019-10-29 10:12:59 -04:00
Kevin G Christiano
5bc78e594e getting ready for the next phase. 2019-10-24 15:43:06 -04:00
Suresh, Kamlesh
73342e40d1 code optimization 2019-10-23 14:51:35 -04:00
Suresh, Kamlesh
f1c319244a radioButton and radioButtonWithLabel and code review 2019-10-21 17:26:33 -04:00
panxi
034610af5e fixing merging issue 2019-10-17 15:50:25 -04:00