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
Gerhard Schlager
1023badd90
Simplify the pull_translations script
...
- There's no need for configuring "trans.<lang>" for each resource.
Using the global "lang_map" in the Transifex client config is enough.
- The Transifex client can rename locales. No need to do this manually.
- Pull all translation files for each locale that has a file named
config/locales/client.<lang>.yml. Up until now the script did only
update existing files, but didn't add missing ones. That is why there
are so many translation files for the poll plugin missing.
2015-04-30 22:32:12 +02:00
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
Robin Ward
3252bf1252
FIX: Desktop Notifications break Qunit tests
...
We should figure out why they can't run without the conditional in a
browser.
2015-04-28 19:24:32 -04:00
Robin Ward
e361916138
FIX: :fired: @eviltrout
2015-04-28 16:30:14 -04:00
Robin Ward
15ea0c4789
Merge pull request #3304 from riking/desktop-notifications
...
Desktop notifications!
2015-04-28 16:24:02 -04:00
Robin Ward
647dd76ba1
Extract the needs_approval? logic
2015-04-28 16:14:36 -04:00
Robin Ward
c2f7676370
Support for custom reasons for things being queued for approval
2015-04-28 15:06:47 -04:00
Robin Ward
cf0c2d09d4
Handlers can be added with a priority
2015-04-28 15:06:47 -04:00
Arpit Jalan
cff6e49eb7
FEATURE: prefill topic title, body and category via URL
2015-04-29 00:01:10 +05:30
Régis Hanol
5783e908ea
FIX: Erratic behaviour when clicking an attachment link - Take 2
2015-04-28 20:05:41 +02:00
Robin Ward
2cbcd15789
FIX: Post Mannager wasn't being used for email replies
2015-04-28 13:04:34 -04:00
