Commit Graph

2563 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
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
Kevin G Christiano
c141f59685 encode fix 2020-05-06 10:04:39 -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
Pfeil, Scott Robert
c6c26874ab add initializer 2020-05-05 14:27:41 -04:00
Kevin G Christiano
1d43a40acb removed duplicate 2020-05-05 14:20:50 -04:00
Kevin G Christiano
257420c3e4 Reforming inversion 2020-05-05 13:44:18 -04:00
Kevin G Christiano
f7ba8da840 enableable stuff 2020-05-05 13:00:26 -04:00
Kevin G Christiano
89499d59ed indicator changes 2020-05-05 12:54:50 -04:00
Kevin G Christiano
4ffd07dd3d beginning rework 2020-05-05 12:43:54 -04:00
Kevin G Christiano
0aad6f3aa7 requested changes and improvements made 2020-05-05 10:41:55 -04:00
Kevin G Christiano
3de0c4865a latest state 2020-05-05 09:01:38 -04:00
Kevin G Christiano
8b05b20f51 latest state 2020-05-05 09:00:47 -04:00
Kevin G Christiano
3347f4a0af accessibility changes 2020-05-04 15:02:17 -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
f4fae9255b Merge branch 'feature/new_modern_page_control' of gitlab.verizon.com:BPHV_MIPS/mvm_core_ui into feature/new_modern_page_control 2020-05-04 08:55:28 -04:00
Kevin G Christiano
be31eb37bb changes made for ticket 2020-05-04 08:55:10 -04:00
Kevin G Christiano
7e701cf4a1 Merge branch 'develop' into feature/new_modern_page_control 2020-05-04 08:54:23 -04:00
Kevin G Christiano
49f3584a47 revised 2020-05-01 17:12:09 -04:00
Kevin G Christiano
c7e3fd189a accessibility revision for numeric. 2020-05-01 16:56:21 -04:00
Kevin G Christiano
c8155a57db resolving gitlab 2020-05-01 16:47:45 -04:00
Kevin G Christiano
43778c537a current developemnt 2020-05-01 14:14:01 -04:00
Pfeil, Scott Robert
54e1a6f9db Merge branch 'feature/image_border' into 'develop'
Feature/image border

See merge request BPHV_MIPS/mvm_core_ui!399
2020-05-01 13:51:59 -04:00
Kevin G Christiano
f7d21e9a23 bug fix when checking array 2020-05-01 11:26:35 -04:00
Kevin G Christiano
35531a2f9b merging 2020-04-30 15:53:20 -04:00
Kevin G Christiano
cbcb1c37c0 bringing borderwidth in. 2020-04-30 15:48:30 -04:00
Kevin G Christiano
2f6fa19233 adding border width 2020-04-30 14:40:33 -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
Chintakrinda, Arun Kumar (Arun)
77cfaf091a Merge branch 'develop' 2020-04-30 20:28:59 +05:30
Chintakrinda, Arun Kumar (Arun)
7d542c7221 Merge branch 'develop' 2020-04-30 20:17:48 +05:30
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