Commit Graph

3147 Commits

Author SHA1 Message Date
Sam e53aa45f54 I think this is more correct, admins/mods should always be able to invite 2013-06-21 16:35:27 +10:00
Amos L King 777e8c2012 Correct spelling of suppress
supress => suppress

Amos King @adkron <amos.l.king@gmail.com>
2013-06-20 23:44:27 -05:00
James A. Anderson 7835b71a9c HTML5 video fallsback to link 2013-06-21 00:12:51 -04:00
James A. Anderson 974634bbe9 Add video onebox support 2013-06-20 23:52:28 -04:00
Jeff Atwood 8b51b8c778 Merge pull request #1063 from Supermathie/sysadmin-docs
Comment out example anti-hotlinking rules
2013-06-20 20:27:56 -07:00
Michael Brown 836ebbaa8e Comment out example anti-hotlinking rules 2013-06-20 22:49:04 -04:00
Dan Johnson 8009b3f036 Use "command -v" to test for convert instead of "which -s" 2013-06-20 21:42:18 -04:00
Sam 9778bfb749 Merge pull request #1059 from vipulnsward/fix_method_typo
`fake_success_reponse` => `fake_success_response`
2013-06-20 18:23:46 -07:00
Jeff Atwood 61a72c6835 Merge pull request #1060 from ZogStriP/add-background-color-on-suggested-topic-list-header
add background color on suggested topics list header
2013-06-20 14:27:12 -07:00
Régis Hanol da6f627c2f add background color on suggested topics list header 2013-06-20 23:22:46 +02:00
Neil Lalonde f39f44ddbf Categories page should not show invisible topics 2013-06-20 16:07:53 -04:00
Vipul A M 1884dc8d3f `fake_success_reponse` => `fake_success_response` 2013-06-21 01:17:35 +05:30
Neil Lalonde 42564c9ce7 Mods can edit categories 2013-06-20 15:09:31 -04:00
Robin Ward 3257bef387 Category List and Topic View Integration Test 2013-06-20 15:02:26 -04:00
Jeff Atwood 3775a9c11d shorter copy to fit on /admin better 2013-06-20 11:51:24 -07:00
Jeff Atwood 6a9a294b09 add back dynamic h1 sizing, but ONLY top title 2013-06-20 11:39:58 -07:00
Robin Ward d78898443d Oops: Forgot debugging information in scrolling handlers 2013-06-20 14:32:22 -04:00
Robin Ward a8b5716421 FIX: Coudln't scroll while on Qunit page due to browser bindings 2013-06-20 14:29:59 -04:00
Robin Ward 4cd71972be Cleaned up QUnit test structure 2013-06-20 13:58:54 -04:00
Robin Ward 0e984762d5 Oops, forgot to check in the email fixtures :P 2013-06-20 13:07:42 -04:00
Robin Ward cc90939aa8 Merge pull request #1056 from cezarcp/text_logo
Allow to use a text logo when logo_url setting is set to an empty value
2013-06-20 10:00:47 -07:00
Robin Ward 6c37a8f8fb Merge pull request #1055 from vipulnsward/dedeuplicate_app_controller
Remove code duplication in ApplicationController
2013-06-20 09:55:09 -07:00
Robin Ward 4aa20cf23c Merge pull request #1053 from vipulnsward/remove_var
Remove unused var.
2013-06-20 09:54:34 -07:00
Neil Lalonde 88a9e13510 Don't create globals in i18n.js 2013-06-20 12:47:50 -04:00
Robin Ward 0d10b5c9c4 More email receiving logic 2013-06-20 12:38:37 -04:00
Neil Lalonde 94853f0295 Fix length check of pm body; refactor composer length and title length validation 2013-06-20 12:33:34 -04:00
Vipul A M 4ddc0825f5 Remove code duplication in ApplicationController 2013-06-20 21:17:33 +05:30
Cezar 132b0498ed added a conditional that checks if the logo_url setting is empty. In that case, the logoHTML function returns a header tag with the site_title as its content 2013-06-20 12:28:52 -03:00
Vipul A M 5e5ef9cafd Remove unused var. 2013-06-20 20:58:05 +05:30
Robin Ward 9f3d5b9f1e Merge pull request #1044 from ZogStriP/clean-orphan-uploaded-files
added a rake task to clean orphan uploaded files
2013-06-20 07:53:50 -07:00
Robin Ward 8e6a903f9b Merge pull request #1046 from house9/admin-user-index-2
extract Admin::UsersController#index to its own query class
2013-06-20 07:52:22 -07:00
Robin Ward 2e7c5a674c Merge pull request #1049 from ZogStriP/admin-alerts
Admin alerts
2013-06-20 07:51:40 -07:00
Robin Ward 7641b3f3ef Merge pull request #1052 from abbat/master
Force UTF-8 charset in nginx error pages
2013-06-20 07:43:00 -07:00
Anton Batenev 007badf79b Force UTF-8 charset in nginx error pages
Prepare nginx error pages for automated translation where English
version used as base template for other locales
2013-06-20 14:54:43 +04:00
Jeff Atwood a546472775 remove extra box around TH on topic lists
this is mostly to make /categories less visually noisy
2013-06-20 01:39:32 -07:00
Sam 70683c1f09 Merge pull request #1034 from chrishunt/rebake-oneboxes
Optionally rebake oneboxes with posts:rebake task
2013-06-20 01:18:57 -07:00
Sam 14db3869ba Merge pull request #1050 from abbat/master
Russian translation (actual version)
2013-06-20 01:17:53 -07:00
Sam 91a1864a53 fix invalid tests due to formatting rule changes 2013-06-20 18:00:31 +10:00
Sam cb1b956ac2 we need overflow auto on code blocks 2013-06-20 17:46:18 +10:00
Sam 08df4c41cc Merge branch 'master' of github.com:discourse/discourse 2013-06-20 17:42:29 +10:00
Sam 4a8a663a67 flagging workflow changes per http://meta.discourse.org/t/we-need-an-archive-flag-notification-button/7450 2013-06-20 17:42:15 +10:00
Sam d176b1d723 A simple setup dev enviroment script 2013-06-20 15:55:18 +10:00
Anton Batenev f1a1b8ca11 Russian translation (actual version) 2013-06-20 03:44:07 +04:00
Jeff Atwood 6424a3d3e1 remove max-width on h1, seems unnecessary? 2013-06-19 16:31:18 -07:00
Jeff Atwood f1fd29003d switch medium time format to "mins" vs "minutes" 2013-06-19 16:09:57 -07:00
Jeff Atwood da582fc202 switch bookmark from yellow to blue 2013-06-19 16:01:39 -07:00
Neil Lalonde c2568d9a63 Version bump to v0.9.3.5 2013-06-19 18:36:32 -04:00
Robin Ward 285e27fe84 OOPS: Invalid YAML 2013-06-19 18:22:14 -04:00
Robin Ward 7772ef7529 Change travis to use qunit 2013-06-19 18:19:36 -04:00
Robin Ward 8c4aac7f94 Migrate all jasmine specs to Qunit. Removed Jasmine. 2013-06-19 18:18:35 -04:00