Kevin G Christiano
4352d97d94
Merge branch 'develop' into feature/new_take_textview
2020-05-12 17:07:00 -04:00
Lekshmi S
a2a1f95631
Code changes as per review comments.
2020-05-12 18:25:43 +05:30
Kevin G Christiano
7f6bcfc712
generall stable
2020-05-08 11:15:50 -04:00
Kevin G Christiano
fcca1e3e83
beginning stages of change
2020-05-07 13:01:04 -04:00
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
Kevin G Christiano
b3ab4fe7f1
Merge branch 'develop' into feature/inverted_state
2020-05-06 14:17:27 -04:00
Kevin G Christiano
4ffd07dd3d
beginning rework
2020-05-05 12:43:54 -04:00
Kevin G Christiano
0268767554
Merge branch 'develop' into feature/inverted_state
2020-05-04 09:50:12 -04:00
Kevin G Christiano
c8155a57db
resolving gitlab
2020-05-01 16:47:45 -04:00
Kevin G Christiano
35531a2f9b
merging
2020-04-30 15:53:20 -04:00
Kevin G Christiano
80b9f985b1
latest updated for color inversion
2020-04-30 14:26:25 -04:00
Pfeil, Scott Robert
0ab732a4f5
merge develop
2020-04-30 12:48:47 -04:00
Pfeil, Scott Robert
ffab78a05e
minor clean
2020-04-30 12:27:51 -04:00
Pfeil, Scott Robert
4d12820bc8
merge develop
2020-04-30 11:52:30 -04:00
Lekshmi S
3422ee00fd
Merge branch 'develop' into feature/HeadersH2TinyButton
2020-04-30 18:58:58 +05:30
Kruthika KP
bd1ccb251c
Merge branch 'develop' into feature/list_twocolumn_dropdownselectors
...
* develop: (41 commits)
Image fixes Two link fixes
Two Link
delegateing
using new toolbar
enode
additional check
altered isEditable to editable to align with android
latest state of text view
removing Line model change.
Implemented Scott feedback
managing hidden border
further developmet of textView.
little fixes and delegate updates.
reverting set method super call in Line.
remove extra registry
functioning border
revised how fields clear themselves
aligning with android changes
updating to align with android. changing super.
three layer fill
...
2020-04-30 18:49:16 +05:30
Pfeil, Scott Robert
8cc67991ed
merge
2020-04-29 19:14:09 -04:00
Pfeil, Scott Robert
44a6f2d867
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/list_device_complex_buttonSmall
2020-04-29 18:40:22 -04:00
Pfeil, Scott Robert
ea67a6f5d0
Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/move_legacy
2020-04-29 18:39:06 -04:00
Pfeil, Scott Robert
0f215abc4a
Two Link
2020-04-29 18:23:10 -04:00
Pfeil, Scott Robert
775fdda762
merge
2020-04-29 16:12:31 -04:00
Pfeil, Scott Robert
13ab89e33e
fix local target membership
2020-04-29 09:46:45 -04:00
Lekshmi S
07e5005657
Merge branch 'develop' into feature/HeadersH2TinyButton
2020-04-29 19:12:12 +05:30
Pfeil, Scott Robert
6b1d065263
merge
2020-04-28 18:15:42 -04:00
Kevin G Christiano
077d94edd1
merging
2020-04-28 14:53:59 -04:00
Kevin G Christiano
05d8ff0ba6
Merge branch 'develop' into feature/new_modern_page_control
2020-04-28 14:16:37 -04:00
Pfeil, Scott Robert
9a2b6405d0
Merge branch 'feature/bg_image_container' into 'develop'
...
BGImage
See merge request BPHV_MIPS/mvm_core_ui!413
2020-04-28 14:00:52 -04:00
Pfeil, Scott Robert
8a8bc84f99
three layer fill
2020-04-28 13:04:13 -04:00
Pfeil, Scott Robert
7da3898ced
Merge branch 'develop' into feature/text_view_atom
2020-04-28 11:26:21 -04:00
Pfeil, Scott Robert
587b3bb6f3
BGImage
2020-04-28 11:08:44 -04:00
Kruthika KP
9a5ef15779
Merge branch 'develop' into feature/list_twocolumn_dropdownselectors
...
* develop: (32 commits)
update acc before do animation
update tabs model
weak delegate
update legacy font
revised
remove space
add convenience inits.
updates and revision
adding accessibility state to radio button
Removed extra line.
19121(iOS - List - Device - Complex - Link - Small) story commit
Minor changes
Code cleanup and realigned file structure.
container protocol updates and container model
fix sizing defect
use convenience function
update collection for sizing properly
three layer fixes
remove safe area for now until i can find consistency with contentView
New TableView base
...
2020-04-28 17:45:17 +05:30
Kruthika KP
918065300e
19012 - List Two Column Dropdown Selectors - Initial commit
2020-04-28 16:06:44 +05:30
Lekshmi S
675ff41dce
Merge branch 'develop' into feature/HeadersH2TinyButton
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
# MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-28 12:16:55 +05:30
Lekshmi S
91a5b3d36c
Merge branch 'develop' into feature/Headers_H2_Buttons
...
# Conflicts:
# MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-28 12:13:54 +05:30
Damodaram
78918ecf80
Merge branch 'develop' into feature/list_device_complex_buttonSmall
...
* develop:
update acc before do animation
update tabs model
weak delegate
update legacy font
revised
updates and revision
adding accessibility state to radio button
add new tabs
2020-04-28 11:09:29 +05:30
Xinlei(Ryan) Pan
a1ca758c1b
Merge branch 'develop' into feature/tabsmodel
2020-04-27 13:34:39 -04:00
Pfeil, Scott Robert
ddb1362ee0
updates after merge
2020-04-27 13:27:02 -04:00
Pfeil, Scott Robert
f63b0c9b80
merge
2020-04-27 13:05:28 -04:00
Kevin G Christiano
00d196c0db
Merge branch 'develop' into feature/new_modern_page_control
2020-04-27 09:13:20 -04:00
Damodaram
d4141e1777
Merge branch 'develop' into feature/list_device_complex_buttonSmall
2020-04-27 09:52:12 +05:30
Pfeil, Scott Robert
439a97c5d6
merge
2020-04-24 16:02:21 -04:00
Pfeil, Scott Robert
c0f1aac91c
Merge branch 'feature/list_device_complex_link_small' into 'develop'
...
Feature/list device complex link small
See merge request BPHV_MIPS/mvm_core_ui!407
2020-04-24 15:53:42 -04:00
Lekshmi S
283524d72b
19121(iOS - List - Device - Complex - Link - Small) story commit
2020-04-24 16:47:42 +05:30
Lekshmi S
0f4c11e2f2
Code cleanup and realigned file structure.
2020-04-24 12:40:11 +05:30
Lekshmi S
e34e859aa1
Merge branch 'develop' into feature/list_device_complex_link_medium
...
# Conflicts:
# MVMCoreUI.xcodeproj/project.pbxproj
2020-04-24 12:08:32 +05:30
Damodaram
ad6f14c974
ListDeviceComplexButtonSmall Molecule implemented
2020-04-24 10:40:33 +05:30
Kevin G Christiano
75c47d0692
merging
2020-04-23 13:17:36 -04:00
Kevin G Christiano
9503f109f9
merging
2020-04-23 13:15:36 -04:00
Pfeil, Scott Robert
f7406c0bf9
Merge branch 'develop' into feature/template_and_navigation
2020-04-23 12:59:50 -04:00
Pfeil, Scott Robert
ee1d847a41
minor
2020-04-23 11:43:55 -04:00