Commit graph

790 commits

Author SHA1 Message Date
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
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
Neil Lalonde
a62fbb1b95 Merge pull request #761 from kubabrecka/cs_update39
cs translation update
2013-04-24 12:03:55 -07:00
Neil Lalonde
db2de1eff0 Add contact_email to site settings 2013-04-24 11:15:47 -04:00
Kuba Brecka
9651bec37c cs translation update 2013-04-24 12:59:05 +02:00
Sam
155348ca4c Merge pull request #760 from ZogStriP/keep-french-l10n-up-to-date-2013-04-23
keep French l10n up to date
2013-04-24 03:19:19 -07:00
Sam
37867af1bb track incoming links, amend share link to include user
fix pm styling
2013-04-24 18:05:35 +10:00
Sam
a0665105ec spring config 2013-04-24 12:02:36 +10:00
Régis Hanol
4d6f6a8322 keep French l10n up to date 2013-04-24 02:09:36 +02:00
Neil Lalonde
72508d459b Use heat map on views column in topic lists 2013-04-23 15:06:13 -04:00
Neil Lalonde
06e5083950 Dashboard links to list of admins and moderators; Move a bunch of ember routes into one file: admin_users_list_routes.js 2013-04-23 12:07:58 -04:00
Neil Lalonde
fe1b979c65 Admin Dashboard: click numbers in Users per Trust Level table to see a list of the users 2013-04-23 10:41:40 -04:00
Sam
726c28d776 Merge pull request #754 from slainer68/rack-cors
Implements support for rack-cors for API JavaScript access in the end-user browser
2013-04-22 20:11:09 -07:00
Jeff Atwood
1c41d46fa3 improve new user welcome message a bit 2013-04-22 16:42:39 -07:00
Neil Lalonde
7257d65082 Add warning to dashboard if using default logo or favicon 2013-04-22 15:38:48 -04:00
Neil Lalonde
439877bdb9 Show a warning if there are email jobs in the retry queue 2013-04-22 13:37:16 -04:00
Neil Lalonde
ae487e740c Add a dashboard warning when sidekiq queue has more than 100 jobs 2013-04-22 13:02:24 -04:00
slainer68
467c76b2c0 Implements support for rack-cors for API JavaScript access in end-user browser 2013-04-22 11:16:58 +02:00
Sam
cfc62dadff speed up tests
add the ability to find the first notify private message
2013-04-22 17:45:03 +10:00
Sander Datema
c04013c89b Updates to Dutch translation 2013-04-21 10:59:38 +02:00
Jeff Atwood
e661871aea Merge pull request #744 from ypxu/localized-help
update locales on client for zh_CN and zh_TW
2013-04-20 22:18:53 -07:00
Jeff Atwood
14432e5a1a Merge pull request #745 from kubabrecka/cs_update38
cs translation update
2013-04-20 22:18:18 -07:00
Régis Hanol
3743287f12 keep French l10n up to date 2013-04-20 23:14:02 +02:00
Kuba Brecka
ff18d287ab cs translation update 2013-04-20 18:28:17 +02:00
Yingpeng Xu
b2b9320706 update locales on client for zh_CN and zh_TW 2013-04-20 08:39:55 -07:00
Jeff Atwood
1d341b8ca5 drop "Admin" from "Admin Dashboard" 2013-04-19 22:37:02 -07:00
Jeff Atwood
024791a80e simplify admin user view a tad 2013-04-19 22:34:11 -07:00
Jeff Atwood
8c8784abb6 simplify user profile layout, bold labels 2013-04-19 15:06:35 -07:00
Jeff Atwood
d44b73c17a I said constructive criticism, YOU DOUBLE HITLERS 2013-04-19 12:24:22 -07:00
Jeff Atwood
0739e13cb0 copyedits on new user JIT education panel 2013-04-19 12:21:51 -07:00
Jeff Atwood
d3bde70677 better flag post action description 2013-04-19 11:15:56 -07:00
Sam
6ae212235c move persona a bit, still should be yanked out further 2013-04-19 10:34:39 +10:00
Sam
4cea92c4e9 work in progress add support for groups 2013-04-19 10:34:39 +10:00
Sam
a6170db443 change text to notify when you are notifying in the flag dialog 2013-04-19 10:34:06 +10:00
Kuba Brecka
002951fc31 cs translation update 2013-04-18 23:06:03 +02:00
Neil Lalonde
5cd6c85e8b Add bookmarks and favorites to dashboard stats 2013-04-18 14:27:22 -04:00
Neil Lalonde
5e643b5d49 Merge pull request #733 from sanderdatema/dutch_translation
Updated Dutch translation
2013-04-18 09:30:04 -07:00
Neil Lalonde
c07942763a Merge pull request #734 from kubabrecka/extract_title1
extracting one more hardcoded title
2013-04-18 09:29:30 -07:00
Neil Lalonde
4cec82f416 Merge pull request #731 from kubabrecka/extract_titles
extracting some hardcoded title="..." strings
2013-04-18 09:29:03 -07:00
Neil Lalonde
16efcbb4f0 Merge pull request #730 from kubabrecka/cs_update35
cs translation update server side
2013-04-18 09:25:10 -07:00
Neil Lalonde
fa6a2a110f Merge pull request #729 from kubabrecka/cs_update34
cs translation update client side
2013-04-18 09:24:55 -07:00
Neil Lalonde
12fe659b96 Merge pull request #728 from ypxu/localize-help
localize composer toggler help text for zh_CN and zh_TW
2013-04-18 09:24:29 -07:00
Kuba Brecka
d355e42d73 move i18n of UserActions to JS-side and make sentences translatable (take 3) 2013-04-18 12:08:13 +02:00
Kuba Brecka
38ea6cff62 extracting one more hardcoded title 2013-04-18 11:24:47 +02:00
Sander Datema
935c478484 Updated Dutch translation
Both server and client side, except for TOS.
2013-04-18 10:58:20 +02:00
Kuba Brecka
2901b5bbef extracting some hardcoded title="..." strings 2013-04-18 10:42:29 +02:00
Kuba Brecka
b8bbf7d3fa cs translation update 2013-04-18 10:13:00 +02:00
Kuba Brecka
bc4144c82b cs translation update 2013-04-18 10:03:10 +02:00
Yingpeng Xu
c48aa487e3 localize composer toggler help text for zh_CN and zh_TW 2013-04-18 02:44:59 -04:00
Sam
8367951000 sprockets upgrade
stop bundling all js files in dev, replace with turbo boosted serving of assets
2013-04-18 16:33:25 +10:00
Jeff Atwood
474080a414 localize composer toggler help text 2013-04-17 23:14:58 -07:00
Jeff Atwood
107e774de8 simplify composer body placeholder text 2013-04-17 23:10:34 -07:00
Jeff Atwood
b64a4100fa change "visitor" trust level to "new user"
I blame me for this mistake.. visitor means other stuff in practice. New
User is correct meaning.
2013-04-17 16:11:24 -07:00
Jeff Atwood
3325c476f8 improve flag description to reflect notifications 2013-04-17 15:50:21 -07:00
Sam
b81da5ee66 Merge pull request #722 from ZogStriP/keep-french-l10n-up-to-date
keep French l10n up to date
2013-04-17 01:10:28 -07:00
Régis Hanol
7c1eb16aec keep French l10n up to date 2013-04-17 02:29:37 +02:00
Jeff Atwood
e671cf906c make one text for latest changes widget + taller 2013-04-16 16:35:28 -07:00
Neil Lalonde
9a7019e44f Add some icons to admin dashboard 2013-04-16 18:38:14 -04:00
Jeff Atwood
72be25c30a improve invite users action button 2013-04-16 14:53:06 -07:00
Jeff Atwood
77461cf1f7 improve category edit button copy 2013-04-16 14:25:36 -07:00
Neil Lalonde
3b6aeb14c7 Add subtype to topics to classify private messages 2013-04-16 16:56:18 -04:00
Neil Lalonde
2b5a2b5fce Add a refresh button to problems on dashboard, so you can check for problems again 2013-04-16 12:09:37 -04:00
Jeff Atwood
8e9b34d6cd remove "sent you a PM' text from the notify area 2013-04-15 17:38:39 -07:00
Jeff Atwood
bb586ec1a9 indicate use_ssl not implemented, experimental 2013-04-15 13:56:16 -07:00
Jeff Atwood
fb010727d1 user != person 2013-04-15 01:20:30 -07:00
Jeff Atwood
420bd37268 copyedits on notify flag options 2013-04-15 01:09:38 -07:00
Sam
e98ee42473 new ignore in jshint 2013-04-15 15:21:00 +10:00
Sander Datema
481a224ff9 Small edits to Dutch translation (client side) to make it sound more natural 2013-04-14 22:23:30 +02:00
Sander Datema
7965dadf7a Updated Dutch translation (client side) to latest Discourse version 2013-04-14 21:28:41 +02:00