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 |