Commit Graph

3738 Commits

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