Commit Graph

2485 Commits

Author SHA1 Message Date
Lekshmi S
fdd22f10e3 Merge branch 'develop' into feature/radio_swatches 2020-04-17 11:26:03 +05:30
Pfeil, Scott Robert
30316aeaa7 Merge branch 'feature/radioBoxes_updates' into 'develop'
feature/radioBoxes_updates

See merge request BPHV_MIPS/mvm_core_ui!386
2020-04-16 13:51:28 -04:00
Pfeil, Scott Robert
af28134d90 final clean 2020-04-16 13:49:52 -04:00
Pfeil, Scott Robert
ca0f527c7b Code cleanup 2020-04-16 13:46:25 -04:00
Damodaram
c830c388de model keys Updated 2020-04-16 16:06:04 +05:30
Damodaram
e4dc439d1c updated Code as per confluence page color changes 2020-04-16 15:45:24 +05:30
Lekshmi S
e1894bd74b moved function, clean code 2020-04-16 11:26:56 +05:30
Lekshmi S
21a214ca89 Merge branch 'develop' into feature/radio_swatches 2020-04-16 11:16:56 +05:30
Pfeil, Scott Robert
5e9d24f15c Merge branch 'bugfix/buton_group' into 'develop'
button will set groupname only when  validation is required

See merge request BPHV_MIPS/mvm_core_ui!382
2020-04-15 19:05:25 -04:00
Suresh, Kamlesh
14b1e66ffe button will set groupname only when validation is required 2020-04-15 18:20:04 -04:00
Pan, Xinlei (Ryan)
935ec8df11 Merge branch 'release/7_6_0' into 'develop'
Release/7 6 0

See merge request BPHV_MIPS/mvm_core_ui!381
2020-04-15 13:24:31 -04:00
Pfeil, Scott Robert
20b6d4d272 Merge branch 'bugfix/radiobox_issues' into 'release/7_6_0'
bugfix/radiobox_issues

See merge request BPHV_MIPS/mvm_core_ui!374
2020-04-15 13:02:23 -04:00
Pfeil, Scott Robert
5ca03674c2 clean color code, move function 2020-04-15 12:59:57 -04:00
Pfeil, Scott Robert
38b9f38b2e Merge branch 'develop' into 'release/7_6_0'
Develop

See merge request BPHV_MIPS/mvm_core_ui!379
2020-04-15 11:07:40 -04:00
Suresh, Kamlesh Jain
f11f3f066c Merge branch 'bugfix/atomic_nav_bar' into 'develop'
hot fix

See merge request BPHV_MIPS/mvm_core_ui!378
2020-04-15 10:42:48 -04:00
Pfeil, Scott Robert
2d489e1ef4 hot fix 2020-04-15 10:38:55 -04:00
Damodaram
7b3e22826c number of columns per row updated 2020-04-15 16:10:39 +05:30
Lekshmi S
98ff848b33 Added stroke color changes for selected and not selected. 2020-04-14 15:18:29 +05:30
Lekshmi S
465fb26e8a Merge branch 'develop' into feature/radio_swatches 2020-04-14 14:26:40 +05:30
Damodaram
9c29916606 number of columns variable added 2020-04-14 14:20:29 +05:30
Damodaram
b348bdfdab border related issues fixed 2020-04-14 10:50:04 +05:30
Pfeil, Scott Robert
d000715518 Merge branch 'bugfix/form_validation' into 'develop'
any required fixes

See merge request BPHV_MIPS/mvm_core_ui!372
2020-04-13 13:33:06 -04:00
Suresh, Kamlesh
3df9b65098 spelling 2020-04-13 12:39:33 -04:00
Suresh, Kamlesh
93b43d6333 merge 2020-04-13 12:34:29 -04:00
Pfeil, Scott Robert
74910d624e Merge branch 'bugfix/image' into 'develop'
bugfix for load gif file form different bundle

See merge request BPHV_MIPS/mvm_core_ui!373
2020-04-13 11:30:17 -04:00
Lekshmi S
1635353989 Code refactoring by using collection base classes. 2020-04-13 18:07:54 +05:30
Lekshmi S
3daf3bc438 Merge branch 'develop' into feature/radio_swatches
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-04-13 10:26:50 +05:30
Lekshmi S
5a30f99d62 Re-arranged folder structure. 2020-04-13 10:22:30 +05:30
Xinlei(Ryan) Pan
3024b457f4 bugfix for load gif file form different bundle 2020-04-12 19:25:20 -04:00
Pfeil, Scott Robert
545173df1c Merge branch 'feature/radio_boxes' into 'develop'
Feature/radio boxes

See merge request BPHV_MIPS/mvm_core_ui!362
2020-04-10 20:37:35 -04:00
Pfeil, Scott Robert
cf5b554b85 remove old comment no longer applicable 2020-04-10 20:36:42 -04:00
Pfeil, Scott Robert
c718cfa92a selectors folder 2020-04-10 20:34:06 -04:00
Pfeil, Scott Robert
e8b8d8132c remove form validator from radio box for now 2020-04-10 20:32:12 -04:00
Pfeil, Scott Robert
b7b65e9d16 Form Validation
layout fixing
2020-04-10 20:25:57 -04:00
Suresh, Kamlesh
4c96cdda15 more fixes 2020-04-10 17:56:08 -04:00
Suresh, Kamlesh
c665f547a6 any required fixes 2020-04-10 17:35:46 -04:00
Suresh, Kamlesh Jain
b981e124e4 Merge branch 'feature/radio_fixes' into 'develop'
Feature/radio fixes

See merge request BPHV_MIPS/mvm_core_ui!363
2020-04-10 17:32:34 -04:00
Pfeil, Scott Robert
5ce98da559 improvements 2020-04-10 16:59:40 -04:00
Pfeil, Scott Robert
d46c5ef4ca Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/radio_boxes 2020-04-10 14:57:24 -04:00
Kevin G Christiano
15911265a7 comments and formatting 2020-04-10 14:29:40 -04:00
Kevin G Christiano
bb802af681 Merge branch 'develop' into feature/radio_fixes 2020-04-10 12:49:40 -04:00
Pfeil, Scott Robert
b1caad0928 Merge branch 'feature/collection' into 'develop'
Feature/collection

See merge request BPHV_MIPS/mvm_core_ui!368
2020-04-10 12:04:19 -04:00
Pfeil, Scott Robert
6fdfcaf539 Merge branch 'develop' of https://gitlab.verizon.com/BPHV_MIPS/mvm_core_ui into feature/collection 2020-04-10 11:54:56 -04:00
Pfeil, Scott Robert
8da03356e4 Fixing reuse and sizing issues. 2020-04-10 11:15:55 -04:00
Pfeil, Scott Robert
185efa547e Feedback push 2020-04-10 09:38:00 -04:00
Suresh, Kamlesh
649a127f21 merge 2020-04-09 18:47:01 -04:00
Suresh, Kamlesh
072951f912 fixes 2020-04-09 17:22:43 -04:00
Pfeil, Scott Robert
3e5618ea2b Merge branch 'feature/radio_form_disable' into 'develop'
Radio form disable

See merge request BPHV_MIPS/mvm_core_ui!369
2020-04-09 16:11:58 -04:00
Kevin G Christiano
8b4cd5078f merging 2020-04-09 16:02:09 -04:00
Suresh, Kamlesh
5715d7eb23 need groupName 2020-04-09 15:56:00 -04:00