Commit Graph

204 Commits

Author SHA1 Message Date
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
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
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
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
3de0c4865a latest state 2020-05-05 09:01:38 -04:00
Kevin G Christiano
3fbf135faa correcting a spacing issue 2020-05-04 12:26:09 -04:00
Kevin G Christiano
0268767554 Merge branch 'develop' into feature/inverted_state 2020-05-04 09:50:12 -04:00
Kevin G Christiano
43778c537a current developemnt 2020-05-01 14:14:01 -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
fb170485c1 Merge branch 'bugfix/leftvariable_icon_rightcaret' into 'develop'
bug fix for image distortion in List - Left Variable - Icon - With Right caret molecule.

See merge request BPHV_MIPS/mvm_core_ui!415
2020-04-30 13:38:15 -04:00
Pfeil, Scott Robert
5e0d26fe94 minor cleanup 2020-04-30 13:00:24 -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
Kruthika KP
4d212d9c05 change in alignment 2020-04-30 18:47:30 +05:30
Kruthika KP
bc4aa2c987 bug fix for image distortion in List - Left Variable - Icon - With Right caret molecule.
adding image properties
2020-04-30 17:54:51 +05:30
Kruthika KP
c0842d7740 minor changes 2020-04-30 17:47:17 +05:30
Pfeil, Scott Robert
c0b87e710f update after merge 2020-04-29 19:14:49 -04:00
Pfeil, Scott Robert
8cc67991ed merge 2020-04-29 19:14:09 -04:00
Pfeil, Scott Robert
c743daaaa5 Image fixes
Two link fixes
2020-04-29 19:09:29 -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
Lekshmi S
07e5005657 Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-29 19:12:12 +05:30
Pfeil, Scott Robert
4020ffa86c merge fix 2020-04-28 18:16:02 -04:00
Pfeil, Scott Robert
6b1d065263 merge 2020-04-28 18:15:42 -04:00
Kevin G Christiano
52e54c185c commenting 2020-04-28 14:21:00 -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
b850bb844c open 2020-04-28 11:16:51 -04:00
Pfeil, Scott Robert
587b3bb6f3 BGImage 2020-04-28 11:08:44 -04:00
Lekshmi S
5ed386c883 code cleanup 2020-04-28 18:26:48 +05:30
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
372d5c9098 Code cleanup 2020-04-28 14:07:18 +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
3b23101710 update tabs model 2020-04-27 15:22:40 -04:00
Xinlei(Ryan) Pan
320976e5ae weak delegate 2020-04-27 14:09:37 -04:00
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