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

300 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Suresh, Kamlesh
1bd9adebf9 Merge branch 'bugfix/caretview' into 'develop' 
bugfix for caretbutton

See merge request BPHV_MIPS/mvm_core_ui!40
 2019-04-19 15:27:21 -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
Pfeil, Scott Robert
a45fd12da5 Merge branch 'bugfix/labelWithInternalButton' into 'develop' 
Adding further checks for safety.

See merge request BPHV_MIPS/mvm_core_ui!39
 2019-04-19 08:27:35 -04:00
Pfeil, Scott Robert
9865f168c0 Merge branch 'feature/fill' into 'develop' 
fill back

See merge request BPHV_MIPS/mvm_core_ui!32
 2019-04-19 08:20:12 -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
Pfeil, Scott Robert
c0d4e553d0 Merge branch 'feature/statusstyle' into 'develop' 
add override status bar function

See merge request BPHV_MIPS/mvm_core_ui!31
 2019-04-17 15:30:05 -04:00
panxi
e59adf7e47 change order of code 2019-04-17 15:20:56 -04:00
panxi
575721589a add missing style 2019-04-17 15:13:54 -04:00
panxi
786d517517 update comments 2019-04-17 15:08:18 -04:00
Pan, Xinlei (Ryan)
11f3d6dcab Merge branch 'feature/up_2_0' into 'develop' 
Makes a property public to allow for adding padding to the button accessory view

See merge request BPHV_MIPS/mvm_core_ui!35
 2019-04-17 13:48:33 -04:00
Robinson, Blake
f35b31b5b3 Makes a property public to allow for adding padding to the button accessory view 2019-04-17 13:45:20 -04:00
Pfeil, Scott Robert
053d0d06d6 Merge branch 'bugfix/onvik_14895' into 'develop' 
ONVIK-14895

See merge request BPHV_MIPS/mvm_core_ui!34
 2019-04-17 13:24:55 -04:00
panxi
935b32ed6d update status bar for presented view controller 2019-04-17 12:37:02 -04:00
panxi
a254e7d882 only change the status bar background color 2019-04-17 11:17:44 -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
panxi
c1fe2c617d Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/statusstyle 2019-04-16 14:49:45 -04:00
panxi
1b5d423659 remove local default status bar style 2019-04-16 14:49:24 -04:00
Christiano, Kevin
2a479170fa Merge branch 'feature/delegate_object' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/delegate_object 2019-04-16 14:17:12 -04:00
Christiano, Kevin
3084a67822 deprecated code to allow for the DelegateObject paradigm change. 2019-04-16 14:17:02 -04:00
Pfeil, Scott Robert
bd62fc14ce fill back 2019-04-16 14:02:20 -04:00
panxi
89427b1b7a update code based on comments 2019-04-16 11:46:53 -04:00
Pfeil, Scott Robert
48c7a842bc Merge branch 'feature/delegate_object' into 'develop' 
delegate object and simple deprecation

See merge request BPHV_MIPS/mvm_core_ui!30
 2019-04-16 10:55: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
7343f24e9b missed super 2019-04-15 15:09:25 -04:00
panxi
9278ad75ea add override status bar function 2019-04-15 14:50:45 -04:00
Pfeil, Scott Robert
e2e6cbabf6 textfield delegate object fix 2019-04-15 14:39:37 -04:00
Pfeil, Scott Robert
01c5abc027 warning fix 2019-04-15 13:47:19 -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
Pfeil, Scott Robert
67ac36383b Merge branch 'bugfix/labelWithInternalButton' into 'develop' 
Bugfix/label with internal button

See merge request BPHV_MIPS/mvm_core_ui!29
 2019-04-15 10:58:22 -04:00
Pfeil, Scott Robert
f1d80adf57 delegate object and simple deprecation 2019-04-12 15:32:43 -04:00