Commit Graph

1140 Commits

Author SHA1 Message Date
Michael Kessler 9812acc5d2 Rename `move_selected` to `split_topic` in German client translations. 2013-05-28 20:17:21 +02:00
Erik Ordway 9a409d9440 fix comment and remove url setting as it is not used. 2013-05-28 08:06:18 -07:00
Michael Kessler 95c4d4edbc Add missing API translations. 2013-05-28 13:15:05 +02:00
Michael Kessler 2ddb2f76c8 Update German translations. 2013-05-28 13:00:33 +02:00
Régis Hanol 402af452c2 keep French localization up to date
🇫🇷
2013-05-27 21:29:26 +02:00
Robin Ward 197909246c Weigh staff likes higher when calculating scores. New site setting: `staff_like_weight`
can set the factor (default is 3)
2013-05-27 12:46:08 -04:00
Sam ea294f71c2 Merge pull request #845 from Supermathie/rebakedocs
Add hint on how to rebake posts
2013-05-26 17:48:07 -07:00
Michael Brown 17a09b5b70 Add hint on how to rebake posts 2013-05-25 00:16:43 -04:00
Michael Brown 6257c48613 Updated documentation
* added RVM option for single-user install
* clarified Web Server options
* bluepill sample config: create socket directory if it doesn't exist
* add multisite.yml.production-sample
* rename production.sample.rb (OCD)
* make two database.yml samples (one for dev, one for prod)
* fixed travis build (database.yml.sample renamed)
* fix other references to database.yml.sample
* clean up 'rvm requirements' instructions as per @mpapis
2013-05-25 00:07:45 -04:00
Neil Lalonde ada79260b3 Change composer error message when title is too long or too short, and make sure the submit button is 'disabled' when title is too long 2013-05-24 17:10:07 -04:00
Neil Lalonde d26b87bd3c Add Site Setting allow_uncategorized_topics. Uncheck it to force people to choose a category for all new topics. 2013-05-24 16:56:43 -04:00
Neil Lalonde e600b45155 Composer uses bouncing popup messages beside fields with invalid values when you click the submit button 2013-05-24 12:26:17 -04:00
Kuba Brecka 0b09a52b31 cs translation update 2013-05-24 10:04:27 +02:00
Erik Ordway 0bdee973a0 allow disabling of local logins. In the instance where an .edu is using cas they may not want a user to be able to log in once the users credentials have been revoked in the system that feeds the CAS authentication server. This is very optional 2013-05-23 13:44:14 -07:00
Erik Ordway 1575ce7b10 add cas support with a few tests 2013-05-23 13:40:50 -07:00
Robin Ward a08d4e4512 Merge pull request #883 from tangramor/master
update the zh_CN & zh_TW locales
2013-05-23 07:28:59 -07:00
Robin Ward 0bd61df34c Merge pull request #884 from mattvanhorn/refactor_topic
Refactor topic
2013-05-23 07:26:22 -07:00
Matt Van Horn c4b5821ef8 Revert annotation and non-English I18n changes 2013-05-23 06:44:47 -07:00
Matt Van Horn 806255b3c4 refactor Topic validation
introduce a couple of custom validators
fix minor discrepancies in tests
copy I18n error message keys to default location
clean up validation invocation
move some responsibilities out of validator into class
2013-05-22 22:31:52 -07:00
tangramor 9df4ad794e update the locale of zh_CN & zh_TW 2013-05-23 10:56:49 +08:00
Jeff Atwood cdbe6f64c7 minor copy changes 2013-05-22 16:30:41 -07:00
Sam cb2068e448 Merge pull request #872 from joebew42/client_it
Updated Italian translation
2013-05-21 23:03:50 -07:00
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
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
Sander Datema 35971506fd Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:48:16 +02:00
Sander Datema 2af902f4d1 Merge branch 'master' of https://github.com/discourse/discourse into dutch_translation 2013-04-14 20:46:00 +02:00
Sander Datema f47f880f8b Updated Dutch translation (client side) to latest Discourse version 2013-04-14 20:44:59 +02:00
Jeff Atwood a1d7f24240 improve "override default" text in customize 2013-04-14 11:22:25 -07:00
Jeff Atwood c4a0cf6517 Merge pull request #707 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
2013-04-13 09:35:02 -07:00
tangramor 344a744f3a Updated zh_CN & zh_TW translations to the latest en.yml 2013-04-13 10:51:54 +08:00
Régis Hanol efa9117f21 keep French l10n up to date 2013-04-13 02:16:02 +02:00
Sam 13adbf6f72 Merge pull request #702 from ZogStriP/keep-french-l10n-up-to-date-2013-04-11
keep French l10n up to date
2013-04-12 16:06:18 -07:00
Neil Lalonde 48d5cb02c2 Add email as a sharing option 2013-04-12 18:06:36 -04:00
Neil Lalonde 651cfba93f Add ability to destroy a user with 0 posts 2013-04-12 16:53:00 -04:00
Sam 8014d7fd25 correct rack::cache so it always punches through users with auth cookies 2013-04-12 21:59:52 +10:00
Sam e969eb14e8 added 2 new flag types: notify user and notify moderators
fixed up messed up user navigation
refactored
2013-04-12 17:55:45 +10:00
Régis Hanol ed790384b0 keep French l10n up to date 2013-04-12 00:07:14 +02:00
Neil Lalonde 04ca4077a7 Merge pull request #697 from kubabrecka/quote_post_fix
fix title of "quote post" button
2013-04-11 10:59:42 -07:00
Neil Lalonde 7b76447e5e Change edit category modal submit button text to Save Category 2013-04-11 10:50:25 -04:00
Sam 92e15ff4ef comment re cdn 2013-04-11 20:49:47 +10:00
Sam 850b042cab introduce rack:cache as a default, so users don't need to configure apache or nginx
under rack cache we are able to serve 620reqs a second per thin (on my machine) before it 12 (on my machine)

