Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
45,859 Commits 213 Branches 500 Tags 869 MiB
Commit Graph

6 Commits

Author SHA1 Message Date
Roman Rizzi bbe5d8d5cf
DEV: Sort imports alphabetically (#11382) 2020-12-01 15:31:26 -03:00
Joffrey JAFFEUX 52672b9eab
DEV: apply new coding standards (#10592) 2020-09-04 13:42:47 +02:00
Robin Ward aae97457d2
REFACTOR: Don't use `layoutName` in select-kit (#10556) 
Instead import the templates as modules, the way Ember CLI wants us to.
 2020-08-28 15:30:20 -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
Robin Ward 09ca75d17e FIX: select-kit was in the wrong place 
`app/` means we want to merge it into our application there. `addon`
means give it its own module namespace, which is what we wanted.
 2020-05-20 11:51:49 -04:00