Commit Graph

4287 Commits

Author SHA1 Message Date
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
Robin Ward dc9d54f1c7 Merge pull request #461 from richp10/master
Sample Apache2 configuration
2013-03-14 07:47:52 -07:00
Robin Ward bde8e3df4a Merge pull request #455 from ZogStriP/master
keeping French localization up to date
2013-03-14 06:39:19 -07:00
Robin Ward 42621859d1 Merge pull request #459 from tangramor/master
Fixed issue #435. Add zh_TW translations. Add missed translations according to newest en.yml
2013-03-14 06:38:37 -07:00
Robin Ward 4c1ee78a78 Merge pull request #457 from kubabrecka/update_cs14
update cs translation
2013-03-14 06:36:19 -07:00
Kuba Brecka 8784c55188 implement color picking from predefined set for category badges + option to change foreground color 2013-03-14 14:16:57 +01:00
Richard Phillips ff4aaa04cb Apache2 Configuration Sample
Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
2013-03-14 12:18:56 +00:00
Regis Hanol 6abfa5342c extracted a few missing strings 2013-03-14 11:59:40 +01:00
tangramor 30f6561623 Fix #435 increased the lenghth of category.topic_prefix string; also added zh_TW translations by converting the Simplified Chinese to Traditional Chinese
New I18n entries added, added in both zh_CN and zh_TW
Start to translate FAQ, TOS and Privacy docs
Add missed zh_TW.js.erb
Make translation more precise
2013-03-14 18:18:59 +08:00
Kuba Brecka 5f3ac08dba update cs translation 2013-03-14 08:41:40 +01:00
Régis Hanol 969a62841c keeping French l10n up to date 2013-03-14 01:32:19 +01:00
Robin Ward 518910a54d FIX: Don't include link counts when selecting text to quote a post. 2013-03-13 15:51:41 -04:00
Neil Lalonde 213d3e5c10 Remove unused code and routes that don't exist in session_controller 2013-03-13 15:21:45 -04:00
nverba 68e3f5228f Basic Heroku integration 2013-03-13 19:07:49 +00:00
Neil Lalonde 58004d44cd Support for browser password managers, but doesn't quite work in IE 2013-03-13 13:55:33 -04:00
nverba 3c0274a00b init message_bus before site_settings 2013-03-13 15:15:22 +00:00
Robin Ward 572a87d5d8 Merge pull request #447 from kubabrecka/history_date_i18n
move date formatting from server side to javascript, so we can reuse Sugar's i18n
2013-03-13 06:57:42 -07:00
Robin Ward dff9d65cc9 Merge pull request #437 from kubabrecka/i18n_serverside_date_2
2nd try: localize date formats on server side
2013-03-13 06:54:27 -07:00
Kuba Brecka 921a658548 move date formatting from server side to javascript, so we can reuse Sugar's i18n 2013-03-13 13:38:41 +01:00
Sam 38f185355d added options to disable quoting and open links in new tabs
fixed a some regressions
removed some dead code
fixed messages about constants being re-defined
2013-03-12 20:06:58 -07:00
Sam 5a2d8e344f Merge pull request #438 from ZogStriP/keeping-french-l10n-up-to-date
keeping French localization up to date
2013-03-12 17:01:20 -07:00
Kuba Brecka 505bf29bad update cs translation 2013-03-12 23:40:01 +01:00
Régis Hanol 7365edefe5 keeping French localization up to date 2013-03-12 23:22:24 +01:00
Jeff Atwood cde9d8c3a9 copyedit on reply to diff topic reminder 2013-03-12 13:33:32 -07:00
Neil Lalonde 40c27ff3cf Add flag counts to admin dashboard 2013-03-12 14:40:59 -04:00
Neil Lalonde 4eda422cdf Add total users report; restructure dashboard reports js 2013-03-12 14:40:59 -04:00
Kuba Brecka b97a3c8d34 reports don't work when default_locale != en + some missing translations 2013-03-12 14:38:15 -04:00
Kuba Brecka cf5deaba6c 2nd try: localize date formats on server side 2013-03-12 19:30:56 +01:00
Robin Ward a5a97f88cd When editing a post, provide more information in the composer title 2013-03-12 13:34:27 -04:00
Robin Ward 1e017ddc62 Merge pull request #434 from kubabrecka/cs_typo_fixes
cs translation typo fixes
2013-03-12 07:38:40 -07:00
Kuba Brecka 1cab4d3265 cs translation typo fixes 2013-03-12 15:12:54 +01:00
Kuba Brecka ac47c36f8b extract hardcoded "post {{number}}" into locale strings 2013-03-12 14:41:27 +01:00
Robin Ward 9db0ddeeac Merge pull request #429 from tangramor/master
Add some missed translations for server.zh_CN.yml
2013-03-12 06:31:08 -07:00
Sam 079b2d3842 Merge pull request #430 from kubabrecka/cs_update12
cs translation update
2013-03-12 03:31:41 -07:00
Kuba Brecka f5f502d2a0 extract hardcoded string into locale 2013-03-12 11:29:59 +01:00
Kuba Brecka e0ab379bce cs translation update 2013-03-12 10:59:58 +01:00
Sam 91b507f4c4 if you try posting a reply and are looking at a different topic, pop this window up 2013-03-11 20:57:06 -07:00
tangramor 3a6a4c628d Merge remote-tracking branch 'upstream/master' into mywork 2013-03-12 10:30:45 +08:00
tangramor 4b8a39248b modified reports related translations and a few email templates 2013-03-12 10:12:58 +08:00
Régis Hanol 1d7aa1f6cf globalized some missing strings 2013-03-12 02:17:45 +01:00
Sam 3a58e7aac2 amend airbrake location 2013-03-11 17:16:54 -07:00
Sam a0bdbe046a don't try to load airbrake if there is no config for it 2013-03-11 16:59:21 -07:00
Robin Ward 1205e0d3d4 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 11:32:09 -04:00
Robin Ward 0b3910c969 Merge pull request #400 from alxndr/i18n-chinese
remove duplicated quote_title translation string
2013-03-11 08:28:16 -07:00
Robin Ward d175da6816 Merge pull request #392 from kubabrecka/date_i18n_support
1st attempt to support i18n in dates and times
2013-03-11 08:15:58 -07:00
Robin Ward de1d488d91 Merge branch 'date_i18n_support' of git://github.com/kubabrecka/discourse 2013-03-11 11:14:17 -04:00
Robin Ward 4360d1bd61 Cleaned up probe code a little. 2013-03-11 11:13:28 -04:00
Robin Ward b554bf4520 Merge pull request #415 from Andersos/example-1
Updated pull #405 for all language files
2013-03-11 07:13:04 -07:00
Sam 1c8eef7dbd added basic passenger support, no long polling but functions
clean up initializers so they are ordered properly
2013-03-11 05:33:20 -07:00
Anders Sandvik bd0c979043 Updated pull #405 for all languagefiles
Small change from xyz.com to example.com
2013-03-11 06:47:56 +01:00
Sam a2facaa4d0 Merge pull request #411 from potthast/german-l10n
German l10n of Discourse. Works so far, but lots of fine-tuning still required.
2013-03-10 18:30:53 -07:00
Sam 46b33c3949 Merge pull request #405 from Andersos/patch-1
Small change from xyz.com to example.com
2013-03-10 17:53:07 -07:00
Sam 22a4580df5 added profile environment for perftools profiling (1.9.3 only) 2013-03-10 17:21:56 -07:00
Martin Potthast 0ffa0fe0a7 And some further revisions to German l10n. 2013-03-10 21:38:16 +01:00
Martin Potthast ef134b426d Further revisions. 2013-03-10 21:30:58 +01:00
Martin Potthast d39f32430c Revised German l10n 2013-03-10 20:57:48 +01:00
Martin Potthast ba90001828 Failed to declare de: at the top of the translation files. 2013-03-10 17:48:44 +01:00
Martin Potthast 8d2b53a256 Initial version of the German l10n. 2013-03-10 16:44:07 +01:00
Robin Ward 45c4382cce Merge pull request #408 from ikbear/fix_zh_CN_translation_error
Add some zh_CN translation
2013-03-10 08:14:53 -07:00
Robin Ward 0b3ae6632f Merge pull request #409 from kubabrecka/cs_update10
updating cs translation
2013-03-10 08:13:08 -07:00
Kuba Brecka e27f499fcc updating cs translation 2013-03-10 11:10:04 +01:00
ikbear b7687b4174 Add some zh_CN translation 2013-03-10 17:18:24 +08:00
Régis Hanol 7fc1565553 keeping french translations up to date 2013-03-10 00:38:28 +01:00
Neil Lalonde 8927432a93 Add stats to the admin dashboard 2013-03-09 15:34:27 -05:00
Anders Sandvik a7a1cd7269 Small change from xyz.com to example.com 2013-03-09 18:25:36 +01:00
Régis Hanol 6478db3953 keeping French translations up to date 2013-03-09 01:29:50 +01:00
Jeff Atwood 53d8e49a5d copyedits 2013-03-08 12:30:32 -08:00
Robin Ward d1d4530efd User Profile enhancements:
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
2013-03-08 15:04:37 -05:00
Alexander fe7fd2ac7f remove duplicated quote_title translation string 2013-03-08 10:46:32 -08:00
Robin Ward 0af114aff5 Merge pull request #399 from kubabrecka/update_cs9
update cs localization + pseudolocalization
2013-03-08 08:58:12 -08:00
tangramor c5761eae8a Support for Simplified Chinese thanks to tangramor 2013-03-08 11:56:17 -05:00
Kuba Brecka bb1021264a update cs localization + pseudolocalization 2013-03-08 17:44:34 +01:00
Robin Ward fb573b917f Merge pull request #390 from ZogStriP/min-search-term-length-site-setting
added the min-search-term-length site setting
2013-03-08 06:58:45 -08:00
Kuba Brecka d8993272d1 updating cs translation 2013-03-08 13:18:20 +01:00
Neil Lalonde 2ebe0336ae On signup, handle duplicate key errors on email and username better 2013-03-07 14:56:55 -05:00
Kuba Brecka 2e76e337a6 1st attempt to support i18n in dates and times 2013-03-07 20:05:18 +01:00
Robin Ward c7359145aa Merge pull request #384 from kubabrecka/fix_html_escapes
fix wrongly escaped HTML in <noscript> tags
2013-03-07 09:24:16 -08:00
Robin Ward 0d9b251b31 Merge pull request #388 from ryanprayogo/master
More translation for the Indonesian language
2013-03-07 09:22:05 -08:00
Robin Ward f8d8272406 Cleaned up TopicUserSpec, introduces clearing of pinned topics 2013-03-07 12:19:25 -05:00
Regis Hanol 5703d6c730 added the min-search-term-length site setting 2013-03-07 16:52:01 +01:00
Ryan Prayogo fee31828d7 More translation for the Indonesian language 2013-03-06 23:35:58 -05:00
Régis Hanol 9d9329257d keeping client.fr.yml up to date 2013-03-07 01:04:10 +01:00
Sam 674ed9432e Merge pull request #379 from Sinemys/portuguese-translations
Portuguese translations
2013-03-06 14:59:14 -08:00
Sam 33d1ea500b Merge pull request #383 from kubabrecka/cs_update7
CZ translation update + pseudolocalization update
2013-03-06 14:58:18 -08:00
Kuba Brecka 69d9856d43 fix wrongly escaped HTML in <noscript> tags 2013-03-06 22:25:44 +01:00
Kuba Brecka 98ebd91f96 CZ translation update + pseudolocalization update 2013-03-06 21:42:08 +01:00
Neil Lalonde fab04dbb58 Add github commits widget 2013-03-06 14:39:01 -05:00
Luís Ramalho 3333abefb7 PT corrections 2013-03-06 19:19:55 +00:00
Ismael Abreu 2396673847 Portuguese translations 2013-03-06 19:18:45 +00:00
Luís Ramalho 7324c74191 Postuguese translations 2013-03-06 19:18:22 +00:00
Robin Ward 3b645383fb Merge pull request #372 from kubabrecka/markdown_fix1
Markdown editor translations into client.en.yml + tiny translation fixes
2013-03-06 09:15:52 -08:00
Robin Ward fa50d651ae Merge pull request #374 from ZogStriP/french-18n-update
keeping the server.fr.yml file up to date
2013-03-06 09:15:14 -08:00
Ryan Prayogo 6adbf7730b Adding initial Indonesian translation 2013-03-05 20:31:26 -05:00
Régis Hanol 6aedc06266 keeping the server.fr.yml file up to date 2013-03-05 23:48:27 +01:00
Robin Ward 030857ac8c Give a pretty "from" address to the digest emails 2013-03-05 16:53:49 -05:00
Kuba Brecka da7a41f5b9 Markdown editor translations into client.en.yml + tiny translation fixes 2013-03-05 21:58:37 +01:00
Robin Ward ef47a55202 Merge pull request #371 from kubabrecka/cz_update1
CZ translation update (client.cs.yml, server.en.yml) + update of pseudolocalization
2013-03-05 12:41:44 -08:00
Neil Lalonde 595901f351 Remove dashboard welcome message 2013-03-05 14:28:46 -05:00
Robin Ward e0e8cad80d Merge pull request #370 from ZogStriP/keep-french-l10n-up-to-date
updated french translations
2013-03-05 11:11:50 -08:00
Kuba Brecka ea2f099177 CZ translation update (client.cs.yml, server.en.yml) + update of pseudolocalization 2013-03-05 20:10:51 +01:00
Régis Hanol 9b52f1b4c2 updated french translations 2013-03-05 19:37:15 +01:00
Neil Lalonde 739d6391a9 Fix error during db:migrate on a new database 2013-03-05 13:02:16 -05:00
Robin Ward 0c5ca30188 Merge pull request #361 from ZogStriP/enforce-coding-convention
enforce coding convention
2013-03-05 07:25:19 -08:00
Robin Ward 0c41e80f41 Merge pull request #367 from kubabrecka/extract_strings5
extract some strings from views/modal
2013-03-05 06:43:01 -08:00
Robin Ward 97a2d6d0fe Merge pull request #366 from ZogStriP/moar-globalization
globalizing the image selector modal
2013-03-05 06:41:49 -08:00
Robin Ward 7b861e5a6f Merge pull request #364 from baus/master
Set reasonable nginx defaults for proxying to thin.
2013-03-05 06:36:17 -08:00
Kuba Brecka 5afd6cc8a1 extract some strings from views/modal 2013-03-05 08:30:47 +01:00
Régis Hanol 5b456a6a3f globalizing the image selector modal 2013-03-05 03:38:12 +01:00
Régis Hanol 239cbd2d58 enforce coding convention
replaced every `and` by `&&` and every `or` by `||`
2013-03-05 01:42:44 +01:00
Neil Lalonde 3fdc59b1d9 Raise an error in production env if host_names is using production.localhost 2013-03-04 16:07:02 -05:00
Robin Ward ccf8e1e87f Merge pull request #354 from jyggen/master
Updated swedish client strings.
2013-03-04 11:52:18 -08:00
Robin Ward ccbd3b2841 Let's default Persona to off right now, change button text 2013-03-04 12:01:20 -05:00
Robin Ward f7c9efb101 Merge branch 'persona-integration' of git://github.com/callahad/discourse 2013-03-04 11:51:26 -05:00
Jonas Stendahl 2be3bec5c7 Updated swedish client strings. 2013-03-04 17:05:22 +01:00
Kuba Brecka 9bf5e31f94 some more extracted strings for translation 2013-03-03 23:00:16 +01:00
Régis Hanol 2d00f97d98 better french traduction...
... regarding the minimum entropies
2013-03-03 12:59:40 +01:00
Chris Baus 71984bf01a Update nginx.sample.conf 2013-03-02 12:53:42 -08:00
Robin Ward a0218ffece Merge pull request #320 from jk779/secret_token
Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku)
2013-03-02 08:04:00 -08:00
Kuba Brecka 821ad9f51d server side of Czech language localization + update of client side + update of pseudo-localization 2013-03-02 14:22:53 +01:00
Michael Berg 5e95dfb1c9 Removing unnecessary Rails.env check 2013-03-02 05:58:05 +01:00
Michael Berg de154f3ef1 Get secret_token from ENV['SECRET_TOKEN'] (e.g. for Heroku) 2013-03-01 23:55:49 +01:00
Robin Ward d78a2b2b91 Removed unused `type` parameter in site settings. Remove hardcoded date reference in en.yml 2013-03-01 17:27:59 -05:00
Robin Ward d410f043a9 Merge pull request #290 from alxndr/category-rss
RSS for topics in a category
2013-03-01 12:01:26 -08:00
Dan Callahan 7c87359e02 Make Persona configurable 2013-03-01 14:00:56 -06:00
Dan Callahan 81c545539e Add (ui-only) Persona button to login modal 2013-03-01 14:00:53 -06:00
Robin Ward 72cbb948b8 Fixes broken "From" header in Private Message emails. 2013-03-01 14:56:52 -05:00
Dan Callahan fd4d384dc1 Add Mozilla Persona Omniauth Gem and initializer 2013-03-01 13:29:47 -06:00
Robin Ward d2596c3c4c Remove unusued site_settings, show checkbox in UI for boolean values, remove restrict_access
boolean to avoid locking yourself out by setting access_password to empty string. Minor
UI tweaks.
2013-03-01 14:27:41 -05:00
Alexander fd240c1967 RSS for topics in a category
Creates a new route for category RSS
2013-03-01 09:52:59 -08:00
Kuba Brecka 9993e0e665 extracting some more hardcoded strings 2013-03-01 17:04:13 +01:00
Kuba Brecka 5f2215290e adding some missing translations in the EN locale 2013-03-01 09:19:25 +01:00
Neil Lalonde 72edc9262b Add a comment about host_names in database.yml for production servers 2013-02-28 17:13:07 -05:00
Neil Lalonde c9140a2441 Add a nag to update often 2013-02-28 16:19:22 -05:00
Robin Ward b6f69ed57f Merge pull request #299 from kubabrecka/cs_client_localization
client (js) side of Czech language localization
2013-02-28 12:25:00 -08:00
Robin Ward 04f0105daf Fix locale path for precompiling assets 2013-02-28 15:06:04 -05:00
Robin Ward 628927a79f Added Site Setting to change locale. 2013-02-28 14:34:38 -05:00
Robin Ward e37c7f1e1d Merge branch 'js-l10n-support-take1' of git://github.com/kubabrecka/discourse 2013-02-28 14:34:13 -05:00
Neil Lalonde a3b1ae7793 Remove the secret_token site_setting since it's not used 2013-02-28 14:07:26 -05:00
Kuba Brecka c53e101822 client (js) side of Czech language localization 2013-02-28 18:41:07 +01:00
Robin Ward 93a257707e Add X-Forwarded-Proto to nginx config to support SSL. Fixes #293 2013-02-28 11:24:03 -05:00
Robin Ward 9c0cbe8311 Merge pull request #298 from nverba/login-buttons
added option to enable/disable login buttons individually
2013-02-28 08:13:04 -08:00
nverba b0f3a74a1f added option to enable/disable login buttons individually 2013-02-28 03:46:56 +00:00
Robin Ward dc8e1196fd Code to support EmberJS + Discourse Tutorial feature: Admin Reports 2013-02-27 22:40:36 -05:00
Robin Ward a086635add Swap out "@" for "via" in email From field 2013-02-27 19:03:57 -05:00
Robin Ward 7c1ae451fe Send emails to users who are watching topics 2013-02-27 15:38:44 -05:00
Robin Ward 007118b00c Merge branch 'github-auth' of git://github.com/nverba/discourse
Conflicts:
	config/locales/server.en.yml
	db/structure.sql
	spec/views/omniauth_callbacks/complete.html.erb_spec.rb
