Commit Graph

3089 Commits

Author SHA1 Message Date
Kruthika KP
7e2e974f15 changed implementation 2020-04-17 13:06:19 +05:30
Lekshmi S
fdd22f10e3 Merge branch 'develop' into feature/radio_swatches 2020-04-17 11:26:03 +05:30
Lekshmi S
9778368467 Merge branch 'develop' into feature/HeadersH2TinyButton 2020-04-17 11:22:56 +05:30
Lekshmi S
dc5c972281 Merge branch 'develop' into feature/Headers_H2_Buttons 2020-04-17 11:21:20 +05:30
Pfeil, Scott Robert
44b8be8095 Merge branch 'bugfix/radio_selection_fix' into 'release/7_6_0'
disable tap if radio is disabled

See merge request BPHV_MIPS/mvm_core_ui!387
2020-04-16 13:54:22 -04:00
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
Suresh, Kamlesh
dfa49641d8 disable tap if radio is disabled 2020-04-16 13:30:15 -04:00
Kevin G Christiano
9299d7d381 changes to align with android 2020-04-16 13:09:27 -04:00
Kevin G Christiano
932a79dea8 few more improvements to work closer with molecular 2020-04-16 09:05:09 -04:00
Kevin G Christiano
da7ebdd5a2 merging 2020-04-16 08:40:37 -04:00
Kevin G Christiano
7c03b4059e Merge branch 'develop' into feature/toolbar_entry_field 2020-04-16 08:35:42 -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
979886cd09 Restructured folder after merge from develop. 2020-04-16 13:12:10 +05:30
Lekshmi S
55d31590e0 Merge branch 'develop' into feature/HeadersH2TinyButton
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-16 12:56:33 +05:30
Lekshmi S
6c9ff6d929 Merge branch 'develop' into feature/Headers_H2_Buttons 2020-04-16 11:33:05 +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
8684834edf Merge branch 'bugfix/buton_group' into 'release/7_6_0'
button will set groupname only when  validation is required

See merge request BPHV_MIPS/mvm_core_ui!385
2020-04-15 19:32:07 -04:00
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
Pfeil, Scott Robert
23c244281d Merge branch 'feature/april_modify' into 'release/7_6_0'
Feature/april modify

See merge request BPHV_MIPS/mvm_core_ui!355
2020-04-15 18:11:44 -04:00
Pfeil, Scott Robert
8479ed605a small fix encoding numbered list 2020-04-15 18:09:10 -04:00
Pfeil, Scott Robert
a57f07c22b remove previous items 2020-04-15 17:42:57 -04:00
Kevin G Christiano
f6ac98ddc5 Merge branch 'release/7_6_0' into feature/toolbar_entry_field 2020-04-15 16:20:58 -04:00
Kevin G Christiano
e5247ac13f resolving a race condition 2020-04-15 15:26:44 -04:00
Kevin G Christiano
a083a01dd8 resolving a race condition 2020-04-15 15:14:55 -04:00
Kevin G Christiano
e8aaad5287 removing redundancy 2020-04-15 14:54:00 -04:00
Kevin G Christiano
b1293ad9ed changes amde 2020-04-15 14:03:59 -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
Kevin G Christiano
9181d3f6d1 removed unused variable 2020-04-15 13:05:38 -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
Kevin G Christiano
904f8a35a2 reverting change 2020-04-15 13:00:04 -04:00
Pfeil, Scott Robert
5ca03674c2 clean color code, move function 2020-04-15 12:59:57 -04:00
Pfeil, Scott Robert
d19b46d3e9 corner labels defect fix 2020-04-15 12:37:05 -04:00
Kevin G Christiano
217ec0333e resolving all default button tint to black 2020-04-15 12:14:27 -04:00
Kevin G Christiano
1415b1bf5e revised how toolbar is configured 2020-04-15 12:11:29 -04:00
Kevin G Christiano
7fd0df1b91 revised how toolbar is configured 2020-04-15 12:07:49 -04:00
Pfeil, Scott Robert
dcd6257f95 merge 2020-04-15 11:29:32 -04:00
Pfeil, Scott Robert
c009ef64a3 Merge branch 'develop' into feature/april_modify 2020-04-15 11:23:02 -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
Lekshmi S
21af3227c9 Restructured folder after merge from develop. 2020-04-15 19:32:34 +05:30
Lekshmi S
181856c702 Merge branch 'develop' into feature/Headers_H2_Buttons
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/OtherHandlers/MoleculeObjectMapping.swift
2020-04-15 19:26:27 +05:30
Damodaram
47039f30aa Merge branch 'develop' into feature/listRightVariable_priceChange_bodyText
* develop:
  spelling
  bugfix for load gif file form different bundle
  more fixes
  any required fixes
2020-04-15 16:48:11 +05:30
Damodaram
7b3e22826c number of columns per row updated 2020-04-15 16:10:39 +05:30
Damodaram
594a45894e updated as per confluence 2020-04-15 15:57:57 +05:30