Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
17,587 Commits 216 Branches 500 Tags 879 MiB
Commit Graph

17587 Commits

Author SHA1 Message Date
Régis Hanol cd65f07e08 Merge pull request #3985 from tgxworld/add_event_trigger_for_server_side_markdown 
FEATURE: DiscourseEvent hook for server side markdown context.
 2016-01-29 16:36:06 +01:00
Guo Xiang Tan 9b9f0ab4af Upgrade omniauth-google-oauth2. 2016-01-29 23:14:51 +08:00
Guo Xiang Tan 28ac5fb17c FEATURE: DiscourseEvent hook for server side markdown context. 2016-01-29 22:59:15 +08:00
Régis Hanol 7d5fdd0997 temporarily fix the build (cc @tgxworld) 2016-01-29 11:53:03 +01:00
Régis Hanol 32ef138dd7 Merge pull request #3984 from discourse/revert-3969-email-layout 
Revert "FEATURE (WIP): add max-width and center email notifications"
 2016-01-29 11:14:27 +01:00
Régis Hanol 378b7f964c Revert "FEATURE (WIP): add max-width and center email notifications" 2016-01-29 11:13:59 +01:00
Guo Xiang Tan 2c19e7f73d Fix the build. 2016-01-29 17:52:30 +08:00
Guo Xiang Tan 350f1685e5 UX: Hashtag color for dark theme. 2016-01-29 17:28:41 +08:00
Guo Xiang Tan e8c5127865 Convert to link as long as a valid link is received. 2016-01-29 13:31:11 +08:00
Guo Xiang Tan 190345ba20 Add DiscourseEvent hook when converting raw post to markdown. 2016-01-29 13:30:12 +08:00
Guo Xiang Tan 90100378b8 Extract category hashtag autocomplete into a resuable function. 2016-01-29 10:55:29 +08:00
Jeff Atwood 9cf57e3ca4 more email rejection copy edits 2016-01-28 15:42:05 -08:00
Neil Lalonde 9331dfa63c category export: export img src with absolute urls so pull_hotlink_image can move it over later 2016-01-28 15:45:28 -05:00
Jeff Atwood 223e324eb9 some copyedits on mail rejection text 2016-01-28 12:20:59 -08:00
Neil Lalonde 3053c1ebd8 category export: include category permissions and custom groups 2016-01-28 15:17:18 -05:00
Arpit Jalan 106e3c897f FIX: TL3 users should not be able to edit title of archived topics 2016-01-29 01:16:41 +05:30
Jeff Atwood 6d6d8842d2 make mentions color less black 2016-01-28 11:41:09 -08:00
Régis Hanol 3390fa56d0 improve the specs to check we properly update 'user.last_emailed_at' 2016-01-28 19:31:17 +01:00
Arpit Jalan 26bba1f481 UX: preserve localization in digest email 2016-01-28 23:38:07 +05:30
Régis Hanol d51019ee53 FIX: *always* create an EmailLog whenever we run the UserEmail job 
There were actually 2 bugs:

1/ Calling '.try(:key)' on a hash doesn't work. So EmailLogs were never associated to a user.

2/ Turns out that we update the 'user.last_emailed_at' whenever we create an EmailLog (in the 'after_create' callback).
So we need to always create an EmailLog (whenever the email is sent or skipped).
 2016-01-28 19:01:35 +01:00
Arpit Jalan 90d41a994a universal date format in digest email 2016-01-28 23:15:32 +05:30
Robin Ward 617dc42cd9 Merge pull request #3975 from techAPJ/category-user 
FIX: changing topic from one watched category to another watched category makes topic 'new' again
 2016-01-28 10:53:29 -05:00
Régis Hanol b5bc43023d Merge pull request #3980 from startsat60/master 
added plugin outlet under the header content div
 2016-01-28 10:40:14 +01:00
Régis Hanol 5c52beeaf2 Merge pull request #3981 from gschlager/uncategorized_description 
Replace uncategorized_description setting with translation
 2016-01-28 10:36:10 +01:00
Régis Hanol 9832bb4103 Merge pull request #3969 from scossar/email-layout 
FEATURE (WIP): add max-width and center email notifications
 2016-01-28 10:34:43 +01:00
Emanuele Tonello 6589fe73d8 moved outlet outside of the weap container 2016-01-28 15:27:28 +10:00
scossar 77167f12ad move styles to Styles 2016-01-27 19:07:21 -08:00
scossar 017820e445 check for template 2016-01-27 18:39:20 -08:00
Jeff Atwood a9015ec476 remove ugly pink dots on tips image 
WTFffff was I thinking
 2016-01-27 16:44:50 -08:00
Jeff Atwood b91dff6ad3 update new user tip images a bit 2016-01-27 16:44:50 -08:00
Sam Saffron b25e505fb7 SECURITY: user summary could show topic links you have no permissions to 2016-01-28 11:12:12 +11:00
scossar 8d10130c10 test format_notifications 2016-01-27 15:44:49 -08:00
Gerhard Schlager f4f87921c2 Replace uncategorized_description setting with translation 2016-01-28 00:26:25 +01:00
scossar 3f09ec2aca add layout for notifications 2016-01-27 11:27:32 -08:00
Jeff Atwood 6a7bdfecc8 better shorter copy for group inbox 2016-01-27 10:25:54 -08:00
Sam 5ed21e8767 filter out archived correctly 2016-01-28 00:14:26 +11:00
Sam b75353c26f correct specs 2016-01-27 23:40:45 +11:00
Sam 7b558f959e correct tracking logic 2016-01-27 23:20:29 +11:00
Sam 50a63a491c don't alert for inbox count of 0 2016-01-27 23:13:37 +11:00
Sam Saffron bf650de7be FEATURE: change group default tracking level to tracking (database changes) 2016-01-27 21:56:25 +11:00
Sam Saffron 8aea75edec improve copy 2016-01-27 21:51:12 +11:00
Sam Saffron a764cc3a42 FEATURE: by default users track a group (as opposed to watch) 
FEATURE: a rollup counting number of messages in the group inbox to tracking users
 2016-01-27 21:38:33 +11:00
Arpit Jalan 74f22f95da FEATURE: log admin/moderator grant/revoke action 2016-01-27 15:39:04 +05:30
Guo Xiang Tan 0916007d01 Fix the build. 2016-01-27 16:04:11 +08:00
Emanuele Tonello 938992e9a0 added plugin outlet under the header content div 2016-01-27 16:12:43 +10:00
Sam 1bb485fca5 FIX: when a user got multiple replies to a topic, emails were missing 2016-01-27 12:20:08 +11:00
Jeff Atwood 12b85b9ef9 CSS tweak to top expanded in-reply-to 2016-01-26 17:03:23 -08:00
Neil Lalonde 58610d15a1 FEATURE: export/import topics and categories from one Discourse site to another. (Early-access alpha greenlight. More to do...) 2016-01-26 19:57:54 -05:00
Jeff Atwood 0337964759 a bit better email name inference 2016-01-26 16:39:02 -08:00
Jeff Atwood f71ae355ae minor copyedit 2016-01-26 15:14:02 -08:00