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

164 Commits

Author SHA1 Message Date
Christiano, Kevin
f6f2cd2068 Carry over caret fixes. 2019-04-29 16:14:13 -04:00
Christiano, Kevin
8da88c4c87 Moving interaction functionality to label. 2019-04-25 11:41:06 -04:00
Christiano, Kevin
07f8921a4f minor. 2019-04-24 14:32:43 -04:00
Christiano, Kevin
d767890017 Mild fix to caretButton. Fixed dictionary and attributed text issues with Label. 2019-04-24 13:32:13 -04:00
Christiano, Kevin
7d12e70d46 conflict change resolution. 2019-04-23 16:32:04 -04:00
Christiano, Kevin
92c3f22ffe Merge branch 'develop' into feature/kevin 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-23 15:35:25 -04:00
Christiano, Kevin
959d570113 Merge branch 'develop' into feature/delegate_object 
# Conflicts:
#	MVMCoreUI/Atoms/Views/LabelWithInternalButton.swift
 2019-04-23 15:33:48 -04:00
Pan, Xinlei (Ryan)
e3fd47d9e2 Merge branch 'feature/delegate_object' into 'develop' 
LabelWithInternalButton updated with DelegateObject

See merge request BPHV_MIPS/mvm_core_ui!36
 2019-04-23 14:09:17 -04:00
Christiano, Kevin
8ae77df354 Removed labelwithoutaccessibilitytraints. 2019-04-23 13:34:51 -04:00
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
Pfeil, Scott Robert
52f36aa8e8 merge develop 2019-04-19 10:07:57 -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
241ebf2ae8 Merge branch 'develop' into feature/delegate_object 2019-04-18 09:32:44 -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
3084a67822 deprecated code to allow for the DelegateObject paradigm change. 2019-04-16 14:17:02 -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