Commit Graph

768 Commits

Author SHA1 Message Date
Sam 0a66c4db3c Merge pull request #878 from emberjs-cn/update-zh-locales
Updated zh locales
2013-05-21 23:02:45 -07:00
Sam d2b3f3d124 some helper files for vim 2013-05-22 15:48:48 +10:00
Tower He 795de0c2d0 Updated zh locales 2013-05-22 13:45:32 +08:00
Joe Bew 088b5483f9 Updated Italian translation 2013-05-21 19:46:24 +02:00
Robin Ward 6f3629d65b Merge pull request #866 from ZogStriP/keep-french-l10n-up-to-date-2013-05-20
keep French l10n up to date
2013-05-21 06:30:53 -07:00
Robin Ward c9dc23dfb0 Merge pull request #863 from joebew42/it
Server side Italian translation updated
2013-05-21 06:29:54 -07:00
John Joseph Bachir 7ece167159 redis configurable via ENV
Change heroku docs and tweak redis.yml.sample var name
to accmodate setting redis provider url via configs.
2013-05-20 20:41:33 -04:00
Jeff Atwood 0b4fc7ebed improve flag threshold reached message slightly 2013-05-20 17:16:35 -07:00
Régis Hanol 7594aef906 keep French l10n up to date
🇫🇷
2013-05-21 00:46:24 +02:00
Jeff Atwood 9f96a4fc58 get the select copy to fit on 1 line 2013-05-20 13:55:08 -07:00
Joe Bew 30fed99d0a Server side Italian translation updated 2013-05-20 19:15:29 +02:00
Sam e91ed83586 the private message stream is different to normal streams, improving the ui a bit and collapsing conversations 2013-05-20 16:44:06 +10:00
Jeff Atwood c5b2fd8067 simplify spam flag reason text 2013-05-18 00:47:58 -07:00
Jeff Atwood 7cf3f16d62 add YAML lint hint to the top of lang YAML files 2013-05-17 16:54:07 -07:00
Sam 6f2e74b31e Merge pull request #855 from sanderdatema/dutch_translation
Dutch translation updated
2013-05-17 15:58:20 -07:00
Neil Lalonde f3282e33a3 Add tabs to category create/edit modal. Categories can have a default auto-close setting that applies to all new topics created in the category. Add rspec-given and write some integration tests. Tests for topic auto-close with category default 2013-05-17 11:05:35 -04:00
Sander Datema 2f976365a5 Dutch translation updated
Up til commit dd400bb
2013-05-17 10:20:52 +02:00
Jeff Atwood 737e16f7e0 remove "Logs" from Email Logs title on admin 2013-05-16 17:20:12 -07:00
Sam be391e18fd Merge pull request #853 from joebew42/joe
Updated client side Italian translation
2013-05-16 16:33:34 -07:00
Régis Hanol 64ba7c75f4 keep French l10n up to date
🇫🇷
2013-05-17 00:20:23 +02:00
Robin Ward a80ec535a3 Support for "Select All / Deselect All" while selecting posts to merge / delete. 2013-05-16 16:50:38 -04:00
Robin Ward 7daca77443 Remove modal state to choose move type. Instead use two buttons on the multi select popup, one
for split and one for merge.
2013-05-16 14:22:41 -04:00
Giuseppe Leone e7b7c89554 Updated client side Italian translation 2013-05-16 20:19:05 +02:00
Robin Ward d554a59102 Support for a new site setting: `newuser_spam_host_threshold`. If a new user posts a link
to the same host enough tiles, they will not be able to post the same link again.

