Skip to content
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

Jump to bottom

[NEW] Set Document Domain property in IFrame #9751

Merged
merged 8 commits into from
Jun 20, 2018
Merged

[NEW] Set Document Domain property in IFrame #9751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4748bb2
[NEW] Document Domain property in IFrame
kb0304 Feb 17, 2018
4fda9b8
Reorder setting document.domain and enable check
kb0304 Feb 17, 2018
77cc264
Merge branch 'develop' into bugfix-7474
engelgabriel Feb 21, 2018
adbacc0
Merge branch 'develop' into bugfix-7474
kb0304 Mar 8, 2018
2fb2244
Merge branch 'develop' into bugfix-7474
kb0304 Mar 8, 2018
aeb7248
Merge branch 'develop' of github.com:kb0304/Rocket.Chat into bugfix-7474
kb0304 Apr 14, 2018
b6d6b0f
[FIX] Document Domain setting
kb0304 Apr 15, 2018
03a2a48
Merge branch 'develop' into bugfix-7474
engelgabriel May 22, 2018
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
1 change: 1 addition & 0 deletions packages/rocketchat-i18n/i18n/en.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -642,6 +642,7 @@
"Do_not_display_unread_counter": "Do not display any counter of this channel",
"Do_you_want_to_accept": "Do you want to accept?",
"Do_you_want_to_change_to_s_question": "Do you want to change to <strong>%s</strong>?",
"Document_Domain":"Document Domain",
"Domain": "Domain",
"Domain_added": "domain Added",
"Domain_removed": "Domain Removed",
Expand Down
4 changes: 4 additions & 0 deletions packages/rocketchat-lib/client/lib/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ Meteor.startup(function() {
});
}
}, 100);
const documentDomain = RocketChat.settings.get('Document_Domain');
if (documentDomain) {
window.document.domain = documentDomain;
}
return c.stop();
});
});
4 changes: 4 additions & 0 deletions packages/rocketchat-lib/server/startup/settings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -707,6 +707,10 @@ RocketChat.settings.addGroup('General', function() {
order: 0
}
});
this.add('Document_Domain', '', {
type: 'string',
'public': true
});
this.add('Language', '', {
type: 'language',
wizard: {
Expand Down