Commit Graph

513 Commits

Author SHA1 Message Date
Lekshmi S
bf51e4c0ba Merge branch 'develop' into feature/star 2020-10-13 09:37:16 +05:30
Lekshmi S
93943b2518 Code changes based on review comments. 2020-10-12 19:46:35 +05:30
Pfeil, Scott Robert
89ad8fe06f Merge branch 'feature/underline_enhancement' into 'develop'
Underline enhancement

See merge request BPHV_MIPS/mvm_core_ui!605
2020-10-12 10:03:23 -04:00
Lekshmi S
37f8f2ac25 Merge branch 'develop' into feature/star
# Conflicts:
#	MVMCoreUI.xcodeproj/project.pbxproj
#	MVMCoreUI/Atomic/MoleculeObjectMapping.swift
2020-10-12 09:56:50 +05:30
Lekshmi S
8854107a92 Merge branch 'develop' into feature/star 2020-10-07 10:31:15 +05:30
Lekshmi S
ccc7f55bdd Merge branch 'develop' into feature/heart 2020-10-07 10:29:29 +05:30
Kevin G Christiano
7c636a00b1 check length 2020-10-06 10:30:37 -04:00
Lekshmi S
1bf75c9929 Accessibility label changes for heart. 2020-10-06 16:13:02 +05:30
Lekshmi S
ad345dacd8 Code changes as per review comments. 2020-10-06 13:06:31 +05:30
Lekshmi S
7ba0d14c51 Merge branch 'develop' into feature/star 2020-10-06 10:00:11 +05:30
Lekshmi S
d43cf7dfa0 Merge branch 'develop' into feature/heart 2020-10-06 09:58:57 +05:30
Kevin G Christiano
7643b86b51 allow for textColor first. 2020-10-05 18:03:35 -04:00
Kevin G Christiano
eba33717b5 merging 2020-10-05 17:34:28 -04:00
Kevin G Christiano
229bc94568 comment 2020-10-05 15:37:19 -04:00
Kevin G Christiano
2ef34939b7 underline enhancement 2020-10-05 15:21:52 -04:00
Kevin G Christiano
e676e1f7c1 not needed 2020-10-02 12:17:51 -04:00
Kevin G Christiano
40f2b5db17 moved logic 2020-10-02 12:00:09 -04:00
Kevin G Christiano
5bac63324f update 2020-10-01 14:45:18 -04:00
Kevin G Christiano
0ba5da2add latest state 2020-10-01 12:15:45 -04:00
Kevin G Christiano
592e0a9591 move logic up 2020-10-01 09:03:48 -04:00
Kevin G Christiano
84a300eba7 checked & comment 2020-09-30 15:54:51 -04:00
Kevin G Christiano
108eca30db iOS 13/14 issue fix. 2020-09-30 15:22:39 -04:00
Lekshmi S
95ed215d34 Using stackview instead of colletionview for stars. 2020-09-30 19:38:53 +05:30
Lekshmi S
223757ab0f Changed accessibility text for heart. 2020-09-30 12:16:04 +05:30
Kevin G Christiano
183afe1eca Merge branch 'develop' into bugfix/attributed_holdover 2020-09-29 15:15:46 -04:00
Lekshmi S
7c4c9ea43a Code changes based on review comments and added default action noop. 2020-09-29 17:39:16 +05:30
Lekshmi S
25b88d4758 StarsModel and molecule class commit. 2020-09-24 21:45:31 +05:30
Lekshmi S
28a23ee4b7 Merge branch 'develop' into feature/star 2020-09-23 09:35:15 +05:30
Lekshmi S
8534042311 Merge branch 'develop' into feature/heart 2020-09-23 09:33:46 +05:30
Kyle Matthew Hedden
324605cdeb prevent double selection and code review items 2020-09-21 12:17:25 -04:00
Lekshmi S
f19dd2297a Merge branch 'develop' into feature/star 2020-09-21 09:59:07 +05:30
Lekshmi S
742120ec61 Merge branch 'develop' into feature/heart 2020-09-21 09:57:17 +05:30
Kyle Matthew Hedden
bf0fe53bc6 else if for clarity 2020-09-18 17:39:16 -04:00
Kyle Matthew Hedden
c9726652b1 Add toggle model source. 2020-09-18 16:58:36 -04:00
Kyle Matthew Hedden
84cb198057 move the drop down action to field input dismissal. 2020-09-18 15:25:48 -04:00
Kevin G Christiano
68274505fb some checks for analytics change 2020-09-18 13:08:08 -04:00
Kevin G Christiano
44dad67961 push latest iteration for perform action 2020-09-18 12:39:58 -04:00
Damodaram
b1fb3f075f updated additional data for selectors 2020-09-18 12:54:31 +05:30
Damodaram
9bcd35eee1 Merge branch 'feature/taggingForDropdown' into feature/taggingForSelectors
* feature/taggingForDropdown:
  sending source model to action
  updated based on review comments
  tagging changes implemented
2020-09-18 12:36:09 +05:30
Damodaram
81aa0da7cb sending source model to action 2020-09-18 12:34:57 +05:30
Damodaram
4254e63993 sending model json 2020-09-17 19:52:33 +05:30
Damodaram
88a6421a7e updated based on review comments 2020-09-16 20:28:55 +05:30
Lekshmi S
0f655b534e Initial commit for MOBFIRST-22354 Star story. 2020-09-16 18:46:26 +05:30
Damodaram
483a50dd98 tagging changes implemented 2020-09-16 15:45:56 +05:30
Lekshmi S
58434b62de Merge branch 'develop' into feature/heart 2020-09-16 10:24:09 +05:30
Damodaram
fa77c01d66 Merge branch 'develop' into feature/taggingForSelectors
* develop:
  review updates
  tab bar history
  remove print statements
  comments
  Comments, organizing, init fix
  molecular top alert quick draft
  review changes.
  added action attribute for radiobutton
2020-09-16 08:55:25 +05:30
Damodaram
34256698c0 added action support for selectors 2020-09-15 16:39:41 +05:30
Lekshmi S
c81f979f3f Merge branch 'develop' into feature/heart 2020-09-15 11:21:06 +05:30
Damodaram
afe5e1185c Merge branch 'develop' into feature/addingActionAttributeFor_radioButton
* develop:
  cleanup
  remove code
  fix
  fix
  fiix
  fix
  webView.scrollView.contentSize
2020-09-15 11:09:32 +05:30
Pfeil, Scott Robert
185452e801 Merge branch 'release/8_0_0' into 'develop'
release/8_0_0 hotfix merge

See merge request BPHV_MIPS/mvm_core_ui!570
2020-09-14 14:11:15 -04:00