Skip to content

fix: Renaming google plus entry to google groups in admin content social link page #3588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Jan 2, 2020
Merged

fix: Renaming google plus entry to google groups in admin content social link page #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
0dcb468
Updating google plus to google groups regex
maze-runnar Nov 1, 2019
e7bfe61
Changing google plus title to google groups
maze-runnar Nov 1, 2019
225570b
Test commit for netlify success
kushthedude Nov 2, 2019
3b0fbbb
changin inputId from google_plus to google_groups
maze-runnar Nov 2, 2019
624401f
Changing identifier to google_groups
maze-runnar Nov 2, 2019
c8d0f2c
Changing GooglePlusUrl to GoogleGroupsUrl
maze-runnar Nov 2, 2019
0707658
Changing back to GooglePlusUrl
maze-runnar Nov 2, 2019
02197f3
changing Google Groups to Google Group
maze-runnar Nov 3, 2019
c01def5
Merge branch 'development' into patch-7
maze-runnar Nov 3, 2019
d89d29a
changing groups to group
maze-runnar Nov 3, 2019
934da9a
changing InputId from google_groups to google_group
maze-runnar Nov 3, 2019
692d8cd
Merge branch 'development' into patch-7
maze-runnar Nov 4, 2019
8bc4813
Merge branch 'development' into patch-7
maze-runnar Dec 25, 2019
e685a8f
Merge branch 'development' into patch-7
maze-runnar Dec 28, 2019
06e0254
Merge branch 'development' into patch-7
abhinavk96 Jan 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/components/forms/admin/content/social-links-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ export default Component.extend(FormMixin, {
}
]
},
googlePlus: {
identifier : 'google_plus',
googleGroup: {
identifier : 'google_group',
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 group url')
},
{
type : 'regExp',
Expand Down
4 changes: 2 additions & 2 deletions app/templates/components/forms/admin/content/social-links-form.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@
}}
</div>
<div class="field">
<label>{{t 'Google +'}}</label>
<label>{{t 'Google Group'}}</label>
{{widgets/forms/link-input
segmentedLink=socials.segmentedGoogleUrl
inputId='google_plus'
inputId='google_group'
}}
</div>
<div class="field">
Expand Down