From 0dcb468386656219af26d0d15a42aa3f0cda6a97 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Fri, 1 Nov 2019 16:34:58 +0530 Subject: [PATCH 01/10] Updating google plus to google groups regex --- app/components/forms/admin/content/social-links-form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/forms/admin/content/social-links-form.js b/app/components/forms/admin/content/social-links-form.js index d7bdf7a8833..043d45d6148 100644 --- a/app/components/forms/admin/content/social-links-form.js +++ b/app/components/forms/admin/content/social-links-form.js @@ -56,8 +56,8 @@ export default Component.extend(FormMixin, { optional : true, rules : [ { - type : 'containsExactly[plus.google.com]', - prompt : this.l10n.t('Please enter a valid google plus url') + type : 'containsExactly[groups.google.com]', + prompt : this.l10n.t('Please enter a valid google groups url') }, { type : 'regExp', From e7bfe61b98a738cc908cedf36d1304a0d64427ab Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Fri, 1 Nov 2019 16:37:59 +0530 Subject: [PATCH 02/10] Changing google plus title to google groups --- .../components/forms/admin/content/social-links-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs index 06779ebc9e0..db53c1d71c8 100644 --- a/app/templates/components/forms/admin/content/social-links-form.hbs +++ b/app/templates/components/forms/admin/content/social-links-form.hbs @@ -21,7 +21,7 @@ }}
- + {{widgets/forms/link-input segmentedLink=socials.segmentedGoogleUrl inputId='google_plus' From 225570b5532cc2664fdbe5ad2a51f1e81425f510 Mon Sep 17 00:00:00 2001 From: Kush Trivedi Date: Sat, 2 Nov 2019 14:24:48 +0530 Subject: [PATCH 03/10] Test commit for netlify success --- .../components/forms/admin/content/social-links-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs index db53c1d71c8..3ab36007fc3 100644 --- a/app/templates/components/forms/admin/content/social-links-form.hbs +++ b/app/templates/components/forms/admin/content/social-links-form.hbs @@ -21,7 +21,7 @@ }}
- + {{widgets/forms/link-input segmentedLink=socials.segmentedGoogleUrl inputId='google_plus' From 3b0fbbb942f5cc7845790420789012ccb47f0a5e Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sat, 2 Nov 2019 17:41:16 +0530 Subject: [PATCH 04/10] changin inputId from google_plus to google_groups --- .../components/forms/admin/content/social-links-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs index 3ab36007fc3..bd43cfcec68 100644 --- a/app/templates/components/forms/admin/content/social-links-form.hbs +++ b/app/templates/components/forms/admin/content/social-links-form.hbs @@ -24,7 +24,7 @@ {{widgets/forms/link-input segmentedLink=socials.segmentedGoogleUrl - inputId='google_plus' + inputId='google_groups' }}
From 624401fd048fd4df839ce826e834fbbbfa416b2e Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sat, 2 Nov 2019 17:43:57 +0530 Subject: [PATCH 05/10] Changing identifier to google_groups --- app/components/forms/admin/content/social-links-form.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/components/forms/admin/content/social-links-form.js b/app/components/forms/admin/content/social-links-form.js index 043d45d6148..a0df4fb89b5 100644 --- a/app/components/forms/admin/content/social-links-form.js +++ b/app/components/forms/admin/content/social-links-form.js @@ -51,8 +51,8 @@ export default Component.extend(FormMixin, { } ] }, - googlePlus: { - identifier : 'google_plus', + googleGroups: { + identifier : 'google_groups', optional : true, rules : [ { From c8d0f2ca729125d4da0f2361957840611004aacb Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sat, 2 Nov 2019 17:45:20 +0530 Subject: [PATCH 06/10] Changing GooglePlusUrl to GoogleGroupsUrl --- app/models/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.js b/app/models/user.js index 8baa1cf5c0c..c4b1749d490 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -40,7 +40,7 @@ export default ModelBase.extend({ facebookUrl : attr('string'), instagramUrl : attr('string'), twitterUrl : attr('string'), - googlePlusUrl : attr('string'), + googleGroupsUrl : attr('string'), facebookId: attr('string', { readOnly: true }), From 07076587fef320154f78a266604b8fe33db45968 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sat, 2 Nov 2019 20:16:10 +0530 Subject: [PATCH 07/10] Changing back to GooglePlusUrl --- app/models/user.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.js b/app/models/user.js index c4b1749d490..8baa1cf5c0c 100644 --- a/app/models/user.js +++ b/app/models/user.js @@ -40,7 +40,7 @@ export default ModelBase.extend({ facebookUrl : attr('string'), instagramUrl : attr('string'), twitterUrl : attr('string'), - googleGroupsUrl : attr('string'), + googlePlusUrl : attr('string'), facebookId: attr('string', { readOnly: true }), From 02197f3ac719ae12d909a121011ba737f86fa784 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sun, 3 Nov 2019 15:04:56 +0530 Subject: [PATCH 08/10] changing Google Groups to Google Group --- .../components/forms/admin/content/social-links-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs index bd43cfcec68..4e8d3216e0e 100644 --- a/app/templates/components/forms/admin/content/social-links-form.hbs +++ b/app/templates/components/forms/admin/content/social-links-form.hbs @@ -21,7 +21,7 @@ }}
- + {{widgets/forms/link-input segmentedLink=socials.segmentedGoogleUrl inputId='google_groups' From d89d29a68e54ff605511556d77d055c160f62b95 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sun, 3 Nov 2019 17:37:06 +0530 Subject: [PATCH 09/10] changing groups to group --- app/components/forms/admin/content/social-links-form.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/components/forms/admin/content/social-links-form.js b/app/components/forms/admin/content/social-links-form.js index a0df4fb89b5..d2d6b4abfec 100644 --- a/app/components/forms/admin/content/social-links-form.js +++ b/app/components/forms/admin/content/social-links-form.js @@ -51,13 +51,13 @@ export default Component.extend(FormMixin, { } ] }, - googleGroups: { - identifier : 'google_groups', + googleGroup: { + identifier : 'google_group', optional : true, rules : [ { type : 'containsExactly[groups.google.com]', - prompt : this.l10n.t('Please enter a valid google groups url') + prompt : this.l10n.t('Please enter a valid google group url') }, { type : 'regExp', From 934da9a706fb65a6c271d388e7588cf5920aecc6 Mon Sep 17 00:00:00 2001 From: Sundaram Dubey <56407566+maze-runnar@users.noreply.github.com> Date: Sun, 3 Nov 2019 18:59:49 +0530 Subject: [PATCH 10/10] changing InputId from google_groups to google_group --- .../components/forms/admin/content/social-links-form.hbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/templates/components/forms/admin/content/social-links-form.hbs b/app/templates/components/forms/admin/content/social-links-form.hbs index 4e8d3216e0e..c1c9fc61fd0 100644 --- a/app/templates/components/forms/admin/content/social-links-form.hbs +++ b/app/templates/components/forms/admin/content/social-links-form.hbs @@ -24,7 +24,7 @@ {{widgets/forms/link-input segmentedLink=socials.segmentedGoogleUrl - inputId='google_groups' + inputId='google_group' }}