Commit Graph

3376 Commits

Author SHA1 Message Date
Régis Hanol d90e0fe66b Merge pull request #3460 from techAPJ/patch-3
FIX: rate limit topic invitations
2015-05-13 12:55:20 +02:00
Arpit Jalan 4324a157e0 FIX: rate limit topic invitations 2015-05-13 14:44:37 +05:30
Jeff Atwood 6de7e7e161 remove incorrect keyboard help text 2015-05-12 23:25:47 -07:00
Neil Lalonde 1c5ea5d8ef Update translations 2015-05-12 17:38:49 -04:00
Régis Hanol 0a41ec59e8 fix substitution - :fired: 2015-05-12 19:43:25 +02:00
Régis Hanol 8c57aef3f8 log the hostname when restarting sidekiq 2015-05-12 19:39:17 +02:00
Marcus Rückert fb25985b91 Mark all files with a shebang line as executable
This is a bit weird with the Rakefiles but makes
it consistent. Found with rpmlint.
2015-05-12 13:21:32 +02:00
Sam 5ef641126f remove s3 deprecation warning, we will continue to support it 2015-05-12 08:27:25 +10:00
Robin Ward 0b65c88003 Upgrade Notifications to fix deprecations and use store 2015-05-11 11:20:45 -04:00
Arpit Jalan 8366b71176 FEATURE: check nofollow setting when showing website 2015-05-11 13:16:21 +05:30
Sam 0b3ad8a3fd Merge branch 'master' of github.com:discourse/discourse 2015-05-07 11:51:09 +10:00
Sam 77cc087b13 FIX: proper error message when account created is hit with no session 2015-05-07 11:00:22 +10:00
Sam d6c06eb547 Get rid of CSRF errors 2015-05-07 10:42:21 +10:00
Arpit Jalan ee960899df Update Translations 2015-05-06 21:32:11 +05:30
Jeff Atwood 6447c6c81d posts -> replies in too_few_topics_notice 2015-05-06 01:33:48 -07:00
Sam cea9cfe49f remove alihack 2015-05-06 16:59:41 +10:00
Sam 2f82caafa2 Add ignore for another type of not found 2015-05-06 16:21:59 +10:00
Sam c96a057395 ignore routing errors on multisite 2015-05-06 12:47:30 +10:00
Sam 19e5304813 add hostname to fake env 2015-05-06 12:28:32 +10:00
Erick Guan b772ff6e13 FEATURE: add slug geneartion options 2015-05-05 18:08:30 +08:00
Sam f58d85edea FEATURE: move stylesheet cache out of the uploads directory 2015-05-05 15:50:13 +10:00
Jeff Atwood b84c4ef0c6 add warning around must_approve_users 2015-05-04 11:33:03 -07:00
Jeff Atwood 8f706f11cb remove trust level reference from flag unhide PM 2015-05-04 01:19:04 -07:00
Jeff Atwood 77992a11b9 correct copy and de-experimental browser icon count 2015-05-03 23:29:56 -07:00
Sam 0369f26a39 add some ignores 2015-05-04 16:12:03 +10:00
Sam 4dfc1907ac Simplify desktop notifications, only include if mention/reply/pm/link
Include post excerpt in the notification
2015-05-04 13:49:32 +10:00
Sam 803feefd54 MessageBus handles readonly redis now, no need to wrap it 2015-05-04 12:21:00 +10:00
Jeff Atwood 83b7620cb2 use pencil glyph on edit history dialog 2015-05-02 03:48:37 -07:00
Jeff Atwood 80003e0821 improve copy for password change token expired 2015-05-01 01:39:53 -07:00
Jeff Atwood bafcfa5b6a Improve password reset expired link copy 2015-05-01 01:30:13 -07:00
Jeff Atwood 7c42cb7c22 "reset password" doesn't exist, forgot does. 2015-05-01 00:52:50 -07:00
Jeff Atwood 6139090e9e improvement to accept invite password instructions 2015-05-01 00:51:17 -07:00
Sam f3188ab8f2 remove unused setting 2015-04-30 12:06:32 +10:00
riking a3338e9798 Missed localization key 2015-04-29 15:06:04 -07:00
Arpit Jalan 787b30c354 Update Translations 2015-04-29 22:38:29 +05:30
Sam fd7c34cfa7 Merge pull request #3409 from zzakcanncode/rails-42
Rails 4.2 and master support and CI
2015-04-29 17:32:19 +10:00
Sam d7d93c20d7 Merge pull request #3406 from techAPJ/patch-2
FEATURE: prefill topic title, body and category via URL
2015-04-29 13:46:26 +10:00
Arthur Neves d2b1cc55b9
Disable raise_in_transactional_callbacks for now 2015-04-28 23:20:08 -04:00
Sam 7bc220956a this quickstart file is confusing and not needed
removing
2015-04-29 13:15:53 +10:00
Arthur Neves 439d0d2e37
Check Rails.version instead of ENV
Like that we can have code that works on multiple Rails versions, and we
dont need to mix a new method on Kernel.
Also, this makes easier to have multiple versions.
For instance, before master was 4.2, which is not the case anymore, so
on the code we should check versions and not Environment variables
2015-04-28 22:27:47 -04:00
Robin Ward 15ea0c4789 Merge pull request #3304 from riking/desktop-notifications
Desktop notifications!
2015-04-28 16:24:02 -04:00
Arpit Jalan cff6e49eb7 FEATURE: prefill topic title, body and category via URL 2015-04-29 00:01:10 +05:30
Sam 729aaa826b Merge pull request #3404 from techAPJ/patch-1
FEATURE: magic login route for admin when SSO is enabled
2015-04-28 07:47:50 +10:00
Robin Ward 8c930c97e0 If there are pending posts in a topic, display a message at the bottom 2015-04-27 15:55:10 -04:00
Robin Ward ecafbb0a63 Can delete users via the moderation queue 2015-04-27 15:06:20 -04:00
Arpit Jalan 2932284293 FEATURE: magic login route for admin when SSO is enabled 2015-04-27 22:54:48 +05:30
Jeff Atwood 04b064cbde add mention of HTML to reply placeholder 2015-04-25 02:48:08 -07:00
Jeff Atwood 6233770e3a period at bottom of topic msg was dangling 2015-04-25 01:40:55 -07:00
Robin Ward 15dbce5886 Show pending posts count in modal when your posts are enqueued 2015-04-24 15:44:59 -04:00
Robin Ward 3a6efa25f0 Allow ReadOnly to propogate up to the Ember app via Response Header 2015-04-24 14:37:16 -04:00