Commit Graph

43 Commits

Author SHA1 Message Date
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
Pfeil, Scott Robert
5bb6b9bc75 Line items update 2020-01-13 09:38:39 -05:00
panxi
83b0a55404 merge from feature/coding 2020-01-09 16:22:47 -05:00
Kevin G Christiano
9308d6d892 Move Button to Base Classes Folder. 2020-01-09 16:01:12 -05:00
Pfeil, Scott Robert
40def6e19b control default 2020-01-09 14:30:25 -05:00
Pfeil, Scott Robert
2e514a7de5 Colors 2020-01-08 13:22:45 -05:00
Kevin G Christiano
14f49882b1 Big Self. 2020-01-08 10:44:36 -05:00
Kevin G Christiano
7d2770356b Merge branch 'develop' into feature/coding
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-08 09:29:52 -05:00
Kevin G Christiano
916f63240b Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
2020-01-07 16:14:42 -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
panxi
ca1a6f8c83 merge from develop 2019-12-20 14:59:44 -05:00
Kevin G Christiano
fbc6e83038 Created Protocol to centralize tap detection logic. 2019-12-20 13:27:22 -05:00
Kevin G Christiano
a04399516d Merge branch 'develop' into feature/swiftified_textField
# Conflicts:
#	MVMCoreUI/Atoms/Views/Checkbox.swift
2019-12-19 15:32:57 -05:00
Kevin G Christiano
44ff5e9d3c Further development of Entry Field. 2019-12-13 12:54:43 -05:00
panxi
52186bf089 add protocol func into view 2019-12-12 17:22:26 -05:00
Kevin G Christiano
59008f87d0 Making further improvements from design specs. 2019-12-12 16:47:07 -05:00
panxi
8d811f229f change from viewconstrainingview to view 2019-12-12 15:28:47 -05:00
Kevin G Christiano
8804e21d3c New constant. Updated control to work with Apple's design guidelines with control. Updates made to checkbox and checkboxLabel. 2019-12-12 14:42:32 -05:00
Kevin G Christiano
ed18970625 correcting errors. Improving Control. 2019-12-12 09:23:04 -05:00
Kevin G Christiano
8b5fe4a1f4 more changes. 2019-11-21 15:21:32 -05:00
Suresh, Kamlesh
7b2fc7bfba some more stuff 2019-11-21 11:53:26 -05:00
Kevin G Christiano
88442fe59c latest. 2019-11-21 11:47:12 -05:00
Kevin G Christiano
26c73070d9 latestest and greatest. 2019-11-20 09:12:31 -05:00
Kevin G Christiano
9b581a6132 no line. 2019-11-18 14:30:42 -05:00
Kevin G Christiano
588f801322 Adding Base TextField. More improvements. 2019-11-18 14:18:36 -05:00
Kevin G Christiano
48bcd87bc1 Refactored UI drawing to new class. Reflected change. 2019-11-12 14:29:37 -05:00
Pfeil, Scott Robert
e98a0ce76b update pr comments 2019-10-29 15:23:44 -04:00
Pfeil, Scott Robert
d901ded4c1 open view up! 2019-10-29 13:56:19 -04:00
Pfeil, Scott Robert
0b364fa004 Radio button changes 2019-10-23 11:32:34 -04:00
Pfeil, Scott Robert
7563269680 changes to test 2019-10-23 10:36:32 -04:00