osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
39,342 Commits 130 Branches 462 Tags
6b818fb855e7520f44e2fac2ebe7353d8f2f3357
Commit Graph

12 Commits

Author SHA1 Message Date
Penar Musaraj 273db57d6e FEATURE: Allow admins to delete user SSO records in the UI (#10669) 
Also displays the user's last payload in the admin UI to help with debugging SSO issues.
 2020-09-15 10:00:10 -04:00
Joffrey JAFFEUX 52672b9eab DEV: apply new coding standards (#10592) 2020-09-04 13:42:47 +02:00
Robin Ward ff4de97dfd REFACTOR: Move bootbox to an import instead of global variable (#10533) 2020-08-26 12:57:13 -04:00
Robin Ward ca13160435 REFACTOR: Remove Discourse.SiteSettings from user/admin-user 2020-07-15 11:48:55 -04:00
Robin Ward ba00cc8ec4 DEV: Move Discourse.getURL and related functions to a module (#9966) 
* DEV: Move `Discourse.getURL` and related functions to a module

* DEV: Remove `Discourse.getURL` and `Discourse.getURLWithCDN`

* FIX: `get-url` is required for server side code

* DEV: Deprecate `BaseUri` too.
 2020-06-03 12:45:26 -04:00
Michael Brown d9a02d1336 Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 
This reverts commit 20780a1eee.

* SECURITY: re-adds accidentally reverted commit:
  03d26cd6: ensure embed_url contains valid http(s) uri
* when the merge commit e62a85cf was reverted, git chose the 2660c2e2 parent to land on
  instead of the 03d26cd6 parent (which contains security fixes)
 2020-05-23 00:56:13 -04:00
Jeff Atwood 20780a1eee Revert "Merge branch 'master' of https://github.com/discourse/discourse" 
This reverts commit e62a85cf6f, reversing
changes made to 2660c2e21d.
 2020-05-22 20:25:56 -07:00
Roman Rizzi 52228b1fa6 DEV: These routes don't exist anymore (#9823) 2020-05-19 16:09:03 -03:00
Robin Ward eab560fe2a DEV: import I18n instead of global usage (#9768) 
Co-authored-by: Mark VanLandingham <markvanlan@gmail.com>
Co-authored-by: Robin Ward <robin.ward@gmail.com>

Co-authored-by: Mark VanLandingham <markvanlan@gmail.com>
 2020-05-13 16:23:41 -04:00
Vinoth Kannan 71241a50f7 DEV: improve code readability & add tests for user guardian. 
a511bea4cc
 2020-04-30 20:59:33 +05:30
Vinoth Kannan a511bea4cc FEATURE: admin UI to merge two users. (#9509) 2020-04-22 14:07:51 +05:30
Robin Ward e40e06d78c Rename .js.es6 to .js in the admin application 2020-03-13 17:03:08 -04:00