codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-12-18 03:25:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
9192 commits 7 branches 179 tags 87 MiB
Commit graph

9192 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Ward
61a3a6f544 Merge branch 'justinleveck-add_custom_embed_by_username' 2014-06-16 10:52:25 -04:00
Robin Ward
88b5e78424 Merge branch 'add_custom_embed_by_username' of github.com:justinleveck/discourse into justinleveck-add_custom_embed_by_username 
Conflicts:
	config/site_settings.yml
 2014-06-16 10:52:15 -04:00
Benjamin Kampmann
22d93bc43a Let Plugin-Outlet Render inner template data 
- allows passing of template data to the plugin-outlet to be rendered if no plugin is using that slot
 - acts as a fallback when no plugin is found
 - allows wrapping of existing features inside a plugin-outlet that then plugins can overwrite with their own behaviour
 - backwards compatible
 - uses invisible emberviews (as Ember.Component does)
 - the template has full-access to the controller and view, should be totally transparent
 2014-06-16 15:10:10 +02:00
Sam Saffron
92d2912ff2 Revert "Bugfix: Mailing list mode disables PM emails" 
This reverts commit 6a2dde6417.
 2014-06-16 16:36:02 +10:00
Sam
1542854a93 Merge pull request #2420 from peternlewis/mailing_list_mode_disables_private_message_emails 
Bugfix: Mailing list mode disables PM emails
 2014-06-16 16:32:05 +10:00
Sam
abadcace39 Merge pull request #2447 from techAPJ/typo-patch-1 
Fix typo in XSS test
 2014-06-16 16:25:14 +10:00
Arpit Jalan
5ea1b0742f Fix typo in XSS test 2014-06-16 08:40:19 +05:30
Sam Saffron
03cde003db BUGFIX: no network could mean no posts save. 2014-06-16 12:14:51 +10:00
Sam Saffron
944cda1f73 BUGFIX: do not strip spaces from raw_hash of posts 2014-06-16 12:14:06 +10:00
Sam Saffron
fbbe9f7a19 collapse tests to improve perf of suite 2014-06-16 12:13:28 +10:00
Sam Saffron
6f88fc3aa3 HACK: disable undo/redo editor functionality 
TODO in a few weeks, rip out all code.
 2014-06-16 10:39:51 +10:00
Sam Saffron
d65efe7304 SECURITY: fix XSS 2014-06-16 10:24:54 +10:00
Jeff Atwood
258c353307 Merge pull request #2445 from techAPJ/invitation-patch 
Consider User trust level while showing Invites tab
 2014-06-15 03:15:34 -07:00
Jeff Atwood
00e285f55b remove legacy (deleted) username under avatar 2014-06-15 01:32:05 -07:00
Arpit Jalan
42375866cc Consider User trust level while showing Invites tab 2014-06-15 13:21:10 +05:30
Jeff Atwood
30ee16a72b add glyph to remove invite button 2014-06-14 16:13:17 -07:00
Jeff Atwood
b1fb9f3d81 switch to user glyph on accept invitation notify 2014-06-14 16:04:06 -07:00
Jeff Atwood
ce0b64ef1f minor style edits on invites 2014-06-14 15:59:02 -07:00
Jeff Atwood
1b3180f916 better copy for site and topic invites 2014-06-14 15:49:19 -07:00
riking
6e698315d6 Allow all /my URLs 
Previously, URLs like /my/activity/posts were denied. This change allows those URLs.
 2014-06-14 10:58:20 -07:00
Robin Ward
6f8888d405 XSS: Topic links needed sanitization 2014-06-14 12:53:48 -04:00
Robin Ward
f3135533c2 Add some more mail headers back 2014-06-14 12:29:50 -04:00
Robin Ward
dc6f30dd94 Don't focus on text field in mobile view when tapping the progress 2014-06-14 11:51:15 -04:00
Jeff Atwood
d782a7dc48 remove List-Post header as a test 2014-06-14 01:21:32 -07:00
Jeff Atwood
834b83aaea use a variable to set the header 2014-06-14 00:13:08 -07:00
Jeff Atwood
a1482f24d9 remove borked test 2014-06-13 17:03:45 -07:00
Jeff Atwood
679b3fab79 correct broken test, List-ID is correct 
see http://www.ietf.org/rfc/rfc2919.txt
 2014-06-13 16:45:34 -07:00
Jeff Atwood
c4d8d80b07 only set List-Post if reply via email is on 2014-06-13 15:49:11 -07:00
Jeff Atwood
beaa145572 some email notification header fixes 2014-06-13 15:42:20 -07:00
Robin Ward
c690fa0d19 FIX: Replace protocol relative URLs in emails 2014-06-13 17:11:04 -04:00
Robin Ward
fb639bc5f9 FIX: Remove extra setting of view 2014-06-13 16:42:18 -04:00
Neil Lalonde
c1f9d76323 Don't disable the Sign In button in the sign in modal 2014-06-13 16:07:28 -04:00
Robin Ward
3c8a610f73 Extra safety to the post stream. Don't return undefined if we can't 
retrieve a post for some reason.
 2014-06-13 16:00:39 -04:00
Robin Ward
929a195c5d Merge pull request #2442 from techAPJ/add-tooltip-to-glyph 
Add tooltip to Admin & Moderator glyph
 2014-06-13 15:19:24 -04:00
Arpit Jalan
9e0cf55758 Add tooltip to Admin & Moderator glyph 2014-06-14 00:37:55 +05:30
Robin Ward
17d341ff86 FIX: crawler versions of the page need the updated bio relationships. 2014-06-13 14:55:32 -04:00
Andrew Bezzub
e3fcd3fa80 update import script to save bio to UserProfile 2014-06-13 14:55:32 -04:00
Andrew Bezzub
9ffd173873 move bio to UserProfile from User 2014-06-13 14:55:32 -04:00
Neil Lalonde
10f0ddbbdd Make it possible to add multiple CORS origins in discourse.conf and docker yml files 2014-06-13 14:47:19 -04:00
Robin Ward
4a2d6bd5da Merge pull request #2439 from peternlewis/mailing_list_mode_disables_private_message_emails2 
Bugfix: Mailing list mode disables PM emails (take 2)
 2014-06-13 14:46:38 -04:00
Robin Ward
abb4a02b31 Merge pull request #2441 from adamloving/update-heroku-docs 
update heroku install docs
 2014-06-13 14:45:14 -04:00
Robin Ward
cf165320e2 Keyboard shortcuts for new progress expansion 2014-06-13 14:03:12 -04:00
Robin Ward
42ca46e628 Highlight posts when jumping to them. 2014-06-13 14:03:12 -04:00
Neil Lalonde
1876407db8 Version bump to v0.9.9.9 2014-06-13 11:38:13 -04:00
Robin Ward
e449d64ae1 ES6: Remove an unncessary view 2014-06-13 11:24:28 -04:00
Régis Hanol
e5a189fc17 BUGFIX: broken images in edit history with markdown view 2014-06-13 11:29:10 +02:00
Sam
00469e976d BUGFIX: Don't depend on localStorage for Discourse to function 2014-06-13 16:42:01 +10:00
Sam
0ffa98904f BUGFIX: mobile styling 2014-06-13 16:14:58 +10:00
Sam
5815e12caf BUGFIX: omit the "reply" word in mobile view 2014-06-13 16:03:25 +10:00
Sam
87baf58dbb SECURITY: XSS fix 2014-06-13 13:20:57 +10:00