github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-01-31 13:31:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
d9a02d1336
discourse/app/assets/javascripts/admin
History
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
..
adapters Rename .js.es6 to .js in the admin application 2020-03-13 17:03:08 -04:00
components DEV: Standardize table sorting verbiage (#9757) 2020-05-14 20:10:59 -06:00
controllers DEV: Standardize table sorting verbiage (#9757) 2020-05-14 20:10:59 -06:00
helpers DEV: import I18n instead of global usage (#9768) 2020-05-13 16:23:41 -04:00
mixins DEV: import I18n instead of global usage (#9768) 2020-05-13 16:23:41 -04:00
models Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 2020-05-23 00:56:13 -04:00
routes Revert "Revert "Merge branch 'master' of https://github.com/discourse/discourse"" 2020-05-23 00:56:13 -04:00
services DEV: import I18n instead of global usage (#9768) 2020-05-13 16:23:41 -04:00
templates DEV: Standardize table sorting verbiage (#9757) 2020-05-14 20:10:59 -06:00