Commit Graph

2192 Commits

Author SHA1 Message Date
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
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 72aee82a07 Merge pull request #803 from ZogStriP/remove-rounded-corners-on-images-in-posts
removes rounded corners on images in posts
2013-05-01 16:27:13 -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
Régis Hanol f67f62ccb2 removes rounded corners on images in posts 2013-05-02 01:20:12 +02:00
Neil Lalonde 3c7afeb233 Fix incoming links dashboard data when topic record can't be found 2013-05-01 19:10:31 -04: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
Michael Brown 132ee8a8e2 message_bus: support ps on FreeBSD 2013-05-01 14:29:57 -04: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
Sam e4a76812a6 this is a slightly round about way of making our self oneboxes sane
shrunk avatar to 60px, added global whitelisting
2013-05-01 16:38:13 +10:00
Jeff Atwood 67372a8a0d simplify pinning message a bit 2013-04-30 22:52:35 -07:00
Sam 3b784b50cc correct base url in emoji so I can close bug 2013-05-01 11:16:13 +10:00
Sam e5c5c0bbb3 no_js to use site customisations 2013-05-01 11:04:47 +10:00
Sam 08ce46e7ed :s/POST/REPLY/g 2013-05-01 10:52:31 +10:00
Sam fc07fcbd9d oops 2013-05-01 10:34:22 +10:00
Sam 8b419794f9 added option to force polling instead of messing with the detection 2013-05-01 10:29:39 +10:00
Sam 2c4bd484af vagrant detection attempt 2013-05-01 10:04:47 +10:00
Sam 7276542231 firefox used to display "loading..." on back sometimes 2013-05-01 09:49:28 +10:00
Sam 58dbfa1b91 Merge pull request #796 from ZogStriP/fix-shift-clicks-on-links
FIX: shift+click on links
2013-04-30 16:02:24 -07: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
Jeff Atwood 51f16333be increase default max_likes to 50
WE LIKE LIKES MAN
2013-04-30 12:45:27 -07:00
Neil Lalonde 20d73a4151 Fix bookmarks admin dashboard counts to include bookmarks that were deleted 2013-04-30 12:52:12 -04:00
Neil Lalonde 6f0d68fe5f Align star to the top of the line in topic list for topics showing excerpts 2013-04-30 12:35:41 -04:00
Neil Lalonde ea5d86a533 Remove imdb onebox for legal reasons 2013-04-30 11:59:22 -04:00