Commit Graph

2935 Commits

Author SHA1 Message Date
Subhankar Acharya
83fde506aa Merge branches 'develop' and 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-05-13 13:25:42 +05:30
Pfeil, Scott Robert
b4407b4a6f Merge branch 'feature/delegate_fix' into 'develop'
delegate fix

See merge request BPHV_MIPS/mvm_core_ui!434
2020-05-12 16:48:38 -04:00
Kevin G Christiano
eb6035b378 delegate fix 2020-05-12 16:47:02 -04:00
Pfeil, Scott Robert
74e4537eef Merge branch 'feature/Headers_H2_Buttons' into 'develop'
Feature/headers h2 buttons

See merge request BPHV_MIPS/mvm_core_ui!427
2020-05-12 13:05:48 -04:00
Pfeil, Scott Robert
7729529a9c efficiency changes 2020-05-12 13:03:17 -04:00
Pfeil, Scott Robert
c9148aabd5 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/Headers_H2_Buttons 2020-05-12 12:47:17 -04:00
Pfeil, Scott Robert
992a6ade1b Merge branch 'feature/revised_accessibility' into 'develop'
Changes made to resolve VO issues

See merge request BPHV_MIPS/mvm_core_ui!390
2020-05-12 12:07:32 -04:00
Kevin G Christiano
b58cfb8aa0 Merge branch 'develop' into feature/revised_accessibility 2020-05-12 10:14:00 -04:00
Pfeil, Scott Robert
8200c94fce Merge branch 'feature/decoder_delegate' into 'develop'
delegate object for model decoding functions

See merge request BPHV_MIPS/mvm_core_ui!431
2020-05-12 09:21:13 -04:00
Lekshmi S
a2a1f95631 Code changes as per review comments. 2020-05-12 18:25:43 +05:30
Lekshmi S
efeb82220c Merge branch 'develop' into feature/Headers_H2_Buttons 2020-05-12 17:06:19 +05:30
Pan, Xinlei (Ryan)
9c643b7cc5 Merge branch 'feature/font_renaming' into 'develop'
Font Declaration Renaming

See merge request BPHV_MIPS/mvm_core_ui!433
2020-05-11 22:23:20 -04:00
Kevin G Christiano
605bcddf08 renamed font declarations to align with modern changes 2020-05-11 16:52:39 -04:00
Pfeil, Scott Robert
111e435466 delegate object for model decoding functions 2020-05-11 16:14:42 -04:00
Subhankar Acharya
efe3e4f190 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into develop 2020-05-11 11:37:21 +05:30
Pfeil, Scott Robert
dfd32f1408 Merge branch 'bugfix/thread_issue' into 'develop'
move backgroud color set to handleNewData

See merge request BPHV_MIPS/mvm_core_ui!429
2020-05-08 17:36:14 -04:00
Suresh, Kamlesh
f06da5e379 move backgroud color set to handleNewData 2020-05-08 17:27:10 -04:00
Kevin G Christiano
3da497dc83 Merge branch 'develop' into feature/revised_accessibility 2020-05-08 16:47:20 -04:00
Lekshmi S
1a3a140aaa Merge branch 'develop' into feature/Headers_H2_Buttons 2020-05-08 12:33:16 +05:30
Kevin G Christiano
c61f669806 text registered for init appearance. more acessiility to caret 2020-05-07 17:11:43 -04:00
Kevin G Christiano
3abe936d7d Merge branch 'develop' into feature/revised_accessibility 2020-05-07 16:38:31 -04:00
Pfeil, Scott Robert
1d2465d345 Merge branch 'bugfix/page_control_visibility' into 'develop'
Correcting layout issue

See merge request BPHV_MIPS/mvm_core_ui!424
2020-05-07 15:49:49 -04:00
Kevin G Christiano
fd3b08bc06 moving action to point of interaction 2020-05-07 15:36:50 -04:00
Pfeil, Scott Robert
1ff0b1bc27 Merge branch 'bugfix/button_inv_fix' into 'develop'
init style for button

See merge request BPHV_MIPS/mvm_core_ui!426
2020-05-07 15:15:20 -04:00
Kevin G Christiano
b8eb6cf3f4 didSet does not work upon init 2020-05-07 15:07:37 -04:00
Kevin G Christiano
ee107a25cf addressing layout issue 2020-05-07 14:51:23 -04:00
Pfeil, Scott Robert
105ed8e320 Merge branch 'bugfix/top_notification' into 'develop'
fixes for notification button

See merge request BPHV_MIPS/mvm_core_ui!425
2020-05-07 14:23:05 -04:00
Pfeil, Scott Robert
770731a639 feedback 2020-05-07 12:43:44 -04:00
Pfeil, Scott Robert
d94543f312 fixes for notification button 2020-05-07 12:11:10 -04:00
Kevin G Christiano
0501c2daae correcting layout issue 2020-05-07 10:38:10 -04:00
Lekshmi S
4346abe378 Minor change. 2020-05-07 16:03:28 +05:30
Lekshmi S
eb5bc41bfc Merge branch 'develop' into feature/Headers_H2_Buttons
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-05-07 13:01:04 +05:30
Pfeil, Scott Robert
38e9141810 Merge branch 'feature/inverted_state' into 'develop'
Inverted Button State

See merge request BPHV_MIPS/mvm_core_ui!418
2020-05-06 16:41:05 -04:00
Kevin G Christiano
e4911a8cce more changes for inverted 2020-05-06 16:31:45 -04:00
Kevin G Christiano
9e9984a8c5 adding check for primary 2020-05-06 15:25:32 -04:00
Kevin G Christiano
1f18436f58 reverting 2020-05-06 15:19:57 -04:00
Kevin G Christiano
cdfd2942ff removeing 2020-05-06 15:12:31 -04:00
Kevin G Christiano
876ec4597d for custom colors 2020-05-06 14:56:13 -04:00
Kevin G Christiano
39f7c4c6f4 reverting border width 2020-05-06 14:41:18 -04:00
Kevin G Christiano
b3ab4fe7f1 Merge branch 'develop' into feature/inverted_state 2020-05-06 14:17:27 -04:00
Kevin G Christiano
e43ad863a4 latest changes with inversion 2020-05-06 14:14:09 -04:00
Pfeil, Scott Robert
cb9af131d5 Merge branch 'bugfix/textview_detritus' into 'develop'
encode fix

See merge request BPHV_MIPS/mvm_core_ui!422
2020-05-06 10:20:53 -04:00
Kevin G Christiano
c141f59685 encode fix 2020-05-06 10:04:39 -04:00
Kevin G Christiano
9ca88678c5 Merge branch 'develop' into feature/revised_accessibility 2020-05-06 08:23:20 -04:00
Kevin G Christiano
313cab70b3 changes for accessibility and formatting 2020-05-05 17:52:01 -04:00
Pfeil, Scott Robert
3e482b0c1a Merge branch 'feature/new_modern_page_control' into 'develop'
Modern page control

See merge request BPHV_MIPS/mvm_core_ui!346
2020-05-05 15:42:44 -04:00
Kevin G Christiano
51b1b9da12 change 2020-05-05 14:52:02 -04:00
Kevin G Christiano
619e11c88c Merge branch 'feature/new_modern_page_control' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/new_modern_page_control 2020-05-05 14:32:24 -04:00
Kevin G Christiano
bcea1d4f25 renaming 2020-05-05 14:31:54 -04:00
Pfeil, Scott Robert
500894c433 Merge branch 'feature/new_modern_page_control' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/new_modern_page_control 2020-05-05 14:27:55 -04:00