Additionally, the site will flag all their previous posts with links as spam and they will
be instantly hidden via the auto hide workflow.
2013-05-16 12:19:50 -04:00
Sam 19cc930cb1 Merge pull request #848 from ZogStriP/keep-french-l10n-up-to-date-2013-05-14
keep French l10n up to date
2013-05-15 22:16:24 -07:00
Sam e9ebadb414 Nuke message_bus_observer move to service class and classes
Secure all messages triggered by post creation and all user actions so they don't leak
(meaning, if you have a browser open and secure topics are created you will only get them if you are allowed to see them)
2013-05-16 15:03:16 +10:00
Régis Hanol fe18527989 keep French l10n up to date
🇫🇷
2013-05-15 02:01:31 +02:00
Robin Ward f1b4ecfdc9 Change help text to indicate you can search by id or url 2013-05-14 16:12:48 -04:00
Jeff Atwood 077df288db drop 'site' from top title for settings/content 2013-05-14 13:09:05 -07:00
Jeff Atwood c69eccab90 better multi-select help text 2013-05-14 13:04:38 -07:00
Neil Lalonde 674818a26a Add a link to sidekiq in the dashboard message warning about failed email jobs 2013-05-14 11:21:52 -04:00
Sam a613347100 this warning is getting in the way of my presentation 2013-05-14 15:20:28 +10:00
Neil Lalonde 957d95c1cc Fix rerender of topic close message when you navigate away from a closing topic 2013-05-13 16:25:17 -04:00
Neil Lalonde b7cdee4d5c Add title tag to the admin options button in the composer 2013-05-13 16:25:17 -04:00
Neil Lalonde d3f19817aa Add 'automatically' to the auto-close notification 2013-05-13 13:32:37 -04:00
Neil Lalonde 9828c87525 Topic Auto-Close: admins and mods can set a topic to automatically close after a number of days 2013-05-13 12:53:52 -04:00
Robin Ward 87469fa4b7 Fix broken YML 2013-05-13 10:29:52 -04:00
Sander Datema 0a20538f75 Updated Dutch translation
Updated til commit e661871aea
2013-05-13 12:57:06 +02:00
Zach Latta 23d208bb96 Changed failing_emails_warning to reflect the real location of production.rb. 2013-05-10 20:59:51 -06:00
Robin Ward adb76ad49b Merge pull request #840 from ZogStriP/keep-french-l10n-up-to-date
keep French l10n up to date
2013-05-10 15:53:17 -07:00
Robin Ward cf01c98d81 Experimental: Interface to Move Posts to an Existing Topic 2013-05-10 14:55:51 -04:00
Régis Hanol af773ab4ea keep French l10n up to date 2013-05-10 15:48:47 +02:00
Kuba Brecka b029417644 cs translation update 2013-05-10 09:02:51 +02:00
Sam 942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Régis Hanol 16c8836977 keep French l10n up to date 2013-05-10 00:22:02 +02:00
Sam 5280b3a01b more group progress, UI getting there, controller mostly done
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
2013-05-09 17:37:34 +10:00
Robin Ward 2ba08d23cb Merge pull request #831 from kubabrecka/cs_update43
cs translation update
2013-05-08 07:40:58 -07:00
Robin Ward d458e00197 Merge pull request #832 from kubabrecka/kb_fix
max_upload_size_kb is in "kB" not "kb"
2013-05-08 07:39:51 -07:00
Robin Ward 4e16badeae Merge pull request #833 from kubabrecka/admin_api_l10n
Localize admin API section
2013-05-08 07:39:02 -07:00
Neil Lalonde f35a44aeae Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account 2013-05-08 10:10:47 -04:00
Kuba Brecka 05bc63b102 Localize admin API section 2013-05-08 09:13:10 +02:00
Kuba Brecka 09221bb72e max_upload_size_kb is in "kB" not "kb" 2013-05-08 08:43:47 +02:00
Kuba Brecka 0f4b443317 cs translation update 2013-05-08 08:37:34 +02:00
Sam 6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam b26057292e change md route to raw 2013-05-08 10:26:55 +10:00
Sam 68e6405aca redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version 2013-05-07 17:33:04 +10:00
Sander Datema 1b1cd0973d Dutch translation updated
Updated til commit e70526d851
2013-05-06 19:44:44 +02:00
Neil Lalonde 69be7d0ad1 Change the title Visits to Clicks in referral tables on admin dashboard 2013-05-06 11:56:35 -04:00
Sam 872866744f Merge pull request #812 from goodbrews/capistrano-samples
Link to helpful article on Capistrano deployment
2013-05-05 17:51:17 -07:00
Sam bb7a2da224 update psuedo locale 2013-05-06 10:48:30 +10:00
Sam 63435d9bdd Merge pull request #819 from kubabrecka/cs_update42
cs translation update
2013-05-05 16:51:52 -07:00
David Celis 1ac0788cf8 Link to helpful article on Capistrano deployment
@SamSaffron mentioned in #809 he wouldn't mind me linking to a helpful
article on Capistrano deployment in those sample files. My totally
unbiased opinion is that the one I've committed here is the best one.
😉

