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 |
|
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 |
|
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
|
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 |
|
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
|
499f9eb55d
|
Fixed setWithJSON, allows it to work properly with Atom molecule. Provided more properties to control.
|
2019-04-01 13:30:31 -04:00 |
|
panxi
|
560ea1030d
|
add actions into mflabel
|
2019-04-01 12:01:44 -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 |
|
panxi
|
b43690d10e
|
clean up some fonts method
|
2019-03-28 11:19:18 -04:00 |
|
panxi
|
6ee6170031
|
remove feedsubmessage
|
2019-03-28 10:43:09 -04:00 |
|
panxi
|
3cc9750333
|
remove 1.0 fonts
|
2019-03-28 10:39:02 -04:00 |
|
panxi
|
5fa9bd1572
|
remove SubheadBold and SubheadBoldlarge
|
2019-03-27 17:40:37 -04:00 |
|
panxi
|
ca1c77bc10
|
remove plan card title
|
2019-03-27 17:13:20 -04:00 |
|
panxi
|
883c4b6ea2
|
remove headlineblack
|
2019-03-27 17:02:17 -04:00 |
|
panxi
|
6c7e745358
|
remove HeadlineExtraLarge
|
2019-03-27 16:57:13 -04:00 |
|
panxi
|
23f75ab2cc
|
remove BodyLighter font and label
|
2019-03-27 16:52:14 -04:00 |
|
panxi
|
4240b6a2f4
|
change body bold to b1
|
2019-03-27 16:35:55 -04:00 |
|
panxi
|
124069c0be
|
change body bold to b1
|
2019-03-27 15:59:28 -04:00 |
|
Suresh, Kamlesh
|
720c97efb9
|
merge
|
2019-03-27 11:42:06 -04:00 |
|
Christiano, Kevin
|
f903e4ee60
|
Removed Line. Changed comment.
|
2019-03-27 11:17:05 -04:00 |
|
Suresh, Kamlesh
|
629736b7fc
|
swifting
|
2019-03-27 11:16:58 -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 |
|
Suresh, Kamlesh
|
69309cf3b1
|
molecule testfields
|
2019-03-26 13:51:33 -04:00 |
|
Pfeil, Scott Robert
|
bc5e4b311b
|
un nonnulla
|
2019-03-25 17:32:24 -04:00 |
|
Pfeil, Scott Robert
|
aab0fbc083
|
non null
|
2019-03-25 17:07:02 -04:00 |
|
Christiano, Kevin
|
45467c9e3f
|
Merge branch 'develop' into feature/kevin
|
2019-03-25 13:15:36 -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 |
|
Pfeil, Scott Robert
|
7341e6930c
|
Fix mfloadimageView to swift crash
|
2019-03-22 12:06:24 -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
|
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
|
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 |
|