reorganised so mini profilers can be cleanly disabled from config file

added caching for categories index

move production.rb to production.sample.rb
2013-04-11 16:24:21 +10:00
Sam 5f30ea7463 Merge pull request #684 from ZogStriP/auto-replace-rules-in-titles
auto replace rules in titles
2013-04-10 21:12:20 -07:00
Kuba Brecka 11886e3e33 fix title of "quote post" button 2013-04-10 20:32:28 +02:00
Neil Lalonde 312c42ae98 Merge pull request #690 from kubabrecka/update_cs32
cs translation update
2013-04-10 11:02:26 -07:00
Neil Lalonde fec86c624b Merge pull request #693 from ZogStriP/keep-french-l10n-up-to-date-2013-04-10
keep French l10n up to date
2013-04-10 09:47:02 -07:00
Neil Lalonde 5d46478e38 Add UI to delete an empty category 2013-04-10 12:08:23 -04:00
Régis Hanol a7bdbd863e keep French l10n up to date 2013-04-10 15:48:59 +02:00
Kuba Brecka 1ca1b03109 cs translation update 2013-04-10 15:02:32 +02:00
Régis Hanol c5cf8be864 auto replace rules in titles 2013-04-10 11:00:50 +02:00
Sam e605e52181 localization 2013-04-10 15:55:33 +10:00
Jeff Atwood 249fa42fd2 better description for title_fancy_entities 2013-04-09 21:15:48 -07:00
Robin Ward 1ce7a40084 Revert "Merge pull request #677 from kubabrecka/localization_user_actions2"
This reverts commit c3a426930b, reversing
changes made to 9f9072bd9d.
2013-04-09 12:33:32 -04:00
Robin Ward c3a426930b Merge pull request #677 from kubabrecka/localization_user_actions2
move i18n of UserActions to JS-side and make sentences translatable
2013-04-09 09:25:28 -07:00
Robin Ward 9f9072bd9d Merge pull request #673 from windyson2008/patch-2
Update server.zh_CN.yml
2013-04-09 09:22:59 -07:00
Robin Ward bc75663e7b Merge pull request #680 from kubabrecka/cs_update31
cs translation update
2013-04-09 06:29:19 -07:00
Régis Hanol a2967dbf6b keep French l10n up to date 2013-04-09 14:51:40 +02:00
Kuba Brecka 9e796e8acf cs translation update 2013-04-09 11:10:28 +02:00
Neil Lalonde 93f36cdf93 Show which category colors have already been used when creating/editing a category 2013-04-08 18:33:51 -04:00
Sam 1b73ab614e Merge pull request #674 from kubabrecka/cs_update30
cs translation update
2013-04-08 15:17:01 -07:00
Sam 2f14ef4a68 Merge pull request #675 from kubabrecka/en_tos_typofix
English TOS typos
2013-04-08 15:16:02 -07:00
Kuba Brecka 8d927418e8 move i18n of UserActions to JS-side and make sentences translatable 2013-04-08 22:54:08 +02:00
Robin Ward 75aeb9550f Convert a bunch of callbacks to promises 2013-04-08 16:51:03 -04:00
Kuba Brecka b42570b61d English TOS typos 2013-04-08 22:31:44 +02:00
Kuba Brecka 9ee01948c3 cs translation update 2013-04-08 22:28:10 +02:00
Jonas Stendahl 21d3c96fca Updated swedish translations. 2013-04-08 11:03:55 +02:00
windyson2008 12a20f6547 Update server.zh_CN.yml
1.Add tag
2.Fix transtration
2013-04-08 11:22:51 +09:00
Régis Hanol 41b7f741d0 extract hard-coded strings 2013-04-07 18:14:50 +02:00
Robin Ward ade4dd32de Merge pull request #665 from ZogStriP/keep-french-l10n-up-to-date-2013-04-05
keep French l10n up to date
2013-04-06 07:30:15 -07:00
Jeff Atwood 0d26c819a0 better post quote description
blockquote? seriously?
2013-04-06 03:13:24 -07:00
Jeff Atwood b75454219f improve the category definition default copy 2013-04-06 00:52:21 -07:00
Régis Hanol 1793f3e3bb keep French l10n up to date 2013-04-05 23:17:57 +02:00
Robin Ward 72b4f41254 Can change TOS content via site content editor 2013-04-05 15:21:55 -04:00
Robin Ward c41bdc8752 Merge pull request #662 from kubabrecka/en_typos
fix some typos in English strings
2013-04-05 08:20:52 -07:00
Kuba Brecka 6dff266930 cs translation update 2013-04-05 11:31:43 +02:00
Kuba Brecka 920e1dfd24 fix some typos in English strings 2013-04-05 11:31:06 +02:00
Kuba Brecka 5f4b66d1bd replace CRLF with LF 2013-04-05 11:05:03 +02:00
Jeff Atwood efa99eb242 copyedits on Site Content editor help 2013-04-04 22:47:32 -07:00
Jeff Atwood e7499adacc clarify language on enable_private_messages 2013-04-04 22:24:58 -07:00
Jeff Atwood e3b6fc3ec0 trust ranges are 0-4, not 0-5 (moderators diff) 2013-04-04 22:19:13 -07:00
Sam fe434710e1 Merge pull request #647 from windyson2008/patch-1
Update client.zh_CN.yml
2013-04-04 21:40:41 -07:00
Sam 162af29aae Merge pull request #653 from kubabrecka/cs_typos
fix some typos in cs translation
2013-04-04 21:36:31 -07:00
Sam 4fbf017272 get regular trust level going, self heal inconsistent topic timings 2013-04-05 15:30:28 +11:00
Robin Ward fa1ba6791b Work in Progress: Content Editing in Admin Section 2013-04-04 17:26:22 -04:00
Neil Lalonde 66bc48a0e3 Give magic wands to all moderators 2013-04-04 16:14:55 -04:00
Kuba Brecka 53bcf99f57 fix some typos in cs translation 2013-04-04 16:57:54 +02:00
Jeff Atwood cb9370b00c clarify that read tab is in order that you read 2013-04-04 02:06:31 -07:00
windyson2008 d8b6ecef74 Update client.zh_CN.yml
1,Add tag
2,Fix translation
2013-04-04 13:20:45 +09:00
Sam 86cf7b1524 trust level 0 is highlighted in light gray as opposed to having special semantics around account age. 2013-04-04 12:24:23 +11:00
Kuba Brecka 317b884943 cs translation update 2013-04-03 23:22:35 +02:00
Robin Ward 33f349a1e6 Show all Hot rankings at once with a toggle button 2013-04-03 15:25:18 -04:00
Neil Lalonde bb18b6cb9b Dashboard: split out private messages from topic and post counts; re-enable report_spec because I think I fixed it... 2013-04-03 13:26:09 -04:00
Robin Ward ac0bc1bb30 Including your avatar if you've posted is confusing. Let's remove it for now. 2013-04-03 11:29:50 -04:00
Robin Ward 2b9514a311 Merge pull request #627 from kubabrecka/translatable_flags_and_likes
make post actions (likes, flags) translatable as whole sentences
2013-04-03 08:09:13 -07:00
Robin Ward f7a4b82a53 Minor change to text 2013-04-03 11:04:31 -04:00
Robin Ward 0e09c8b9b9 Merge pull request #622 from ZogStriP/prevent-users-from-uploading-files-other-than-images
prevent users from uploading files other than images
2013-04-03 07:39:55 -07:00
Robin Ward c2f1b70a6f Merge pull request #631 from kubabrecka/cs_update27
cs translation update
2013-04-03 06:51:42 -07:00
Régis Hanol a02b8730de keep French l10n up to date 2013-04-03 10:41:30 +02:00
Kuba Brecka 51b25e104f cs translation update 2013-04-03 09:21:23 +02:00
Robin Ward ee76f1926d Debugging Tool for Hot Topics 2013-04-02 18:00:53 -04:00
Kuba Brecka f957b0aee5 make post actions (likes, flags) translatable as whole sentences 2013-04-02 21:15:55 +02:00
Robin Ward e8d66beea5 Fix @notification text for non visitors 2013-04-02 11:58:12 -04:00
Robin Ward 753e3675b1 Merge pull request #625 from kubabrecka/cs_update23
cs translation client.cs.yml update
2013-04-02 06:51:04 -07:00
Robin Ward be0ce029e6 Merge pull request #626 from kubabrecka/cs_update25
cs translation server.cs.yml pluralization
2013-04-02 06:50:36 -07:00
Kuba Brecka 8245c0d9ce cs translation server.cs.yml pluralization 2013-04-02 15:07:11 +02:00
Kuba Brecka 6715e7c55a cs translation client.cs.yml update 2013-04-02 15:01:38 +02:00
Kuba Brecka b1249df598 update i18n:stats task to count pluralization based on locale setting 2013-04-02 14:56:26 +02:00
Régis Hanol 3524a93cfb prevent users from uploading files other than images 2013-04-02 11:38:15 +02:00
Sam 9c9087b99c less bloated browser update
no need for respond.js (ie8 compat stuff)
preload store should not be naming stuff get, its reserved
bad js generates for preload store
use browse happy, cause its better
2013-04-02 17:44:48 +11:00
Jeff Atwood ae82b5d0ea Revert "forgot to sync untranslated languages"
This reverts commit 805e782845.
2013-04-01 21:42:57 -07:00
Jeff Atwood 805e782845 forgot to sync untranslated languages 2013-04-01 21:15:17 -07:00
Jeff Atwood 91f9dc7267 clarify tracking: seeing counts ain't a notify 2013-04-01 21:13:38 -07:00
Sam ade1f50f19 update pseudolocale, we really should do this in a post commit step 2013-04-02 11:23:20 +11:00
Sam 343dfaf503 Merge pull request #617 from kubabrecka/cs_pluralization_client
cs translation update - client.cs.yml correct pluralization
2013-04-01 17:20:36 -07:00
Sam ae32e3071c Merge pull request #618 from ZogStriP/keep-french-l10n-up-to-date-2013-04-01
keep French l10n up to date
2013-04-01 17:20:17 -07:00
Régis Hanol 7918bef7ff keep French l10n up to date 2013-04-02 01:09:08 +02:00
Sam f6ec8e01ec debug assets for debugging assets ... set to 1 in my .rvmrc 2013-04-02 09:50:00 +11:00
Kuba Brecka 01ed72d091 cs translation update - client.cs.yml correct pluralization 2013-04-01 23:21:17 +02:00
Neil Lalonde acb2a18e8a Show a Please Upgrade message to people on unsupported browsers 2013-04-01 16:19:57 -04:00
Jeff Atwood 6aaaa55ced oops, left out a word 2013-04-01 12:57:22 -07:00
Jeff Atwood e1e2768412 improve Email Deliverability Test email 2013-04-01 12:55:32 -07:00
Robin Ward 4e6b62b1f5 Much faster development mode reloading. 2013-04-01 14:32:24 -04:00
Robin Ward f429e95d4e Merge pull request #601 from kubabrecka/split_multiple_pluralization
split i18n strings where there are 2 pluralizable variables
2013-04-01 07:49:05 -07:00
Robin Ward 0fc86a9869 Merge pull request #605 from kubabrecka/i18n_pluralization
implement pluralization for server-side and js
2013-04-01 07:48:10 -07:00
Robin Ward 75d5049c0a Merge pull request #606 from ZogStriP/better-client-side-upload
improved images upload on the client side
2013-04-01 07:11:26 -07:00
Régis Hanol 72989dca7c improved images upload on the client side 2013-04-01 03:19:21 +02:00
Kuba Brecka af0a772629 implement pluralization for server-side and js 2013-03-31 19:55:02 +02:00
Kuba Brecka 1c50c99e9a split i18n strings where there are 2 pluralizable variables 2013-03-31 14:20:02 +02:00
Robin Ward 5bf3a0eaf3 Merge pull request #591 from potthast/german-l10n
Updated German l10n.
2013-03-30 12:11:25 -07:00
Robin Ward 9288be750f Merge pull request #594 from kubabrecka/cs_update22
update cs translation
2013-03-30 12:10:43 -07:00
Régis Hanol f5567c10e3 keep French l10n up to date 2013-03-30 16:25:08 +01:00
Kuba Brecka 1349b24c4a update cs translation 2013-03-30 13:43:06 +01:00
Neil Lalonde 25073e873f Fetch the list of problems more frequently on the admin dashboard 2013-03-29 15:48:26 -04:00
Martin Potthast 328b31d10e Updated German l10n. 2013-03-29 19:07:34 +01:00
Neil Lalonde 436515ec6c Dashboard checks for facebook, twitter, and github configs 2013-03-29 13:32:40 -04:00
Robin Ward 83ab544e0c Merge pull request #580 from kubabrecka/typo_fix0
typo fix in client.en.yml
2013-03-29 10:05:28 -07:00
Robin Ward 9f16309904 Merge pull request #581 from kubabrecka/cs_update21
update cs translation
2013-03-29 10:04:07 -07:00
Régis Hanol 6b4022dbfc keep French l10n up to date 2013-03-29 01:00:16 +01:00
Robin Ward 473a64d39d Add score, percent_rank to topics. Adds `HotTopic` model and consolidated job to calculate
hotness. Note: People on Heroku will have to update their jobs to the new structure
in Heroku.md
2013-03-28 15:39:54 -04:00
Jeff Atwood 9b103e6d97 correct error in new tab tooltip text 2013-03-28 11:49:01 -07:00
Kuba Brecka ae1561930b update cs translation 2013-03-28 19:26:58 +01:00
Kuba Brecka 435a46b729 typo fix in client.en.yml 2013-03-28 19:22:27 +01:00
Robin Ward 08267f5171 Merge pull request #481 from ZogStriP/selecting-default-landing-tab
FIX: allows the selection of the default landing tab
2013-03-28 08:27:05 -07:00
Robin Ward 2e4d73efc7 Merge pull request #578 from tonytonyjan/patch
Patch
2013-03-28 08:23:48 -07:00
Neil Lalonde b0fd89b4a7 Fix spelling of Github to GitHub 2013-03-28 11:07:55 -04:00
Régis Hanol 1668b5eab2 FIX: allows the selection of the default landing tab 2013-03-28 14:01:13 +01:00
Tony Jian 833d8a2557 correct zh_TW 2013-03-28 15:00:46 +08:00
Tony Jian d783769a67 correct zh_TW 2013-03-28 14:58:02 +08:00
Tony Jian f0728b16f6 add whitespace 2013-03-28 14:54:43 +08:00
Tony Jian 8cfa5d8e15 correct zh_TW 2013-03-28 14:37:09 +08:00
Sam 36e950ee07 Merge pull request #576 from tonytonyjan/patch
correct zh_TW locale
2013-03-27 23:06:39 -07:00
Tony Jian e93c8e0dce correct zh_TW locale 2013-03-28 13:42:30 +08:00
Régis Hanol 518203281d keep French l10n up to date 2013-03-28 03:19:23 +01:00
Robin Ward 36269cfbaa Rename 'popular' to 'latest'. First stab at 'Hot' tab. 2013-03-27 16:21:23 -04:00
Neil Lalonde 35f3cd9325 Make login buttons even smaller 2013-03-27 14:36:26 -04:00
Neil Lalonde 4711cb4716 Cleanup layout of login buttons 2013-03-27 12:23:11 -04:00
Robin Ward 4cb4843323 Includes post count in filter message by user 2013-03-27 10:53:43 -04:00
Robin Ward 15bd63cb64 Merge pull request #571 from ZogStriP/keep-french-l10n-up-to-date-2013-03-26
keep French l10n up to date
2013-03-27 06:58:57 -07:00
Kuba Brecka 125c2e7095 cs translation update 2013-03-27 09:25:37 +01:00
Régis Hanol 1db78185e0 keep French l10n up to date 2013-03-27 02:00:21 +01:00
Robin Ward af7f6fea28 Can set the `hotness` of a category. For the soon to be implemented "hotness" tab. 2013-03-26 18:08:58 -04:00
Neil Lalonde 5961ffc0e4 Add site setting to choose which share links to show and in what order 2013-03-26 17:17:37 -04:00
Neil Lalonde 7bfd66aa80 Add title attrs to share links 2013-03-26 17:17:37 -04:00
Robin Ward 6366c9f86d Specifically mention the visitor user level in the error messages for posts. 2013-03-26 15:44:31 -04:00
Robin Ward a30c019275 Show totals in best of yellow thigny. 2013-03-26 15:40:30 -04:00
Sam bd4fcfa412 Merge pull request #567 from ZogStriP/keep-french-l10n-up-to-date-2013-03-25
keeping French l10n up to date
2013-03-26 04:53:40 -07:00
Sam a2ada48089 it appears routes can be reloaded in dev under certain conditions 2013-03-25 18:08:23 -07:00
Sam c57ec611e1 basic api support 2013-03-25 18:04:46 -07:00
Sam 36d60befbd mini profiler fix for multisite 2013-03-25 18:04:46 -07:00
Régis Hanol 386967c56e keeping French l10n up to date 2013-03-25 23:15:10 +01:00
Sam 3f206e6c8c Merge pull request #493 from mikl/danish-translation
Danish translation.
2013-03-25 14:06:13 -07:00
Sam 6aaf868d9f Merge pull request #564 from kubabrecka/cs_update19
cs translation update
2013-03-25 14:05:26 -07:00
Robin Ward 19376bb17c Merge pull request #565 from alpacaaa/it_locale
Italian Translation!
2013-03-25 10:57:06 -07:00
Marco Sampellegrini ce98ce4b93 Italian Translation! 2013-03-25 18:35:38 +01:00
Neil Lalonde ba315c6610 If assets haven't been precompiled, fail to start server in production mode with a message 2013-03-25 13:33:58 -04:00
Robin Ward 6568b4aaa9 Better error messages when hitting max mentions/images/links 2013-03-25 12:27:09 -04:00
Robin Ward 7c505df6d4 Merge branch 'update-sidekiq' of git://github.com/nverba/discourse
Conflicts:
	config/initializers/sidekiq.rb
