Christiano, Kevin
|
1b1c35873a
|
development of Label conversion. wip.
|
2019-04-11 14:25:34 -04:00 |
|
Christiano, Kevin
|
0e5582beed
|
Removing enum. won't bridge to objc correctly.
|
2019-04-10 16:33:47 -04:00 |
|
Christiano, Kevin
|
b88052ed9b
|
Merge branch 'develop' into feature/label_conversion
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
|
2019-04-10 16:19:07 -04:00 |
|
Pfeil, Scott Robert
|
75093ca764
|
Merge branch 'feature/feed_two_button' into 'develop'
Changes for new feed template
See merge request BPHV_MIPS/mvm_core_ui!26
|
2019-04-10 15:46:25 -04:00 |
|
Christiano, Kevin
|
d0bc96e3a5
|
Corrections made.
|
2019-04-10 12:12:44 -04:00 |
|
Christiano, Kevin
|
503bbc4605
|
removed redundant check.
|
2019-04-10 10:06:53 -04:00 |
|
Christiano, Kevin
|
39ce8af7ab
|
further work on conversion.
|
2019-04-09 15:18:14 -04:00 |
|
Christiano, Kevin
|
2827cffd1f
|
Merge branch 'develop' into feature/label_conversion
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
|
2019-04-09 14:45:55 -04:00 |
|
Christiano, Kevin
|
6114bbbf92
|
changed the protocol type.
|
2019-04-09 14:43:06 -04:00 |
|
Christiano, Kevin
|
6ec133d3c9
|
Merge branch 'develop' into feature/kevin
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
|
2019-04-09 13:53:48 -04:00 |
|
Pfeil, Scott Robert
|
3ee784ccb0
|
Changes for new feed template
|
2019-04-09 10:38:26 -04:00 |
|
Christiano, Kevin
|
edde99cc23
|
Changes made to satisfy update to MFLabel.
|
2019-04-07 20:18:40 -04:00 |
|
Christiano, Kevin
|
ac0e200321
|
Merge branch 'develop' into feature/label_conversion
|
2019-04-05 16:45:04 -04:00 |
|
Suresh, Kamlesh
|
5d46f8c0d4
|
moving_radio_button
|
2019-04-04 18:03:14 -04:00 |
|
Christiano, Kevin
|
5b1520bc44
|
Merge branch 'develop' into feature/kevin
|
2019-04-04 14:00:53 -04:00 |
|
Pfeil, Scott Robert
|
62fe21a9d3
|
Merge branch 'feature/label' into 'develop'
Feature/label
See merge request BPHV_MIPS/mvm_core_ui!17
|
2019-04-04 13:57:26 -04:00 |
|
Jackson, Jermaine
|
e61ef45913
|
Merge branch 'feature/molecule_testfields' into 'develop'
Feature/molecule testfields
See merge request BPHV_MIPS/mvm_core_ui!16
|
2019-04-04 13:52:20 -04:00 |
|
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 |
|
Pfeil, Scott Robert
|
df67ded57b
|
small formatting fixes
|
2019-04-04 09:47:45 -04:00 |
|
panxi
|
30fe1c6a08
|
remove import for actions in mflabel
|
2019-04-04 08:26:58 -04:00 |
|
Suresh, Kamlesh
|
63f02a0c7c
|
code review
|
2019-04-03 17:05:21 -04:00 |
|
panxi
|
4e328eeb83
|
update label and styler
|
2019-04-03 15:46:06 -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 |
|
Christiano, Kevin
|
ce68eafd34
|
stopping for now.
|
2019-04-03 13:31:29 -04:00 |
|
panxi
|
7d7284bd8d
|
remove actions from mflabel
|
2019-04-03 12:21:31 -04:00 |
|
Christiano, Kevin
|
00feea9a58
|
Added default text color for enabled and disabled states.
|
2019-04-03 12:09:17 -04:00 |
|
Christiano, Kevin
|
08dc333568
|
Further work on conversion.
|
2019-04-03 11:14:13 -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
|
656652b962
|
Conversion of MFLabel to Label. WIP.
|
2019-04-03 09:35:26 -04:00 |
|
Suresh, Kamlesh
|
d0ac49663a
|
space
|
2019-04-02 17:21:56 -04:00 |
|
Suresh, Kamlesh
|
8b3d561543
|
code review
|
2019-04-02 17:16:22 -04:00 |
|
Suresh, Kamlesh
|
ff3055a4c7
|
improvement
|
2019-04-02 15:55:16 -04:00 |
|
Suresh, Kamlesh
|
5df8ad42f3
|
merge
|
2019-04-01 18:01:42 -04:00 |
|
Christiano, Kevin
|
dd407f45f9
|
changes made. Reduced access to caret dimensions.
|
2019-04-01 16:44:33 -04:00 |
|
panxi
|
1baa755cae
|
change font to B20 form feed message
|
2019-04-01 15:05:42 -04:00 |
|
panxi
|
b70f27f67a
|
change feed headline to H32
|
2019-04-01 14:53:29 -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 |
|
panxi
|
560ea1030d
|
add actions into mflabel
|
2019-04-01 12:01:44 -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
|
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 |
|
panxi
|
8e0671f9bc
|
Merge branch 'develop' into feature/label
|
2019-03-29 09:45:22 -04:00 |
|
Christiano, Kevin
|
ef1e43f6c2
|
Merge branch 'develop' into feature/kevin
|
2019-03-28 13:21:41 -04:00 |
|
panxi
|
0db36c1405
|
reduce fonts
|
2019-03-28 12:01:57 -04:00 |
|