Christiano, Kevin
|
4e6bd61ae6
|
Merge branch 'develop' into feature/kevin
|
2019-04-23 11:44:36 -04:00 |
|
Christiano, Kevin
|
3d2059754c
|
Unnecessary import. Simplified code. Fixed font optional.
|
2019-04-23 11:20:05 -04:00 |
|
panxi
|
32bd4c9d07
|
bugfix for caretbutton
|
2019-04-19 15:22:54 -04:00 |
|
Christiano, Kevin
|
52d909797e
|
adding further checks for safety.
|
2019-04-18 16:31:11 -04:00 |
|
Christiano, Kevin
|
83dda81d55
|
Removed MFLabel. Reflected delegate paradigm.
|
2019-04-18 10:01:35 -04:00 |
|
Christiano, Kevin
|
17decc6602
|
Merge branch 'develop' into feature/kevin
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/Atoms/Views/MFLabel.h
# MVMCoreUI/Atoms/Views/MFLabel.m
|
2019-04-18 09:32:31 -04:00 |
|
Suresh, Kamlesh
|
53502a40c1
|
merge
|
2019-04-17 10:59:16 -04:00 |
|
Suresh, Kamlesh
|
7aeb76a3c3
|
merge
|
2019-04-16 16:21:02 -04:00 |
|
Suresh, Kamlesh
|
3655b4af8d
|
remove space
|
2019-04-16 15:51:15 -04:00 |
|
Suresh, Kamlesh
|
76506a51b5
|
ONVIK-14895
|
2019-04-16 15:33:34 -04:00 |
|
Christiano, Kevin
|
3a8b6890fa
|
Merge branch 'develop' into feature/kevin
|
2019-04-16 09:15:05 -04:00 |
|
Christiano, Kevin
|
edb2118538
|
comment out for now.
|
2019-04-16 09:14:39 -04:00 |
|
Christiano, Kevin
|
da1f5a5703
|
Converted MFLabel (objc) to Label (Swift). Pulled LabelWithoutAccessibilityTraits from Mobilefirst module and converted it. Altered imports where needed.
|
2019-04-15 16:50:35 -04:00 |
|
Pfeil, Scott Robert
|
2821f7ea09
|
Merge branch 'develop' into feature/delegate_object
|
2019-04-15 16:40:57 -04:00 |
|
Pfeil, Scott Robert
|
e2e6cbabf6
|
textfield delegate object fix
|
2019-04-15 14:39:37 -04:00 |
|
Pfeil, Scott Robert
|
8c19755ba8
|
warning fix
|
2019-04-15 13:31:45 -04:00 |
|
Pfeil, Scott Robert
|
5ebcba15fa
|
molecule delegate object
|
2019-04-15 12:59:27 -04:00 |
|
Pfeil, Scott Robert
|
ad3c0f90b4
|
molecule view changes
|
2019-04-15 11:46:26 -04:00 |
|
Pfeil, Scott Robert
|
aa4da8f74f
|
deprecating
|
2019-04-15 11:14:29 -04:00 |
|
Christiano, Kevin
|
71f1f499e0
|
optional check improvements.
|
2019-04-12 12:23:55 -04:00 |
|
Christiano, Kevin
|
d6fdf9958e
|
Converted MFLabel to Label.
|
2019-04-12 12:12:33 -04:00 |
|
Christiano, Kevin
|
db672f1c21
|
Trimming whitespace to prevent double spaces from occurring.
|
2019-04-12 09:53:30 -04:00 |
|
Christiano, Kevin
|
0a3bd5c834
|
Updated the string analysis of setText to account for scenarios where an HTML tag is passed as a delimiter. Reoriented the design of the tuple.
|
2019-04-11 16:58:53 -04:00 |
|
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
|
9cb836c10e
|
Merge branch 'develop' into feature/template_layout_guide
|
2019-04-10 15:51:10 -04:00 |
|
Pfeil, Scott Robert
|
074efcbf1d
|
layout margins
|
2019-04-10 15:49: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 |
|