2013-03-25 10:26:13 -04:00
Kuba Brecka 4c5a276a46 cs translation update 2013-03-25 15:07:38 +01:00
tangramor a168ee25c7 Update zh_CN and zh_TW to current en.yml 2013-03-25 20:43:56 +08:00
Mikkel Hoegh 869df58461 Translated Discourse to Danish.
Squashed commit of the following:

commit db81f4a15e5df5ceb64499aba077acd2f8aed192
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 23:10:25 2013 +0100

    All the user-facing server strings.

commit c7fdf0d4351664cd2a731556b99ecf7f05a09cde
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 22:43:53 2013 +0100

    Like -> Synes godt om.

commit 0f6ba13d65e31246a0a0a9a31707928a14d7220c
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 21:27:51 2013 +0100

    Lots of server strings.

commit d66af8246fb6bc9ccff51f97931f1375b07f2d85
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Fri Mar 22 19:48:53 2013 +0100

    Translated user facing strings (almost).

commit a84fcf6ff70d7c304c86263d7917207e505e77b1
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Thu Mar 21 22:15:20 2013 +0100

    Even more client strings.

commit ccfc0f7189fb979973b642bee9ec1440f7d39970
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:43:08 2013 +0100

    More client strings.

commit c3e21cab82d95ad5abe92e95ad99acf401cbe9ec
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:12:44 2013 +0100

    Translated a bunch of client strings.

