Commit graph

622 commits

Author SHA1 Message Date
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