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 |
|
Christiano, Kevin
|
9e3e8cc0e5
|
Conversion and atomization of objc MFCaretView to Swift. Removed MFCaretView objc classes. Reflection change in import statements. Added new constants KeyIsOpaque. Provided default init for atoms cis setAsMolecule(). Removed extraneous @objc at class declaration line of DashLine.
|
2019-03-20 13:06:52 -04:00 |
|
Christiano, Kevin
|
93bf4aa393
|
Removed bgcolor property. Relying of default background property of class.
|
2019-03-20 10:20:43 -04:00 |
|
Pfeil, Scott Robert
|
a8145fd3c0
|
objc clean
|
2019-03-20 10:09:56 -04:00 |
|
Pfeil, Scott Robert
|
3040629fcb
|
objc clean
|
2019-03-20 10:07:50 -04:00 |
|
Christiano, Kevin
|
394321bdc4
|
Removing redundant "self". Provided a capture list for closure.
|
2019-03-20 10:03:48 -04:00 |
|
Pfeil, Scott Robert
|
3564d993e1
|
image molecule protocol
|
2019-03-19 17:08:26 -04:00 |
|
Christiano, Kevin
|
64b1b73da1
|
remove accidental line; for testing.
|
2019-03-19 16:16:01 -04:00 |
|
Christiano, Kevin
|
a07ea27b93
|
Merge branch 'develop' into feature/kevin
|
2019-03-19 16:04:36 -04:00 |
|
Christiano, Kevin
|
ffdf287106
|
Setting the module in xib appeared to solve the value issue.
|
2019-03-19 16:03:23 -04:00 |
|
Suresh, Kamlesh
|
809d6ae318
|
Merge branch 'bugfix/load_image_view_size_constraints' into 'develop'
Priorities need to be set before activations.
See merge request BPHV_MIPS/mvm_core_ui!7
|
2019-03-19 15:54:54 -04:00 |
|
Pfeil, Scott Robert
|
680f8fc4aa
|
comment
|
2019-03-19 14:02:29 -04:00 |
|
Pfeil, Scott Robert
|
0a8d76bb7b
|
clean
|
2019-03-19 13:53:16 -04:00 |
|
Pfeil, Scott Robert
|
74ab14f5f9
|
cleaning
|
2019-03-19 13:52:30 -04:00 |
|
Christiano, Kevin
|
17eb09ef42
|
Registered DashLine with Molecule Mapper.
|
2019-03-19 13:29:41 -04:00 |
|
Pfeil, Scott Robert
|
bef105decd
|
gif view to swift
|
2019-03-19 13:13:18 -04:00 |
|