Sam
63435d9bdd
Merge pull request #819 from kubabrecka/cs_update42
...
cs translation update
2013-05-05 16:51:52 -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
Sam
b5e01e5a87
Merge pull request #782 from sanderdatema/dutch_translation
...
Updates to Dutch translation
2013-04-28 19:05:41 -07:00
Régis Hanol
ede9d2a0a8
show diff in post history view
2013-04-29 03:20:51 +02:00
Sander Datema
76e447ff8d
Updates to Dutch translation
...
Updated til commit 9e3b70c20e
2013-04-28 15:42:21 +02:00
Régis Hanol
dca2fbcefc
add meaningful error message on upload [ fixes #773 ]
2013-04-27 20:26:17 +02:00
Neil Lalonde
bbf982984d
Add TOS and Privacy Policy site settings that can link to external sites.
2013-04-26 18:46:36 -04:00
Sam
f9e33ec6b8
store ip address and current user with incoming links
...
make links long an readable in share dialog
2013-04-26 16:18:55 +10:00
Sam
f0d3500ada
Merge pull request #735 from kubabrecka/i18n_user_actions4
...
move i18n of UserActions to JS-side and make sentences translatable (take 3)
2013-04-25 15:53:17 -07:00
Sam
f8c6a47892
Merge pull request #770 from ZogStriP/keep-french-l10n-up-to-date
...
keep French l10n up to date
2013-04-25 15:52:41 -07:00
Jeff Atwood
4dbe25bfc2
very minor new user education copy tweaks
2013-04-25 15:42:03 -07:00
Neil Lalonde
159c9b10d5
Add a nag to admin dashboard if you haven't changed the title site setting from the default 'Discourse'
2013-04-25 17:53:31 -04:00
Régis Hanol
14a99eca12
keep French l10n up to date
2013-04-25 22:29:51 +02:00