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

5012 Commits

Author SHA1 Message Date
Régis Hanol 8dded197df Merge pull request #1575 from GManzato/fix_fr_translation 
Add missing translation in FR locale
 2013-10-25 05:57:59 -07:00
Gilles Manzato 524bd5ec70 Add missing translation in FR 2013-10-25 14:03:06 +02:00
Sam 8ad103abb0 correct fixture 2013-10-25 14:59:57 +11:00
Sam e57967c6c3 better exception when discourse.ajax is called, still need to figure out how to fix it though :) 2013-10-25 14:30:45 +11:00
Sam a65407b2cb implemented UI for filtered down by category view 2013-10-25 14:18:34 +11:00
Sam 572f036e74 filter down the top level navs 2013-10-25 11:15:20 +11:00
Sam 270fde7dbd correct rake test:prepare so it seeds the db correctly 
move category creation into seeds as well, so db can be seeded from structure.sql
 2013-10-25 10:31:33 +11:00
Sam 4929c5db71 FIX: when allow_uncategorized_topics was false, PMs can not be created 2013-10-25 09:33:39 +11:00
Neil Lalonde d149066ac6 Show a warning on admin dashboard if running on an older patch level of ruby 2.0 2013-10-24 18:22:47 -04:00
Neil Lalonde 017efdece5 A form to add ip addresses to be blocked or whitelisted 2013-10-24 17:19:10 -04:00
Robin Ward 61468f6f27 Can assign a parent category to a category. 2013-10-24 17:03:28 -04:00
Robin Ward ee2dd9d24c Working drop downs for category changing 2013-10-24 15:19:15 -04:00
Robin Ward 9adcd1579d Renamed `components` to `lib` in the JS project, as Ember has components and they mean something different. 2013-10-24 12:36:46 -04:00
Philip Kallberg dfd2d36089 cloud66 easydeploy 2013-10-24 16:30:44 +01:00
Manoj 96ae3cdacc Utilize already existing method 'find_by_username_or_email' 
check presence of email using include, dont use =~
 2013-10-24 19:26:06 +05:30
Régis Hanol 3909f93a7e make sure image onebox is case insensitive 2013-10-24 12:21:38 +02:00
Sam b7d3b52e4f basic implementation of per-category new/latest etc filters 2013-10-24 21:05:06 +11:00
Sam 89f801ac04 fix no sidetiq when using demon 2013-10-24 15:58:28 +11:00
Sam 636976e5d4 fix alignment of n person liked this. 2013-10-24 15:30:41 +11:00
Sam cc83b55134 fix incorrect test, that fails if shared test state gets corrupt 2013-10-24 14:55:55 +11:00
Sam 738a25b732 fix failure in rails 4 mode 2013-10-24 13:40:18 +11:00
Sam 3565f4c8cf correct monkey patch, disable it from rails4 mode (that has a proper implementation) 2013-10-24 13:35:21 +11:00
Sam b40d15f81d correct runner so you can run it in non-spork mode 2013-10-24 13:34:38 +11:00
Sam 3e2bd3ca93 fabrication is now released no need to source from git 2013-10-24 13:34:20 +11:00
Sam ff957a7b37 rails 4 deprecation fixes 2013-10-24 13:02:25 +11:00
Sam 6fac09aeaa fix listen version to one that works for us in autospec, TODO upgrade it 2013-10-24 13:02:01 +11:00
Sam 1f42ee98f8 rails 4 + arel upgrade 2013-10-24 12:30:25 +11:00
Sam 24d732b12a regressions post merge 2013-10-24 12:25:20 +11:00
Sam adeb987c70 oops messed up merge 2013-10-24 12:09:49 +11:00
Sam 1357f16563 add a simple runner for autospec 2013-10-24 12:08:03 +11:00
Sam 666264879c change it so all topics MUST include a category, we store a special uncategorized category to compensate 
this cleans up a bunch of internals and removes some settings
 2013-10-24 12:08:02 +11:00
Sam 6f66d4876a rails 4 upgrade 2013-10-24 10:07:37 +11:00
Navin Keswani 6ce80fd148 Refactor User#update_last_seen! and User#update_tracked_topics 2013-10-23 23:27:30 +02:00
Neil Lalonde 8aab2253d0 Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets 2013-10-23 17:11:35 -04:00
Robin Ward cc9b11ecc5 Simple category breadcrumb component 2013-10-23 17:00:02 -04:00
Robin Ward 541620c115 Routes and support for sub-categories 2013-10-23 15:22:49 -04:00
Robin Ward 49a11e51df Ember support for parent categories 2013-10-23 15:22:49 -04:00
Robin Ward c814fc16a3 Database structure to support sub categories 2013-10-23 15:22:49 -04:00
Neil Lalonde bf06014a16 Order by creation time by default in screened ip addresses table 2013-10-23 13:01:50 -04:00
Neil Lalonde 237312dbde Styling on screened ip addresses page 2013-10-23 13:01:50 -04:00
Neil Lalonde 3db7529ad4 More icons on screened ip addresses page 2013-10-23 13:01:50 -04:00
Robin Ward f73a64982a Raise an error if a `api_username` is supplied and does not match the key 2013-10-23 11:05:49 -04:00
Régis Hanol a98d4d9b35 régis' git-fu at his best... 2013-10-23 11:35:27 +02:00
Régis Hanol 3cc08c3b27 fixed JSHINT 2013-10-23 11:27:50 +02:00
Régis Hanol e39242b6ff missed a single quote 2013-10-23 11:25:16 +02:00
Régis Hanol d05547e7f3 fix arrow direction in post incoming links 2013-10-23 11:16:03 +02:00
Régis Hanol a12a1bcc66 bring back attachment icons 2013-10-23 09:52:15 +02:00
Sam 08c08a3bc6 Merge pull request #1568 from ofgeek/patch-1 
Update client.zh_CN.yml
 2013-10-22 23:12:03 -07:00
Sam 9ae4245955 Merge pull request #1565 from awesomerobot/master 
topic page: alignment fixes for replies, minor alignment changes
 2013-10-22 23:09:44 -07:00
Sam d069481235 Merge pull request #1569 from balexand/fix_1567 
Fix #1567; nil reference in spam_rules_enforcer.rb
 2013-10-22 23:08:09 -07:00