mbrucedogs/mvm_core_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
175 Commits 64 Branches 0 Tags 46 MiB
baa0f3d3f7
Commit Graph

175 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christiano, Kevin
baa0f3d3f7 Fixed how NSMutableAttribute is used. 2019-04-04 13:39:59 -04:00
Christiano, Kevin
14d66d1fc6 only used internally 2019-04-04 13:18:06 -04:00
Christiano, Kevin
46d41125c8 Merge branch 'develop' into feature/kevin 2019-04-04 09:30:32 -04:00
Christiano, Kevin
c78482bad3 added @class. 2019-04-04 09:29:54 -04:00
Christiano, Kevin
4477647658 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Buttons/CaretButton.swift
 2019-04-03 13:33:34 -04:00
Pfeil, Scott Robert
1c33ba0c09 Merge branch 'feature/atomization_ke' into 'develop' 
Fixed setWithJSON, allows it to work properly with Atom molecule.

See merge request BPHV_MIPS/mvm_core_ui!19
 2019-04-03 13:29:22 -04:00
Christiano, Kevin
00feea9a58 Added default text color for enabled and disabled states. 2019-04-03 12:09:17 -04:00
Christiano, Kevin
39edb4c055 changes actionMap to json. 2019-04-03 09:44:47 -04:00
Christiano, Kevin
cad3555156 Removed unnecessary setTitle call. 2019-04-03 09:40:03 -04:00
Christiano, Kevin
dd407f45f9 changes made. Reduced access to caret dimensions. 2019-04-01 16:44:33 -04:00
Christiano, Kevin
bd69d9fb89 mild changes. 2019-04-01 14:10:47 -04:00
Christiano, Kevin
499f9eb55d Fixed setWithJSON, allows it to work properly with Atom molecule. Provided more properties to control. 2019-04-01 13:30:31 -04:00
Christiano, Kevin
16c644e12d Removed super call for setWithJSON. Provided more functionality for atom steup. 2019-04-01 13:28:15 -04:00
Christiano, Kevin
c5233a680d Further swapping of didSet/willSet. 2019-04-01 11:44:25 -04:00
Christiano, Kevin
f68c355527 name issue came from property observers. NewValue only appears in willSet, not didSet. 2019-04-01 10:08:11 -04:00
Christiano, Kevin
27127aacfb WIP. Issues from language paradigms. Further work to resolve. 2019-03-31 21:08:11 -04:00
Christiano, Kevin
c791d78671 Working with ranges. Overall improvement of swift code. 2019-03-29 16:37:51 -04:00
Christiano, Kevin
00ebbc5b70 Merge branch 'develop' into feature/kevin 2019-03-29 10:02:41 -04:00
Christiano, Kevin
abe80a1ce3 Converted LabelWithInternalButton.h/m to LabelWithInternalButton.swift. Removed LabelWithInternalButton.h/m. Changes reflected in project file. 2019-03-29 10:00:35 -04:00
Pfeil, Scott Robert
de0c031b7f Merge branch 'feature/kevin' into 'develop' 
Removed a comma at the end

See merge request BPHV_MIPS/mvm_core_ui!18
 2019-03-29 09:03:59 -04:00
Christiano, Kevin
814f2e1386 Removed a comma at the end 2019-03-29 08:54:36 -04:00
Pfeil, Scott Robert
0c172ebeb8 Merge branch 'feature/kevin' into 'develop' 
Feature/kevin

See merge request BPHV_MIPS/mvm_core_ui!9
 2019-03-29 08:53:14 -04:00
Christiano, Kevin
5083fb7c88 molecule map change. 2019-03-29 08:52:22 -04:00
Christiano, Kevin
f12f9b17f7 Removed dash line from molecule map. 2019-03-29 08:51:37 -04:00
Christiano, Kevin
ef1e43f6c2 Merge branch 'develop' into feature/kevin 2019-03-28 13:21:41 -04:00
Suresh, Kamlesh
1d6293a0d5 Merge branch 'feature/html_label' into 'develop' 
html string

See merge request BPHV_MIPS/mvm_core_ui!15
 2019-03-27 11:30:34 -04:00
Christiano, Kevin
f903e4ee60 Removed Line. Changed comment. 2019-03-27 11:17:05 -04:00
Christiano, Kevin
42e482d727 Returned addCaretImageView() to the golden path. 2019-03-27 10:46:26 -04:00
Pfeil, Scott Robert
ae4512abff html string 2019-03-27 10:13:51 -04:00
Christiano, Kevin
f154befabf Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/OtherHandlers/MVMCoreUIMoleculeMappingObject.m
 2019-03-26 16:43:47 -04:00
Christiano, Kevin
6f77c64e16 Improvements made. 2019-03-26 16:40:23 -04:00
Pfeil, Scott Robert
4dea8a784f Merge branch 'feature/swifty_buttons' into 'develop' 
Feature/swifty buttons

See merge request BPHV_MIPS/mvm_core_ui!13
 2019-03-26 11:24:58 -04:00
Pfeil, Scott Robert
bc5e4b311b un nonnulla 2019-03-25 17:32:24 -04:00
Pfeil, Scott Robert
623b1590ee delete unused 2019-03-25 17:11:31 -04:00
Pfeil, Scott Robert
aab0fbc083 non null 2019-03-25 17:07:02 -04:00
Pfeil, Scott Robert
f63b157c16 Fixes to make two button more compatible with legacy 2019-03-25 16:51:51 -04:00
Christiano, Kevin
45467c9e3f Merge branch 'develop' into feature/kevin 2019-03-25 13:15:36 -04:00
Pfeil, Scott Robert
b25b869c4d fix to size check 2019-03-25 12:59:07 -04:00
Pfeil, Scott Robert
b7556fdce9 merge 2019-03-25 09:57:47 -04:00
Pfeil, Scott Robert
b61b6959ca Merge branch 'develop' into feature/load_image_swift 2019-03-25 09:53:46 -04:00
Pfeil, Scott Robert
a2ab8c6571 swifty buttons 2019-03-25 09:37:54 -04:00
Suresh, Kamlesh
7920f8f550 Merge branch 'bugfix/nib_crash' into 'develop' 
Fix mfloadimageView to swift crash

See merge request BPHV_MIPS/mvm_core_ui!12
 2019-03-22 12:31:02 -04:00
Pfeil, Scott Robert
7341e6930c Fix mfloadimageView to swift crash 2019-03-22 12:06:24 -04:00
Christiano, Kevin
a4bb00d1ae Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2019-03-21 16:11:26 -04:00
Christiano, Kevin
b592ff5047 Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
 2019-03-21 15:47:49 -04:00
Christiano, Kevin
d8fedf4d8b placing CaretButton in molecule map. 2019-03-21 14:58:22 -04:00
Suresh, Kamlesh
103f465cc8 Merge branch 'feature/load_image_swift' into 'develop' 
Feature/load image swift

See merge request BPHV_MIPS/mvm_core_ui!8
 2019-03-21 14:46:44 -04:00
Christiano, Kevin
c7bcd6e03d Converted and atomized CaretButton. Removed old objc files of MFCaretButton. Reflected import changes where necessary. 2019-03-21 14:39:25 -04:00
Pfeil, Scott Robert
12faad3d0d merge 2019-03-21 14:17:18 -04:00
Pfeil, Scott Robert
c411ec83ee Button defaulting 2019-03-20 14:42:20 -04:00