commit 65aad7129b3d9c7df62213522b37e3a413df35de
Author: Mikkel Hoegh <mikkel@hoegh.org>
Date:   Mon Mar 18 22:09:28 2013 +0100

    Started work on Danish translation.
2013-03-25 10:35:03 +01:00
Sam 622568fd57 fix mp in prd 2013-03-24 20:36:55 -07:00
Sam f921d1c547 comment out dead code
add some explanations
2013-03-24 20:09:28 -07:00
Sam 67c438434b wow, this has been broken for OH so long, we need to segragate users correctly so MP results work as expected 2013-03-24 19:52:03 -07:00
Sam 988a712c77 correct multisite functionality for omniauth 2013-03-24 17:21:18 -07:00
Sam deb603f41c Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax
Convert a lot of :a => b to a: b and bring peace to the world
2013-03-24 16:43:17 -07:00
Karan Misra 5dfb04e4b3 Convert a lot of :a => b to a: b and bring peace to the world 2013-03-25 05:07:36 +05:30
Sam 36a069488e Merge pull request #492 from sbauch/email-whitelist
added email whitelist SiteSetting feature to replicate email blacklist S...
2013-03-24 16:35:24 -07:00
Robin Ward 81c099a37c Merge pull request #551 from kubabrecka/cs_update
cs translation update
2013-03-23 13:57:43 -07:00
Kuba Brecka 274d665f35 extract hardcoded strings from admin reports 2013-03-23 18:06:28 +01:00
Kuba Brecka e38565ed1d cs translation update 2013-03-23 17:52:45 +01:00
nverba 0c7579ec9f Update Sidekiq and config 2013-03-23 14:49:50 +00:00
Robin Ward cb9106c3a7 Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-2013-03-22
keep French l10n up to date [ci skip]
2013-03-23 07:38:03 -07:00
Robin Ward 3d210f143b Merge pull request #538 from kubabrecka/i18n_spec
adding i18n integrity check for valid YAML and valid content
2013-03-23 07:37:35 -07:00
Sam bceb124da6 correct line endings 2013-03-23 03:19:26 -07:00
Sam 40b2f0f7d9 update better errors
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
2013-03-23 03:16:49 -07:00
Jeff Atwood 38285b6219 for PMs, switch to envelope glyph instead of lock 2013-03-23 02:46:50 -07:00
Kuba Brecka 624649ddc2 adding i18n integrity check for valid YAML and valid content 2013-03-23 08:57:31 +01:00
Sam 4907d162ef Merge pull request #534 from kubabrecka/cs_update
update cs translation
2013-03-22 19:28:50 -07:00
Régis Hanol d2e47cad5f keep French l10n up to date 2013-03-22 23:57:23 +01:00
Neil Lalonde 158cda7628 Add moderator and admin count to dashboard 2013-03-22 17:50:34 -04:00
Kuba Brecka 260a113bea update cs translation 2013-03-22 22:07:21 +01:00
Robin Ward 86eaf10c3e Fix i18n integrity issue 2013-03-22 16:01:05 -04:00
Robin Ward f1fbb9b09e Merge pull request #527 from dacap/spanish
Spanish translation
2013-03-22 12:50:17 -07:00
Neil Lalonde aa6e87c5c1 Dashboard memory warning 2013-03-22 15:47:35 -04:00
Robin Ward 9c38c13ac5 The "Best Of" mode uses a percentage ranking of posts. 2013-03-22 15:44:39 -04:00
Sam Bauch 77e3434d81 added email whitelist SiteSetting feature to replicate email blacklist. email_validator method now also uses the regex method for both the whitelist and blacklist. 2013-03-22 14:49:42 -04:00
David Capello 2481fed8a4 Add Spanish translation (WIP) 2013-03-22 13:28:21 -03:00
Robin Ward 62f60a4f5d Merge pull request #530 from kubabrecka/fix_nl_translation
attemping to fix NL translation (client.nl.yml) which seems to be somehow broken
2013-03-22 09:19:18 -07:00
Robin Ward de25c82a0c Merge pull request #525 from habfast/master
Improving french L10E
2013-03-22 09:18:09 -07:00
Robin Ward 291bd0b9e2 Merge pull request #526 from kubabrecka/cs_update
cs translation update
2013-03-22 09:17:28 -07:00
Kuba Brecka 30e275fb87 attemping to fix NL translation (client.nl.yml) which seems to be somehow broken 2013-03-22 16:45:34 +01:00
Neil Lalonde 6f8d13d47e Dashboard warning when sidekiq is not running 2013-03-22 11:35:51 -04:00
Kuba Brecka 377f380193 cs translation update 2013-03-22 15:54:50 +01:00
habfast bc1aa12b02 Improving french translation
Quoting everything
minor correction for respecting french grammar rules
2013-03-22 15:15:32 +01:00
Régis Hanol ce33432ac4 keeping the French l10n up to date 2013-03-21 22:12:48 +01:00
Neil Lalonde 8cc7f3c20b Dashboard warning when clockwork doesn't seem to be running 2013-03-21 16:51:50 -04:00
Neil Lalonde 40962c84ca Add 'all' column to admin dashboard counts 2013-03-21 16:51:50 -04:00
Robin Ward ce3fa4d507 Replace "ok" with a close glyph 2013-03-21 16:11:05 -04:00
Robin Ward 5c4b794a8c Fixed a bunch of 'best of' errors and cleaned up JS. 2013-03-21 16:04:06 -04:00
Sam e3d30f1366 turns out that instansiating a storage provider and assigning it nowhere, just don't work 2013-03-20 23:54:28 -07:00
Régis Hanol 6dc630383e keep French l10n up to date 2013-03-20 23:52:51 +01:00
Neil Lalonde 5db196315c Improve message when you change your password 2013-03-20 16:55:56 -04:00
Neil Lalonde 23cee77310 Merge pull request #506 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
2013-03-20 13:17:42 -07:00
Neil Lalonde d28d81a590 Dashboard warning when GC params are default 2013-03-20 16:16:23 -04:00
Neil Lalonde c8508d3f26 Dashboard warning when host_names is localhost 2013-03-20 15:38:28 -04:00
tangramor dc7b690921 Add I18n support for "The topic has been deleted" message 2013-03-21 00:10:41 +08:00
Neil Lalonde 1e4dd3ea0c Start detecting install problems and report them on the admin dashboard. This commit adds check for Rails.env 2013-03-20 12:00:52 -04:00
tangramor 841bf3f064 Update the translations according to the latest en.yml 2013-03-20 23:48:28 +08:00
Sam 62c60540be pull moderator into own column, rename trust levels 2013-03-19 21:06:11 -07:00
Sam a95a756550 Merge pull request #500 from ZogStriP/keep-french-l10n-up-to-date-2013-03-20
keep French l10n up to date
2013-03-19 20:37:08 -07:00
nverba 9a1fb90b91 Update mini_profiler.rb
Passing a pre-defined Redis connection to MiniProfiler stops connection leakage. Should limit MiniProfiler connections to one per running process.
2013-03-20 03:29:07 +00:00
Régis Hanol 54399e4d2e keep French l10n up to date 2013-03-20 02:12:20 +01:00
Robin Ward 79884284c4 Add utf-8 headers to all ymls 2013-03-19 16:11:58 -04:00
Neil Lalonde de84718894 Move 'upgrade often' nag to the commits widget 2013-03-19 14:43:04 -04:00
Neil Lalonde 70f5ee5fa9 New layout for version check on admin dashboard 2013-03-19 14:43:04 -04:00
Robin Ward 96ac0c5569 A site setting for how many similar topics are returned 2013-03-19 13:51:25 -04:00
Robin Ward 2d586d8052 Merge pull request #498 from williamherry/add_missing_translation
keep chinese i18n up to date
2013-03-19 07:39:11 -07:00
William Herry 5b987b7262 keep chinese i18n up to date 2013-03-19 22:21:14 +08:00
Robin Ward b1ca53e00b Merge pull request #496 from kubabrecka/cs_update17
cs translation update
2013-03-19 06:42:55 -07:00
Régis Hanol 9acef70c1e FIX: post removal is in portuguese 2013-03-19 11:45:55 +01:00
Kuba Brecka 9850386b43 cs translation update 2013-03-19 09:38:52 +01:00
Sam 9805f7d2f5 max upload size message when images are too big. 2013-03-19 00:19:05 -07:00
Jeff Atwood 503520d885 less wordy automatic post flag hidden PM 2013-03-18 23:30:03 -07:00
Sam 0e1174dbe8 Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-with-status
keep favorite/star button's title in sync with starred status
2013-03-18 21:48:12 -07:00
Sam cc9ea74b41 Merge pull request #490 from ZogStriP/updated-french-l10n
keeping french l10n up to date
2013-03-18 21:46:34 -07:00
Régis Hanol 967b03fcfc keep favorite/star button's title in sync with starred status 2013-03-18 18:57:03 +01:00
Neil Lalonde 766f437e44 Say 'mod' instead of '5' on users per trust level table 2013-03-18 13:25:40 -04:00
Régis Hanol 43e13cf3ea keeping french l10n up to date 2013-03-18 18:23:19 +01:00
Neil Lalonde 50b04b2209 Add email counts to admin dashboard 2013-03-18 10:08:09 -04:00
Neil Lalonde 6a99d12784 Add likes to admin dashboard 2013-03-18 10:08:08 -04:00
William Herry 4e1c3b635f add missing translation for chinese 2013-03-18 00:48:56 +08:00
Robin Ward 42c234e927 Merge pull request #483 from ZogStriP/site-setting-for-category-color
site setting for category colors
2013-03-17 04:48:01 -07:00
Robin Ward 4e057335d5 Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
Régis Hanol bc9e931304 site setting for category colors 2013-03-17 01:24:52 +01:00
Sam 1a20291ff4 mini profiler and am serializer update 2013-03-16 15:56:16 -07:00
Sam 46b3c364f8 Merge pull request #470 from nverba/update
refactored redis.yml.sample for easier local precompile, updated docs
2013-03-16 15:51:01 -07:00
Robin Ward ab2073f152 Merge pull request #473 from ZogStriP/update-french-l10n-1
keeping the French l10n up to date
2013-03-16 08:18:55 -07:00
Kuba Brecka 94c0e73ca6 extract string from commits widget 2013-03-16 12:39:20 +01:00
Sam 837dea355c Merge pull request #471 from kubabrecka/cs_update16
cs translation update
2013-03-16 02:44:20 -07:00
nverba c5b62ac52a refactored redis.yml.sample for easier local precompile, updated docs 2013-03-16 01:35:38 +00:00
Régis Hanol de58e30a8f keeping the French l10n up to date 2013-03-16 00:40:33 +01:00
Neil Lalonde d9cdde9aa7 Add user counts for each trust level to admin dashboard 2013-03-15 18:09:02 -04:00
Neil Lalonde 8983df9856 Show current user count for now, not at different points in time 2013-03-15 18:09:01 -04:00
Jeff Atwood 3ba567eba0 copyedit on similar topics 2013-03-15 14:44:46 -07:00
Kuba Brecka d40ebce979 cs translation update 2013-03-15 22:05:29 +01:00
Robin Ward 1a60301a17 Merge branch 'fixes-topic-title-length-too-short' of git://github.com/ZogStriP/discourse
Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
2013-03-15 16:49:17 -04:00
Robin Ward 76d8df6ac6 Merge pull request #462 from kubabrecka/colorpicker3
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
Robin Ward ad082cea70 Big commit:
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
Robin Ward 7714e2050e Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-admin-javascript-files
extracted hard coded strings in the admin javascript files [ci skip]
2013-03-15 06:49:03 -07:00
Régis Hanol aef014f439 displays the number of characters left when editing the topic title 2013-03-15 12:56:14 +01:00
Neil Lalonde 6c4d9ecfdc Use one request to fetch dashboard report data and check version 2013-03-14 18:26:26 -04:00
Régis Hanol cad55bf244 extracted hard coded strings in the admin javascript files 2013-03-14 23:03:13 +01:00
Régis Hanol 3bf6625aa4 displays a message when a failure happen while creating a new category 2013-03-14 22:25:55 +01:00
Kuba Brecka 053eb0aa85 cs translation update + pseudolocalization 2013-03-14 17:54:00 +01:00
Robin Ward 025dd86e26 Merge pull request #423 from nverba/heroku-integration
Basic Heroku integration
2013-03-14 08:05:46 -07:00