Commit Graph

4928 Commits

Author SHA1 Message Date
Régis Hanol c45adfda9c Merge pull request #1580 from llindemann/master
fix fr localization
2013-10-28 06:26:40 -07:00
lionel 3a1fe9701a fix fr localization 2013-10-28 13:29:26 +01:00
Sam c0d85fa6f9 remove change to readme 2013-10-28 16:36:28 +11:00
Sam bdbc2f590f Merge pull request #1574 from pkallberg/master
Cloud 66 EasyDeploy
2013-10-27 22:35:24 -07:00
Sam 95e936c299 cleanup API for looking up a user by email or username, add specs, fix invalid auto association in open id provider 2013-10-28 16:29:07 +11:00
Sam 370e961a90 add failing test for AMS upgrade 2013-10-28 15:55:27 +11:00
Sam da62a10b77 work around regression in ruby head 2013-10-28 15:13:10 +11:00
Sam 2fa911f133 use DISCOURSE_HOSTNAME instead 2013-10-28 10:35:53 +11:00
Sam 273643adfc allow passing in of hostname in sample file 2013-10-28 10:31:23 +11:00
Sam 88ccd287b4 allow uncategorized category in 2 more spots (hamburger and drop down) 2013-10-28 08:39:55 +11:00
Régis Hanol c77a20eea5 do not deselect text when clicking on the reply button below the post 2013-10-27 19:44:46 +01:00
Neil Lalonde ce2af5c6d1 Show Log In button at the bottom of the page body when login_required and not logged in 2013-10-25 16:08:59 -04:00
Robin Ward f4d9bf9181 Merge pull request #1573 from railsaholic/use_existing_find_by_username_or_email
Utilize already existing method 'find_by_username_or_email'
2013-10-25 12:57:18 -07:00
Robin Ward a3a2c5fa24 FIX: Mobile breadcrumb formatting 2013-10-25 15:44:28 -04:00
Robin Ward e9c4465ec7 FIX: Various bugs with Category breadcrumbs 2013-10-25 15:24:03 -04:00
Neil Lalonde 4e46d91b8d Refactor SpamRulesEnforcer so that each spam rule is in its own class 2013-10-25 13:25:02 -04:00
Neil Lalonde 90938df967 FIX: make it possible to close popup-input-tips on touch devices, and position them a bit better 2013-10-25 11:17:11 -04:00
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
Neil Lalonde 8aab2253d0 Whitelisted ip addresses will not be flagged as spam by flag_sockpuppets 2013-10-23 17:11:35 -04:00