Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
19,720 Commits 181 Branches 498 Tags 917 MiB
Commit Graph

19720 Commits

Author SHA1 Message Date
Jeff Atwood 1ca52615a6 very minor copyedit 2016-06-16 01:53:44 -07:00
Guo Xiang Tan 4df224bb79
FIX: Trim whitespaces and do a global replace. 2016-06-16 16:35:23 +08:00
Jeff Atwood ab11251f63 Merge pull request #4271 from discoursehosting/master 
Working VB5 importer
 2016-06-16 00:41:57 -07:00
michael@discoursehosting.com 1e15735a45 Working VB5 importer 2016-06-16 05:56:28 +00:00
Guo Xiang Tan 23e32839b0 Merge pull request #4258 from gschlager/i18n 
Add notes to date and number formats to help translators
 2016-06-16 10:29:01 +08:00
Guo Xiang Tan 838989a0d7
Use image-url. 2016-06-16 05:19:18 +08:00
Neil Lalonde be338892ec FIX: post revision history wasn't showing tags correctly 2016-06-15 14:15:30 -04:00
Neil Lalonde 17b1179103 oops, missed a file 2016-06-15 13:56:56 -04:00
Mittineague bd509f5550 Merge pull request #1 from discourse/master 
Syncing from original
 2016-06-15 13:31:46 -04:00
Neil Lalonde d62f2b4d67 UX: rename setting num_flags_to_block_new_user to num_spam_flags_to_block_new_user 2016-06-15 13:19:06 -04:00
Guo Xiang Tan 169d17edc3
Include cdn path in the stylesheet digest. 2016-06-16 00:19:38 +08:00
Guo Xiang Tan fd91a8eee6
Bunch of UX changes for polls builder. 2016-06-15 23:47:19 +08:00
Neil Lalonde 1c9519636c FEATURE: new users can be blocked from posting if enough TL3 users flag their posts 2016-06-15 10:51:34 -04:00
Régis Hanol 367954057b should have been 'deleted_topic' 2016-06-15 14:45:18 +02:00
Régis Hanol ed4634dc34 FIX: don't error out when deleting a topic with no user 2016-06-15 14:41:08 +02:00
Guo Xiang Tan bf64280661
FIX: Incorrect scope when checking for existing topic link. 2016-06-15 14:13:30 +08:00
Guo Xiang Tan e1cfe7536c
FIX: Add default values when no value has been selected. 2016-06-15 12:54:52 +08:00
Guo Xiang Tan ba87181506 Merge pull request #4264 from tgxworld/poll_ui_builder 
Poll UI Builder.
 2016-06-15 11:15:52 +08:00
Guo Xiang Tan ae5a033469
Start checking eslint in plugins. 2016-06-15 11:14:24 +08:00
Guo Xiang Tan 8d46727d67
FEATURE: Poll UI Builder. 2016-06-15 11:14:24 +08:00
Sam 84a1b863a6 UX: add link to watched topics from prefs page 2016-06-15 12:38:47 +10:00
Robin Ward 4cd19ee26e FIX: Avoid weird formatting for decloaked posts 2016-06-14 17:14:20 -04:00
Régis Hanol 0f809d4993 FIX: only show the reply as new topic when user can actually reply as new topic 2016-06-14 23:03:34 +02:00
Robin Ward af4391bbda UX: Don't show right arrow in quotes 2016-06-14 16:38:34 -04:00
Jeff Atwood c860bd0781 remove Google+ as default from share link 
sorry Google! It was a nice try!
 2016-06-14 12:27:21 -07:00
Régis Hanol 7efd9359ec reply as new topic requires a post 2016-06-14 20:55:58 +02:00
Jeff Atwood 55b300bae1 better align reply action on link dialog 2016-06-14 11:45:50 -07:00
Régis Hanol 9588583244 'Reply as new topic' link in the share dialog 2016-06-14 20:01:21 +02:00
Robin Ward bdd15d5452 FIX: Don't remove all events, only the ones we created 2016-06-14 13:40:56 -04:00
Neil Lalonde 1dae7fbe04 FIX: move non-admin i18n keys out of admin_js section 2016-06-14 12:55:08 -04:00
Guo Xiang Tan 5813352439
FEATURE: Add new API to add a toolbar popup menu button. 2016-06-15 00:39:53 +08:00
Robin Ward 3d3ce56f52 UX: Never show the back button if it's the last post 2016-06-14 12:02:24 -04:00
Robin Ward b42f28d4c3 Improved mailing list import. 
Now uses a SQLite database to store messages rather than JSON files
for performance and memory considerations.
 2016-06-14 11:45:17 -04:00
Régis Hanol 470da6205c FIX: staged users should not watch/track/mute categories by default 2016-06-14 16:45:47 +02:00
Rimian Perkins ccb5eed717 exit if RETRY is false 2016-06-14 14:17:39 +10:00
Sam ad15c4ac78 Merge pull request #4268 from choiceaustralia/qunit-args 
enable args MODULE and FILTER for qunit:test rake task
 2016-06-14 12:49:56 +10:00
Rimian Perkins d2bd857160 enable args MODULE and FILTER for qunit:test rake task 2016-06-14 12:06:11 +10:00
Régis Hanol e97e0bb311 FEATURE: new FirstReplyByEmail bronze badge 2016-06-13 15:37:14 +02:00
Régis Hanol 49f8a2baa7 FEATURE: support for mandrill webhooks 2016-06-13 12:32:14 +02:00
Guo Xiang Tan 95a013784f Merge pull request #4260 from jamescook/james/replace-certain-gsub-with-tr 
Replace certain uses of 'gsub' with 'tr' / 'chomp' for a speed improvement
 2016-06-13 18:25:38 +08:00
Régis Hanol c13cbc8aea FIX: only show topic links from active users 2016-06-13 11:11:25 +02:00
Guo Xiang Tan 191d2283f4
Fix specs. 2016-06-13 14:31:10 +08:00
Guo Xiang Tan 95efdce74f
Improve spec. 2016-06-13 13:16:24 +08:00
Guo Xiang Tan 1fe499e893
FIX: Don't include reflections when checking for duplication topic links. 2016-06-13 13:14:35 +08:00
Guo Xiang Tan 8c3e63f87a
Raise an error if create fails. 2016-06-13 13:14:35 +08:00
Guo Xiang Tan 494f1f9fae Merge pull request #4257 from tgxworld/paginate_public_polls 
PERF: Paginate public polls.
 2016-06-13 12:08:03 +08:00
Guo Xiang Tan 0c8dd28395
FIX: Post count wasn't recovered when a post is recovered. 2016-06-13 11:25:06 +08:00
Guo Xiang Tan 142b74b01b
Add default queues to sidekiq.yml. 2016-06-13 09:34:52 +08:00
Jeff Atwood a6f03605a1 Merge pull request #4263 from awesomerobot/master 
usercard background now matches theme background (default = white)
 2016-06-12 17:16:50 -07:00
awesomerobot 3a8d366011 usercard background matches theme background (default = white) 2016-06-12 19:55:44 -04:00