2013-02-27 12:09:22 -05:00
Robin Ward 2184763d4a Merge pull request #222 from alxndr/rss-for-topics
RSS view of topics
2013-02-27 08:30:08 -08:00
Jeff Atwood 7087c2b847 clarify some /admin site setting descriptions 2013-02-27 00:47:47 -08:00
Kuba Brecka acc7718c67 first attempt to serve correct localized js files as rails pipeline assets 2013-02-27 09:00:49 +01:00
Alexander 8855a0bfbe RSS of a topic via new route
Adds TopicView#recent_posts; Post#by_newest, #with_user, #author_readable; User#readable_name
Autodiscovery tag in topic show HTML.
2013-02-26 14:54:17 -08:00
Robin Ward e363950bf5 Merge pull request #272 from kubabrecka/extract_some_strings
extract some more strings into locales/*.yml
2013-02-26 14:38:40 -08:00
Kuba Brecka e9fb46c251 extract some more strings into locales/*.yml 2013-02-26 22:13:07 +01:00
Neil Lalonde cd6c1de5b0 Add site settings for company name and domain, and use them in the Terms of Service 2013-02-26 15:50:42 -05:00
Robin Ward 0e087e040f Fixes title regression 2013-02-26 11:13:13 -05:00
Robin Ward 88267429c5 Remove fastclick for now -- we saw some regressions on iPad and want to make sure they weren't caused by
it.
2013-02-26 10:47:23 -05:00
Robin Ward 1221c393a3 Merge branch 'whitespace-cleanese' of git://github.com/goshakkk/discourse
Conflicts:
	lib/oneboxer.rb
	lib/oneboxer/whitelist.rb
	spec/controllers/robots_txt_controller_spec.rb
2013-02-26 10:42:49 -05:00
Régis Hanol 679d955db3 Pluralization bug when hovering on likes 2013-02-26 11:20:49 +01:00
nverba b45f872c04 Added Github authentication option, disabled by default with enable options in settings. 2013-02-26 05:00:21 +00:00
Gosha Arinich cafc75b238 remove trailing whitespaces ❤️ 2013-02-26 07:31:35 +03:00
Jeff Atwood b50e0536c7 copyedit topic load failure messages 2013-02-25 17:05:26 -08:00
Jeff Atwood ea9196a8a2 minor copyedits around login / email 2013-02-25 16:23:09 -08:00
Robin Ward 397c6ca761 Better error messages when topics can't load 2013-02-25 18:38:38 -05:00
Jeff Atwood d9d3419a51 some copyedits on admin / email 2013-02-25 15:07:40 -08:00
Robin Ward 2a7345b96e Merge pull request #237 from kubabrecka/pseudolocalization
'pseudo' locale files for testing/development + script to generate these files
2013-02-25 14:26:57 -08:00
Robin Ward 4be869db34 Merge pull request #257 from jyggen/master
Swedish translation of client strings
2013-02-25 14:24:31 -08:00
Robin Ward c69cac517a Merge pull request #260 from nverba/patch-1
Update config/routes.rb
2013-02-25 14:22:35 -08:00
Robin Ward e461c84253 Clean up JS, add YUIDoc support, automatically create IIFE via asset pipeline 2013-02-25 17:16:57 -05:00
nverba c6eeffec3b Update config/routes.rb
Facebook and Twitter controllers are no longer defined.
2013-02-25 17:16:53 +00:00
Jonas Stendahl 4990eab952 Added swedish translation for client strings. 2013-02-25 16:30:08 +01:00
Robin Ward ea861ebb57 Merge pull request #249 from goshakkk/cleaner-routes
Omit explicit route => action mappings where possible
2013-02-25 07:05:31 -08:00
Sam Saffron b9f3666f5a fast click instead of hacky double event binding 2013-02-25 11:11:46 +11:00
Gosha Arinich 81d03e6a39 omit explicit route => action mappings where possible 2013-02-24 17:02:11 +03:00
Jeff Atwood e962ff36a9 copy change on topic not found, curious problems 2013-02-23 12:38:55 -08:00
Kuba Brecka 623cc66968 'pseudo' locale files for testing/development + script to generate these files 2013-02-23 11:38:27 +01:00
Jeff Atwood 9464bf5576 remove unused client_setting 2013-02-22 12:55:18 -08:00
Jeff Atwood 8631c215ad improved admin site setting descriptions 2013-02-22 12:34:42 -08:00
Robin Ward 1c5afc9686 Merge pull request #231 from shapkin/master
Add english locale to page.
2013-02-22 10:58:31 -08:00
Robin Ward 532b1f5450 Can edit category descriptions, they show up in a `title` attribute 2013-02-22 13:43:47 -05:00
Neil Lalonde ff3e012034 Add a link that allows you to send activation email again 2013-02-22 11:49:58 -05:00
Alexander Shapkin ee8825408b add english locale to page 2013-02-22 15:33:35 +04:00
Robin Ward 588c79e637 Updated JSHint settings, include smoke test. 2013-02-21 16:25:40 -05:00
Neil Lalonde 1e794f98a7 Add an option to not flush redis every time sidekiq.rb is loaded in development 2013-02-21 13:45:16 -05:00
Neil Lalonde 560411eece Add site_setting to disable version checks 2013-02-21 10:19:17 -05:00
Robin Ward ba8efd8b51 Merge pull request #211 from Shahor/master
French translation fixes
2013-02-21 07:12:37 -08:00
Neil Lalonde 803a86a21d Add more documentation to secret_token.rb 2013-02-20 20:32:40 -05:00
Robin Ward f661fa609e Convert all CoffeeScript to Javascript. See:
http://meta.discourse.org/t/is-it-better-for-discourse-to-use-javascript-or-coffeescript/3153
2013-02-20 19:01:13 -05:00
Shahor f1c011ebcc Added new translations and fixed typo/grammar 2013-02-20 23:03:27 +01:00
Alexandre Gaudencio 2d51bd9919 French translation : Grammar,typo fixes and useless file removal 2013-02-20 18:43:56 +01:00
Sam Saffron a02414410f amazing the amount of damage a missing .js extension can cause 2013-02-20 17:17:05 +11:00
Sam Saffron 15c5f5b840 grrrrr asset pipeline hates me 2013-02-20 17:00:24 +11:00
Sam Saffron ea7b97be34 missing localization on categories 2013-02-20 16:11:56 +11:00
Sam Saffron 0c085059c9 added sane sanitizer (Google Cajole) that is much more robust than old one ... yay for smilies
added sane way to do $LAB includes - pattern to be expanded
people keep on messing structure.sql
2013-02-20 16:11:56 +11:00
Sam Saffron c914a3cf22 missing localization 2013-02-20 16:11:56 +11:00
Neil Lalonde e914222cb3 Add i18n for the version checking 2013-02-19 17:42:36 -05:00
Robin Ward a1f8dcebd1 Custom messages for the footers of all list views 2013-02-19 17:39:34 -05:00
Robin Ward 836c3a7379 Support for Fancy topic titles 2013-02-19 16:14:04 -05:00
Neil Lalonde c0371ff427 Add version checking that shows on the admin dashboard 2013-02-19 15:20:49 -05:00
Robin Ward 963c11c72d Merge pull request #197 from mquandalle/master
French translation
2013-02-19 11:10:54 -08:00
Robin Ward 928e215e57 Update to latest Ember.js 2013-02-19 12:28:18 -05:00
Robin Ward 73cac65d3a Merge pull request #195 from merugear/master
Updated Dutch Locale
2013-02-19 08:21:05 -08:00
merugear 6ad9fc7049 Changed quotes
I used " -quotes in the text, which didn't escape properly. Ran it through a YAML linter and it seems to validate.
Sorry for the inconvenience!
2013-02-19 12:49:18 +01:00
merugear dd302a6366 Updated, removing tabs and whitespaces. Changed 'en' to 'nl'
Sam: could you try this one instead? Forgot to change 'en' to 'nl' Cheers.
2013-02-19 12:36:06 +01:00
Sam Saffron d9531d94d5 basic lightbox support 2013-02-19 17:57:14 +11:00
mquandalle ef76a8db66 Split fr.yml into client.fr.yml + server.fr.yml 2013-02-19 00:08:13 +01:00
mquandalle 4cab57a2eb Create fr.yml
Add french translation.
2013-02-18 13:30:27 -08:00
merugear c338760f6e Split from nl.yml, updated and ran spellcheck 2013-02-18 10:27:10 -08:00
merugear d5d48d3ee0 Split from nl.yml, updated and ran spellcheck
As suggested by Jeff, I updated the files to match the updated format of client/server seperated code.
2013-02-18 10:19:49 -08:00
Kevin Ansfield 1a81c90076 convert plain text in composer template to i18n 2013-02-18 11:20:07 +01:00
Sam Saffron 0e48e1c346 clean up git version stuff a tad 2013-02-18 18:01:36 +11:00
Sam Saffron 87b929eac6 added secret token warning in prd
added task to stamp builds
2013-02-18 17:34:43 +11:00
Sam Saffron 1228e351a8 a much more basic but robust restart watcher,
removed the pid stuff cause it needs to be a lot more careful not to think
pids from other machines restarted. robust working code is better than
complex graceful broken code.
2013-02-16 13:54:23 +11:00
Sam Saffron c81d07c44b clean up the topics footer so it does not flash and is localisable 2013-02-16 12:15:15 +11:00
Sam Saffron ff0d58e4ee message bus work in progress 2013-02-16 12:14:52 +11:00
Sam db66e9facc Merge pull request #181 from danneu/flags-i18n
added "flagged_by" i18n
2013-02-17 13:56:33 -08:00
tms fb5710b5d6 Improved action descriptions/links on user stream items 2013-02-17 01:38:20 -05:00
Dan Neumann 72264e3034 added 'flagged_by' i18n. 2013-02-16 21:40:24 -06:00
Robin Ward 3cdf89d052 Merge pull request #162 from jessepollak/omniauth-failure
Adds failure callback for omniauth
2013-02-15 07:13:17 -08:00
Sam Saffron eb188c57e8 started work on message bus diags 2013-02-15 19:23:40 +11:00
Sam Saffron 89ff51e108 a stop gap so notifications do not look horrible 2013-02-15 19:22:25 +11:00
Jesse Pollak ad5a5b4866 This commit adds a callback route to handle omniauth failure and removes a few unneccessary entries in en.yml 2013-02-14 18:08:40 -08:00
Sam Saffron 6132373fab for some reason people seem to not understand why you can not submit close to empty posts, fix that 2013-02-15 12:20:17 +11:00
Jeff Atwood e94b6e7796 rename nl.yml file as it's WIP 2013-02-14 16:50:16 -08:00
Jeff Atwood bfd0b1ef29 add contributed nl.yml file 2013-02-14 16:43:51 -08:00
Sam Saffron c833e2f290 migrate to glyph notifications 2013-02-15 11:44:14 +11:00
Jeff Atwood 0244834a97 copyedit on watching/tracking 2013-02-14 15:51:41 -08:00
Jeff Atwood 91e79670c4 copyedits on new user education panel 2013-02-14 15:32:06 -08:00
Robin Ward b9457197c0 First stab at new user education - configurable messages that pop up on a user's first
few posts/topics.
2013-02-14 15:33:51 -05:00
Jeff Atwood 898efeaea2 suggested copy change to clarify grey unread old 2013-02-14 10:57:26 -08:00
Neil Lalonde 39eab7c425 Replace mentions of mothership with discourse_hub 2013-02-14 12:57:26 -05:00
Robin Ward b94b9d2383 Merge pull request #146 from ismaelga/moderators-buttons
Create moderators
2013-02-14 07:26:50 -08:00
Sam Saffron 87d83802b9 added option that allows users to decide when they consider topics new (default 2 days old or newer)
added site_setting to control the default new_topic_duration_minutes
added 10 minutes option for auto_track_topics_after_msecs, default bumped up to 5 mins
2013-02-14 17:36:14 +11:00
Neil Lalonde aaf96f1e29 Replace email_blacklist_regexp with email_domains_blacklist site setting 2013-02-13 22:45:43 -05:00
Jeff Atwood d9d2565c25 remove extra text in login error 2013-02-13 17:23:30 -08:00
Ismael Abreu 80bec6efc9 Adds grant and revoke moderation buttons so admins can make users moderators 2013-02-14 01:12:23 +00:00
Sam Saffron fd694e7b83 Merge branch 'master' of github.com:discourse/discourse 2013-02-14 09:12:49 +11:00
Sam Saffron 4ccb7354d1 nuking SSL = bad 2013-02-14 09:12:20 +11:00
Robin Ward 4c6379ea56 New users are highlighted when posting. .new-user class 2013-02-13 16:12:30 -05:00
Neil Lalonde f850fe1e75 Implement the email_blacklist_regexp ssite setting 2013-02-13 12:28:39 -05:00
Robin Ward 4aa89ed2c0 Merge pull request #156 from kubabrecka/correct_typos
correcting some typos in locales/en.yml
2013-02-13 07:26:28 -08:00
Robin Ward 81f34349a7 Merge pull request #143 from pixelcort/ninja_edit_window_clarification
Clarify the unit of time for ninja_edit_window
2013-02-13 07:24:41 -08:00
Robin Ward afc23cc8cb Merge pull request #133 from xdite/apply_omniauth
Apply omniauth
2013-02-13 07:19:13 -08:00
Kuba Brecka 1b5aaa1a7b correcting some typos in locales/en.yml 2013-02-13 16:16:40 +01:00
Sam Saffron b7c5687b10 Merge branch 'master' of github.com:discourse/discourse 2013-02-13 20:38:59 +11:00
Sam Saffron 161420fac0 Added method for testing ember stuff
Collapse user actions in UI so it stops looking crazy
Removed dud dupe user action TOPIC_RESPONSE
Always show the owner of a post on the user page, actions by others at the bottom
2013-02-13 20:38:43 +11:00
Jeff Atwood e380ebde40 no uppercasin' 2013-02-13 01:20:02 -08:00
xdite 67cc766f0c using redis as backend store 2013-02-13 16:48:44 +08:00
Jeff Atwood 1a0ead770e add base_url to all /faq links in emails 2013-02-12 23:33:35 -08:00
xdite a7908e07d1 merge master 2013-02-13 15:16:39 +08:00
xdite 9189d937f7 move all logic to omniauth
implement omniauth-facebook / omniauth-twitter
2013-02-13 15:08:38 +08:00
xdite be3d036084 use omniauth-openid to replace google id 2013-02-13 15:08:32 +08:00
Jeff Atwood 36165d4687 copyedits 2013-02-12 22:20:53 -08:00
Robin Ward d7f3241285 Option to supress replies button below a post, when its reply is directly following. 2013-02-12 14:35:21 -05:00
Cortland Klein 9ce896840c Clarify the unit of time for ninja_edit_window 2013-02-12 11:17:11 -08:00
Robin Ward be9c374285 Oops, database.yml and redis.yml were still included 2013-02-12 11:32:32 -05:00
Robin Ward 3875806315 Introduction of Chef to Vagrant. Removed redis.yml and database.yml. Also updated
instructions a lot, and included setup instructions for provisioning your own VM.

Closes #28 and #61.
2013-02-12 11:18:59 -05:00
Sam Saffron ad88487a32 Merge branch 'master' of github.com:discourse/discourse 2013-02-12 13:45:24 +11:00
Sam Saffron 2609350457 sample bluepill config 2013-02-12 13:44:44 +11:00
Jeff Atwood ecbaa45736 remove extraneous text on PM summary 2013-02-11 16:14:44 -08:00
Neil Lalonde c18b85873f Prevent login until email is confirmed 2013-02-11 11:18:37 -05:00
Sam Saffron f68f59c24f setting to exclude rel nofollow from particular domains 2013-02-11 18:58:19 +11:00
Sam Saffron 374820ae8b not required there, if anything should go in the initializer 2013-02-11 15:13:40 +11:00
Sam Saffron 543845c673 rel nofollow, on by default to protect forums from spam etc. we should consider lifting it at high trust by default. 2013-02-11 11:43:07 +11:00
Sam Saffron c50a9e4d01 added support for disabling indexing by google using SiteSetting.allow_index_in_robots_txt = false 2013-02-11 11:02:57 +11:00
Sam Saffron af810f38dd UserSearch refactor
Added .sql_builder to all AR models
2013-02-10 23:37:24 +11:00
tms 9e653ad370 Show "You" to same-user on activity stream items 2013-02-09 23:44:03 -05:00
Jeff Atwood c5e1dba31f copyedit on PM invite button 2013-02-09 13:33:38 -08:00
Robin Ward 25e9cfe3b8 Remove the distinction between "x replies below" and "x replies" 2013-02-08 17:10:18 -05:00
Neil Lalonde 1635d8e553 Add email_blacklist_regexp to site settings. Not implemented yet. 2013-02-08 16:31:21 -05:00
Neil Lalonde d1a04fa06a Enforce max username length on client 2013-02-08 16:08:45 -05:00
Jeff Atwood cc21cf16d1 copy on email mentions 2013-02-08 11:13:50 -08:00
Sam Saffron e925d53463 disable diags for now 2013-02-08 22:35:35 +11:00
Sam Saffron d3f911cc4c Revert "Something here is messed up Revert "message bus fixes and diagnostics""
This reverts commit f3c6144e3b.
2013-02-08 22:03:45 +11:00
Sam Saffron 457229b133 Revert "Revert "structure.db to my structure""
This reverts commit 7c61c3d699.
2013-02-08 22:03:25 +11:00
Sam Saffron 7c61c3d699 Revert "structure.db to my structure"
This reverts commit 616a1f4906.
2013-02-08 21:57:16 +11:00
Sam Saffron f3c6144e3b Something here is messed up Revert "message bus fixes and diagnostics"
This reverts commit 36d1aafe1e.
2013-02-08 21:39:38 +11:00
Sam Saffron 616a1f4906 structure.db to my structure
tone down watch for restart
2013-02-08 21:09:46 +11:00
Sam Saffron 36d1aafe1e message bus fixes and diagnostics 2013-02-08 19:13:36 +11:00
Neil Lalonde 79dfccf717 Username validation in signup and username change forms 2013-02-07 18:23:52 -05:00
Jeff Atwood b8ded55450 a few minor copyedits, 1px adjust 2013-02-07 13:41:33 -08:00
Robin Ward 084a873b91 Give regular users a delete button. If they click it, their post will be revised to
say it was deleted.
2013-02-07 15:14:23 -05:00
Sam Saffron 85973ce6b0 added delete all posts button
wired up the ability to enable all themes
2013-02-07 18:11:56 +11:00
Sam Saffron 8f4417f962 Merge branch 'master' of github.com:discourse/discourse 2013-02-07 16:00:55 +11:00
Sam Saffron 7b123e12dd improving flag handling, links and delete button 2013-02-07 16:00:40 +11:00
Sam Saffron c7461622a9 admins can now clear flags inline 2013-02-07 15:15:48 +11:00
Robin Ward 7d7d8c7d4f Merge branch 'master' of github.com:discourse/discourse 2013-02-06 20:59:07 -05:00
Robin Ward 40da901e5d Introduction of TextSentinel to enforce title and body quality. 2013-02-06 20:53:34 -05:00
Neil Lalonde 471c61fd69 Add honeypot and challenge to signup form 2013-02-06 19:25:36 -05:00
Sam Saffron f79f0e740a Don't allow users to double flag stuff
Correct seed fu to match model
2013-02-07 10:45:58 +11:00
Robin Ward 2d2b907d2c Temporary Nuclear option on topic titles - disallow non ascii characters so we
can stay on top of the trolls. This is meant to be replaced soon with a more
permissive and safe method of sanitizing.
2013-02-06 15:47:36 -05:00
Sam Saffron 0f88947279 fix onebox for your own site 2013-02-06 16:22:11 +11:00
Robin Ward 21b5628528 Initial release of Discourse 2013-02-05 14:16:51 -05:00