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

17936 Commits

Author SHA1 Message Date
Sam 0af9e7b572 Merge branch 'master' into vdom 2016-02-22 12:25:07 +11:00
Sam 4c0a40f2b0 FIX: publish notification state when notifications are read 
(this clears green and blue bubbles)
 2016-02-22 12:24:51 +11:00
Sam c404da248a Merge branch 'master' into vdom 2016-02-22 12:20:59 +11:00
Sam d0337e7f5e FIX: clear notification bubble when notification is read 2016-02-22 12:20:41 +11:00
Sam 5a47199528 Merge pull request #3947 from khoa-le/update-locale-vietnamese 
Add locale for Vietnamese
 2016-02-22 11:41:37 +11:00
Régis Hanol 13e1bf849e Merge pull request #4023 from dandv/patch-1 
Typo fix: "your sure"
 2016-02-21 23:52:38 +01:00
Régis Hanol 87e72cb521 Merge pull request #4025 from gschlager/importer-name 
Allow importers to set empty names
 2016-02-21 23:52:15 +01:00
Régis Hanol 16629401fa Merge pull request #4024 from gschlager/username-suggester 
FIX: Don't suggest invalid username
 2016-02-21 23:51:54 +01:00
Gerhard Schlager 8a486d8cea Allow importers to set empty names 2016-02-21 23:35:47 +01:00
Gerhard Schlager c4ec1d0fcf FIX: Don't suggest invalid username 2016-02-21 23:28:57 +01:00
Dan Dascalescu 5fdc0ebe8a Typo fix: "your sure" 2016-02-21 14:12:32 -08:00
Régis Hanol dedbb59321 Merge pull request #4022 from gschlager/importer-patch 
Don't try to import invalid websites
 2016-02-21 22:47:23 +01:00
Gerhard Schlager eb166e78b6 Don't try to import invalid websites 2016-02-21 17:38:04 +01:00
Guo Xiang Tan ded9dc8734 Merge pull request #4021 from dandv/patch-1 
Fix typo: are your sure
 2016-02-21 22:09:11 +08:00
Dan Dascalescu 9aa3653e2f Fix typo: are your sure 2016-02-21 02:26:28 -08:00
Robin Ward e848ea5a99 Depcreate `PageTracker` in favor of `PluginAPI` 2016-02-19 16:30:59 -05:00
Robin Ward 9b0b213ba2 FIX: Less safe API for icons 2016-02-19 16:03:26 -05:00
Neil Lalonde e8d837269b FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
Robin Ward 8b318f76a1 Expose decoration for plugins such as signatures 2016-02-19 14:46:29 -05:00
Robin Ward f2f49a5e96 Ability to add text to a poster name icon 2016-02-19 14:22:36 -05:00
Jeff Atwood 6c684944c5 add link to mail-tester.com in test email 2016-02-19 09:19:36 -08:00
Neil Lalonde 97130463d6 FEATURE: show a new modal when suspended users try to log in 2016-02-19 12:19:20 -05:00
Guo Xiang Tan c2018ded5d Revert "SECURITY: Upgrade Sprockets." 
This reverts commit 1a0a364503.
 2016-02-19 15:55:44 +08:00
Guo Xiang Tan 4858187b0e UX: Don't display span if there is no count. 2016-02-19 15:55:43 +08:00
Guo Xiang Tan afa4e58efd Revert "SECURITY: Upgrade Sprockets." 
This reverts commit 1a0a364503.
 2016-02-19 15:52:47 +08:00
Guo Xiang Tan 5e329898f6 UX: Don't display span if there is no count. 2016-02-19 15:33:07 +08:00
Sam ecca7b69bb Merge branch 'master' into vdom 2016-02-19 18:28:57 +11:00
Sam 665a87a32f UX: revert full page search focus on magnifying glass click 2016-02-19 18:28:36 +11:00
Guo Xiang Tan c756ddbc2e Merge pull request #4019 from tgxworld/update_sprockets 
SECURITY: Upgrade Sprockets.
 2016-02-19 15:26:41 +08:00
Guo Xiang Tan 7a261e5e4f UX: Hide close mobile navigation on click. 2016-02-19 15:22:41 +08:00
Sam 7bc1db5f27 Merge branch 'master' into vdom 2016-02-19 17:43:45 +11:00
Sam f18f6dc31f correct spec to stop checking for empty category suppression 2016-02-19 17:43:26 +11:00
Sam 8493057942 Merge branch 'master' into vdom 2016-02-19 17:09:28 +11:00
Sam 02002afd3f clean up hack 2016-02-19 17:08:08 +11:00
Sam f33cfb698c Merge branch 'master' into vdom 2016-02-19 17:03:42 +11:00
Sam c230c11707 FEATURE: stop removing empty categories users have access to from /categories page 
This is particularly important for heirarchies of categories where a parent is empty

Also, if we hide the blank category, how are we going to create the first topic?

Old behavior was hacky.
 2016-02-19 17:03:23 +11:00
Sam 29c2423daf Merge branch 'master' into vdom 
# Conflicts:
#	app/assets/javascripts/discourse/views/post.js.es6
 2016-02-19 14:09:31 +11:00
Sam ab06f86fbe FEATURE: allow users to control how many previous replies they get 
- always means we always send previous replies with every email
- never means we do not
- "unless previously sent" ... is the default, in which we only email you each reply once

The default_email_previous_replies site setting can control this toggle
 2016-02-19 13:57:07 +11:00
Sam 3de390c067 quote fields in case they are still in the db 2016-02-19 13:57:07 +11:00
Guo Xiang Tan 1a0a364503 SECURITY: Upgrade Sprockets. 
* Advisory: CVE-2014-7819
* URL: https://groups.google.com/forum/#!topic/rubyonrails-security/doAVp0YaTqY
 2016-02-19 10:10:25 +08:00
Régis Hanol e204144a58 UsernameValidator error messages weren't matching the code 2016-02-18 23:19:14 +01:00
Robin Ward e277b24671 Support for multiple emojis at once 2016-02-18 17:10:27 -05:00
Robin Ward 4d599612a2 Support for emoji poster icons 2016-02-18 17:03:18 -05:00
Robin Ward 6935925f10 Update Polls plugin to work with new Plugin API 2016-02-18 15:23:43 -05:00
Robin Ward f6aa1ac37a Migrate `onToolbarCreate` to the DiscourseAPI 2016-02-18 15:23:43 -05:00
Robin Ward 7b8e313dac Remove unncessary CP 2016-02-18 15:23:43 -05:00
Neil Lalonde 283ff4c7f8 move code for bulk adding users to a group from controller to model 2016-02-18 14:03:08 -05:00
Régis Hanol abc41c7d5b FIX: sharing a post was broken 2016-02-18 19:28:00 +01:00
Régis Hanol 8a1a9f60a2 FIX: double click counters 2016-02-18 18:42:10 +01:00
Robin Ward f77ec0b610 FIX: broken tests 2016-02-18 12:19:00 -05:00