Commit graph

14070 commits

Author SHA1 Message Date
riking
6ea2051c4e FIX: Don't ask for notification permission until first one 2015-05-02 12:53:30 -07:00
Jeff Atwood
83b7620cb2 use pencil glyph on edit history dialog 2015-05-02 03:48:37 -07:00
Jeff Atwood
bbb1348118 add Swiftbot to crawler regex 2015-05-02 03:18:58 -07:00
Jeff Atwood
2ead293098 Merge pull request #3419 from techAPJ/patch-1
FIX: include youtube link in embedded comments
2015-05-01 14:54:13 -07:00
Neil Lalonde
8521ee24b1 FIX: /password-reset route now works when login_required is enabled 2015-05-01 11:14:09 -04:00
Régis Hanol
2954c99a1e FEATURE: new 'poll_maximum_options' site setting to limit the number of options in a poll 2015-05-01 16:44:51 +02:00
Régis Hanol
f83638c154 FIX: check the selected options when casting a vote 2015-05-01 16:33:24 +02:00
Régis Hanol
9106331d4f FIX: 'migrate_old_poll' rake task to support options with HTML 2015-05-01 15:53:02 +02:00
Arpit Jalan
23fd16850a FIX: include youtube link in embedded comments 2015-05-01 18:34:45 +05:30
Jeff Atwood
80003e0821 improve copy for password change token expired 2015-05-01 01:39:53 -07:00
Jeff Atwood
0810022caf Merge branch 'master' of https://github.com/discourse/discourse 2015-05-01 01:30:16 -07:00
Jeff Atwood
bafcfa5b6a Improve password reset expired link copy 2015-05-01 01:30:13 -07:00
Régis Hanol
062c72336f Merge pull request #3418 from Elberet/supsup
Apply fix against nested SUP tags to preview
2015-05-01 10:10:13 +02: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
4f1c6a30cd Update logster so it does not crash error reporting where redis is down 2015-05-01 17:21:14 +10:00
Sam
6993fb36ac FIX: distributed cache failing to clear certain values sometimes
this makes the cache resilient to cross machine / forking concerns
2015-05-01 15:25:23 +10:00
Robin Ward
f9069c350f FIX: Permission issues when editing topics
If a user can't create a topic in a category, they should'be be
able to edit topics.
2015-04-30 17:08:12 -04:00
Jens Maier
1a692bee0c Apply fix against nested SUP tags to preview 2015-04-30 23:05:04 +02:00
Robin Ward
886cd41b15 Merge pull request #3417 from techAPJ/patch-2
FIX: flagging topic was giving error message
2015-04-30 16:50:37 -04:00
Arpit Jalan
bb99bd8a03 FIX: flagging topic was giving error message 2015-05-01 02:15:06 +05:30
Neil Lalonde
1b250f1e01 FIX: crawler pages and RSS had broken links for sites deployed to a subfolder with relative_url_root 2015-04-30 12:46:26 -04:00
Régis Hanol
e9b70ac9cb FIX: migrate old polls rake task 2015-04-30 17:08:44 +02:00
Sam
9e16e03198 FIX: text was impossible to quote on Windows Phone 2015-04-30 15:43:39 +10:00
Sam
f3188ab8f2 remove unused setting 2015-04-30 12:06:32 +10:00
Sam
d821550d5d Merge pull request #3414 from riking/notifications-patches
Missed localization key
2015-04-30 10:55:19 +10:00
riking
a3338e9798 Missed localization key 2015-04-29 15:06:04 -07:00
Régis Hanol
202b442b86 FEATURE: new 'poll:migrate_old_polls' rake task 2015-04-29 23:34:40 +02:00
Régis Hanol
1e96a1cd58 fix ruby const warning 2015-04-29 23:33:25 +02:00
Régis Hanol
724f4a1c55 FEATURE: automatically load plugin's rake tasks 2015-04-29 23:32:49 +02:00
Neil Lalonde
98505f8969 Merge pull request #3412 from techAPJ/update-translations
Update Translations
2015-04-29 16:11:22 -04:00
Arpit Jalan
787b30c354 Update Translations 2015-04-29 22:38:29 +05:30
Robin Ward
16408cee06 Allow Postgres to trigger readonly mode for the site. 2015-04-29 11:49:58 -04:00
Régis Hanol
c10a8d481d poll copy 2015-04-29 12:25:54 +02:00
Sam
9b3ec4b8f8 Merge pull request #3410 from lukecaputo/patch-1
Add comment about 64-bit requirement
2015-04-29 17:32:48 +10:00
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
a0a1bcf90f Merge pull request #3399 from zzakcanncode/bump_ams
AMS 0.8.3 was released with the patch we want
2015-04-29 14:32:00 +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
L. Caputo
0cb81f0c75 Add comment about 64-bit requirement
Docket requires a 64-bit installation. This wasn't entirely clear in the guide.
2015-04-28 23:29:16 -04:00
Arthur Neves
fe51b4bcc2
Remove Gemfile_master.lock 2015-04-28 23:25:11 -04:00
Arthur Neves
d2b1cc55b9
Disable raise_in_transactional_callbacks for now 2015-04-28 23:20:08 -04:00
Arthur Neves
338fb6efdd
Test on rails 4.2 and master 2015-04-28 23:20:08 -04:00
Arthur Neves
25e28a1bdd
Add rails42 and remove bundler patch 2015-04-28 23:20:07 -04:00
Godfrey Chan
0887f33d77
Bump to sass-rails 4.0.5 for Rails 4.2 support 2015-04-28 23:19:45 -04:00
Sam
7bc220956a this quickstart file is confusing and not needed
removing
2015-04-29 13:15:53 +10:00
Godfrey Chan
233f56b6aa
AMS 0.8.3 was released with the patch we want 2015-04-28 23:15:26 -04:00
Godfrey Chan
fd5b0bb26b
Remove support for bundler < 1.5 2015-04-28 23:15:26 -04:00
Sam
5c0b6ef19a Merge pull request #3408 from zzakcanncode/rails_v
Check Rails.version instead of ENV
2015-04-29 13:08:18 +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
Neil Lalonde
b2fd69a675 FIX: avatar_template when using relative_url_root 2015-04-28 20:58:46 -04:00