Commit Graph

251 Commits

Author SHA1 Message Date
Suresh, Kamlesh
5deab1b869 Merge branch 'develop' into feature/molecule_radio_button 2019-04-17 11:43:56 -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
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
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
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
Suresh, Kamlesh
02efde760d Merge branch 'feature/template_layout_guide' into 'develop'
Feature/template layout guide

See merge request BPHV_MIPS/mvm_core_ui!27
2019-04-10 16:35:43 -04:00
Pfeil, Scott Robert
56ed225564 Merge branch 'bugfix/button_delegate' into 'develop'
button_delegate

See merge request BPHV_MIPS/mvm_core_ui!28
2019-04-10 16:27:25 -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
Pfeil, Scott Robert
ba7011d39a Merge branch 'feature/kevin' into 'develop'
Converted LabelWithInternalButton

See merge request BPHV_MIPS/mvm_core_ui!22
2019-04-10 15:35:41 -04:00
Suresh, Kamlesh
b1869730f5 button_delegate 2019-04-10 12:43:39 -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
6114bbbf92 changed the protocol type. 2019-04-09 14:43:06 -04:00
Suresh, Kamlesh
4b02477592 merge 2019-04-09 14:33:41 -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
741785cc22 secondary default as white for the feed 2019-04-09 13:46:28 -04:00
Christiano, Kevin
5be26ebaa4 Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-09 13:35:25 -04:00
Suresh, Kamlesh
fb61d4664d Merge branch 'feature/loader_accessibilityID' into 'develop'
adding "Loader" as accessibility id

See merge request BPHV_MIPS/mvm_core_ui!25
2019-04-09 11:20:04 -04:00
Pfeil, Scott Robert
3ee784ccb0 Changes for new feed template 2019-04-09 10:38:26 -04:00
Ajai Prabhu G S
e3670a4977 adding "Loader" as accessibility id 2019-04-09 15:34:09 +05:30
Suresh, Kamlesh
b04a35875b Merge branch 'feature/moving_radio_button' into 'develop'
moving_radio_button

See merge request BPHV_MIPS/mvm_core_ui!24
2019-04-08 16:53:37 -04:00
Christiano, Kevin
fffc9c3932 Merge branch 'develop' into feature/kevin 2019-04-07 20:19:15 -04:00
Christiano, Kevin
d8978910bc Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-07 20:19:06 -04:00
Suresh, Kamlesh
b3138e7508 Merge branch 'feature/swift_5' into 'develop'
swift5

See merge request BPHV_MIPS/mvm_core_ui!20
2019-04-05 17:27:01 -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
Christiano, Kevin
91c6a11bbf Merge branch 'develop' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into develop 2019-04-04 14:00:47 -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
Suresh, Kamlesh
63aa52da39 new group 2019-04-04 13:45:18 -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
Suresh, Kamlesh
ba3dec3043 comments 2019-04-04 11:51:45 -04:00
Pfeil, Scott Robert
8d3a6852cd remove extra block 2019-04-04 10:15:01 -04:00
Pfeil, Scott Robert
df67ded57b small formatting fixes 2019-04-04 09:47:45 -04:00
Christiano, Kevin
46d41125c8 Merge branch 'develop' into feature/kevin 2019-04-04 09:30:32 -04:00
Christiano, Kevin
c78482bad3 added @class. 2019-04-04 09:29:54 -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