Sam
bb7a2da224
update psuedo locale
2013-05-06 10:48:30 +10:00
Sam
57950a9d2f
Merge branch 'master' of github.com:discourse/discourse
2013-05-06 10:47:16 +10:00
Sam
b3769b1bba
am serializer update
2013-05-06 10:46:58 +10:00
Sam
63435d9bdd
Merge pull request #819 from kubabrecka/cs_update42
...
cs translation update
2013-05-05 16:51:52 -07:00
Sam
8d42bf536b
Merge pull request #820 from ZogStriP/keep-french-l10n-up-to-date-2013-05-04
...
keep French l10n up to date [ci-skip]
2013-05-05 16:51:30 -07:00
Sam
caa3cae535
remove pointless to_sym
2013-05-06 09:51:09 +10:00
Sam
f9ea5ab20b
Merge pull request #821 from piglop/define-method-fix
...
Fix for Debian Ruby 1.9
2013-05-05 16:45:30 -07:00
Sam
8d1687d9d5
Merge pull request #822 from ZogStriP/prepend-the-username-in-participants-title
...
prepend the username in the participant alt-text in the topic list
2013-05-05 16:44:35 -07:00
Régis Hanol
4470c05457
prepend the username in the participant alt-text in the topic list
2013-05-06 01:00:44 +02:00
Michael Witrant
6018c2f98b
use symbols in redis proxy methods
2013-05-05 15:58:37 +02:00
Michael Witrant
2031b69e6e
use method name instead of __method__ (which is wrong in this situation on Debian Squeeze Ruby 1.9)
2013-05-05 13:34:54 +02:00
Régis Hanol
82450ac67e
keep French l10n up to date
2013-05-05 01:34:57 +02:00
Kuba Brecka
62ef89dfc9
cs translation update
2013-05-04 21:57:41 +02:00
Sam
69db4ab967
Merge pull request #816 from ngpestelos/master
...
use HTTP URL to check out active_model_serializers
2013-05-03 17:52:19 -07:00
Nestor G Pestelos Jr
5dd5567218
use HTTP URL to checkout active_model_serializers (fails during bundle)
2013-05-04 08:27:36 +08:00
Neil Lalonde
5b33992604
Fix a case when editing uncategorized all the hidden form controls become visible
2013-05-03 18:58:07 -04:00
Neil Lalonde
52942d2de6
Merge pull request #813 from slainer68/ga_domain_name
...
Google Analytics Domain name site setting
2013-05-03 14:57:01 -07:00
Neil Lalonde
c6370a3479
Add ability to edit the uncategorized category name, color, and text_color in a modal
2013-05-03 17:55:04 -04:00
Neil Lalonde
74a238b7e9
Version bump to v0.8.9
2013-05-03 16:42:29 -04:00
slainer68
ac66f25043
Google Analytics Domain name site setting
2013-05-03 21:58:10 +02:00
Neil Lalonde
16bc215c68
Make enter key work to submit the signup form
2013-05-03 12:33:08 -04:00
Neil Lalonde
3c322e6d3d
Reply button at bottom of topic doesn't ask you to abandon your post when you click it more than once
2013-05-03 12:13:34 -04:00
Neil Lalonde
cc60343d31
Update discourse.pill.sample to match the nginx.sample.conf
2013-05-03 10:59:46 -04:00
Neil Lalonde
c790d653c9
Merge pull request #811 from emberjs-cn/update-zh-locales
...
Updated the zh locales
2013-05-03 07:43:47 -07:00
Tower He
fec26c1d29
Updated the zh locales
2013-05-03 20:21:50 +08:00
Sam
dcfa9db84b
Merge pull request #805 from kubabrecka/cs_update41
...
cs translation update
2013-05-03 03:39:31 -07:00
Sam
92cf36b42d
Merge pull request #808 from 9034725985/patch-1
...
In client.en.yml, add a comma after a leading sorry
2013-05-03 03:38:53 -07:00
Sam
0685d3f84a
Merge pull request #807 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-05-03 03:38:03 -07:00
Sam
aff4839075
Merge pull request #809 from goodbrews/capistrano-samples
...
Add sample Capistrano deployment files
2013-05-03 03:37:31 -07:00
Sam
3eab0be4a8
deleting posts as an admin was bust
2013-05-03 17:56:23 +10:00
Sam
42494b5bb1
we can't trust CSRF for anon the way it is designed.
...
The page they have loaded may be cached we need a different way of delivering the CSRF potentially
2013-05-03 16:43:11 +10:00
David Celis
5d014c633b
Add sample Capistrano deployment files
...
Add the following sample Capistrano configuration files to ease
deployment to a VPS using Capistrano:
* `config/deploy.rb.sample`
* `config/thin.yml.sample`
* `Capfile.sample`
The sample Capfile will additionally load any recipes provided by
Discourse plugins.
Signed-off-by: David Celis <me@davidcel.is>
2013-05-02 19:53:37 -07:00
Kushal
2648039a99
In client.en.yml, add a comma after a leading sorry
...
Add a comma after the leading sorry to keep things consistent.
2013-05-02 20:10:00 -05:00
Sam
4d2c28e8b2
added setting to flush redis if you feel like doing so in dev
2013-05-03 09:56:10 +10:00
Sam
3ca263568e
Merge pull request #806 from ZogStriP/clear-pin-link-in-list-topics-view
...
Add a clear pin link in the list topics view
2013-05-02 16:45:46 -07:00
Régis Hanol
3a0e41ab90
keep French l10n up to date
...
🇫🇷
2013-05-03 00:04:04 +02:00
Régis Hanol
63b221970d
Add a clear pin link in the list topics view
2013-05-02 23:31:43 +02:00
Neil Lalonde
7b44c83b50
Trying to improve dashboard layout with the referral stats on the right
2013-05-02 11:52:37 -04:00
Sam
40f631b5c1
fix style
2013-05-02 22:29:45 +10:00
Kuba Brecka
9dceef3fa6
cs translation update
2013-05-02 12:27:43 +02:00
Sam
99283e757f
staff rename forgotten
2013-05-02 20:08:32 +10:00
Sam
cb9a89940a
display admin/mod status on user page
2013-05-02 17:40:44 +10:00
Sam
5ec52bd2e9
:s/moderator?/staff/g ... our naming was kind of crazy, renamed moderator? to staff
2013-05-02 17:22:27 +10:00
Sam
65cd00cf25
moderators now have teeth, more at http://meta.discourse.org/t/moderator-permission-set/6307/5
...
allow pms to be targetted at groups
2013-05-02 15:15:53 +10:00
Sam
e59ab32210
Merge pull request #800 from goodbrews/imgur-api-v3
...
Update to Imgur API v3
2013-05-01 21:52:00 -07:00
David Celis
6be26f5316
Update to Imgur API v3
...
Version 2 of Imgur's API is deprecated. Their documentation for v2 is no
longer online, and applications can only be registered under version 3.
Version 3 of their API has a slightly different endpoint but, more
importantly, uses a Client ID/Secret pair instead of an API Key.
This PR updates Discourse to use the new version of Imgur's API.
Signed-off-by: David Celis <me@davidcel.is>
2013-05-01 21:39:10 -07:00
Jeff Atwood
d6feb8f37f
Merge pull request #804 from ZogStriP/fix-when-topic-is-closed-you-can-still-invite-someone-to-reply
...
FIX: when topic is closed, you can still invite someone to reply
2013-05-01 18:07:09 -07:00
Régis Hanol
f71f7d166c
FIX: when topic is closed, you can still invite someone to reply
2013-05-02 02:22:54 +02:00
Sam
3bf3b130cc
Merge pull request #798 from kubabrecka/cs_update40
...
cs translation update
2013-05-01 16:35:04 -07:00
Sam
10a3374cf4
Merge pull request #799 from Supermathie/freebsd-ps
...
message_bus: support ps on FreeBSD
2013-05-01 16:34:31 -07:00