Signed-off-by: David Celis <me@davidcel.is>
2013-05-05 08:38:27 -07: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
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
slainer68 ac66f25043 Google Analytics Domain name site setting 2013-05-03 21:58:10 +02: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
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
Régis Hanol 3a0e41ab90 keep French l10n up to date
🇫🇷
2013-05-03 00:04:04 +02:00
Kuba Brecka 9dceef3fa6 cs translation update 2013-05-02 12:27:43 +02: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
Sam 3bf3b130cc Merge pull request #798 from kubabrecka/cs_update40
cs translation update
2013-05-01 16:35:04 -07:00
Sam 7b0a02c273 Merge pull request #801 from goodbrews/clockworkd-fix
Allow clockwork to be run using the daemons gem
2013-05-01 16:27:51 -07:00
Sam 43c767fb0d Merge pull request #802 from ZogStriP/keep-french-l10n-up-to-date
keep French l10n up to date
2013-05-01 16:22:40 -07:00
Neil Lalonde 38ed86d0c5 Add reports for IncomingLinks on admin dashboard 2013-05-01 18:12:02 -04:00
Régis Hanol 2c1b75fc36 keep French l10n up to date
🇫🇷
2013-05-02 00:07:23 +02:00
David Celis eb8cbaa91b Allow clockwork to be run using the daemons gem
Clockwork ships with a helpful clockworkd executable, which uses the
daemons gem to daemonize clockwork. This provides an easy way to
start/stop/restart a deamonized clockwork process when deploying to
production servers manually. However, the daemons gem unfortunately does
funky things to the working directory that was preventing the
application from booting. Changing this `require` line to using
`require_relative` solves the issue and makes Discourse easier for Rails
devs to deploy to their own VPSes using, say, Capistrano.

Signed-off-by: David Celis <me@davidcel.is>
2013-05-01 14:10:51 -07:00
Neil Lalonde 5f4dbd6ddc Use tos_url site setting in flag modal if it's set 2013-05-01 11:49:18 -04:00
Kuba Brecka ed68a1ec81 cs translation update 2013-05-01 15:41:31 +02:00
Jeff Atwood 67372a8a0d simplify pinning message a bit 2013-04-30 22:52:35 -07:00
Sam 08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Jeff Atwood 180c021940 normalize on "private message" vs "conversation" 2013-04-30 13:54:14 -07:00
Jeff Atwood 6d19db23bb too many pleases 2013-04-30 13:29:03 -07:00
Sam cef9a74053 route for markdown /md/topic_id/post_number 2013-04-30 16:30:41 +10:00
Jeff Atwood 50349e84fe incorrect copy on Markdown linebreak setting 2013-04-29 15:12:12 -07:00
Neil Lalonde 442be64d5e Show an excerpt of a pinned topic's body in the topic list 2013-04-29 16:37:19 -04:00
Sam 56a6c96f38 same as previous commit, but with more force 2013-04-29 17:11:20 +10:00
Sam f44fe3e689 dear smoke test, I love you, thanks ... the management 2013-04-29 16:52:56 +10:00