Commit Graph

3603 Commits

Author SHA1 Message Date
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
Sam
a2dfc8472d Merge pull request #431 from kubabrecka/extract_strings12
extract hardcoded string into locale
2013-03-12 03:31:10 -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
a5b2c0c476 use font awesome for the composer toolbar (not very happy with heading and hr icon, but can not find anything better) 2013-03-11 23:33:36 -07: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
Sam
ec59cbc73f Merge pull request #427 from ZogStriP/missing-g10n-strings
globalized some missing strings
2013-03-11 18:35:30 -07:00
Sam
3053831b97 don't show pinned stuff on the front page for anon 2013-03-11 18:30:25 -07:00
Régis Hanol
1d7aa1f6cf globalized some missing strings 2013-03-12 02:17:45 +01:00
Sam
babb5b7b52 Merge pull request #418 from tms/always-allow-reply-as-new
Always allow reply as new topic, for users who can reply as new topic
2013-03-11 17:27:54 -07: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
Jeff Atwood
2115c36c84 Merge pull request #426 from ZogStriP/fix-highlight-issue
fixes the highlight issue @coding-horror reported
2013-03-11 13:14:38 -07:00
Régis Hanol
8a143bacaf fixes the highlight issue @coding-horror reported 2013-03-11 20:58:02 +01:00
Neil Lalonde
bf37e1b995 Convert github commits widget to ember 2013-03-11 15:27:06 -04:00
Robin Ward
1b808a54a4 Remove duplicate Spam flag type 2013-03-11 14:18:37 -04:00
Robin Ward
3b7ac014de Fixes JSHint error on PageDown. Updated for Uniform Access Principle. 2013-03-11 12:30:13 -04:00
Robin Ward
88bb25f2f6 Fixes #313 - Without a slug the search urls were wrong. 2013-03-11 12:18:25 -04:00
Robin Ward
1205e0d3d4 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 11:32:09 -04:00
Robin Ward
dad71a78f7 Merge pull request #414 from awbergs/pagedown_observe
added observer to Discourse.PagedownEditor value to refresh previewer
2013-03-11 08:31:47 -07: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
Neil Lalonde
37cf8b7d38 Merge branch 'master' of github.com:discourse/discourse 2013-03-11 10:44:40 -04:00
Neil Lalonde
f1908fd8e8 Fix report_spec so it's not so fussy and breaks sometimes 2013-03-11 10:40:13 -04:00
Robin Ward
866e0d4e87 Merge pull request #413 from ZogStriP/submit-create-account-form-by-pressing-enter
allows the submission of the create account form by pressing enter
2013-03-11 07:27:01 -07:00
tms
52b1d13af7 Always allow reply as new topic, for users who can reply as new topic 2013-03-11 10:20:41 -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
Robin Ward
d06449b257 Merge pull request #421 from ZogStriP/fixing-topic-specs
fix the specs errors due to a change to the min topic title's length
2013-03-11 07:09:52 -07:00
Regis Hanol
2039c0f704 fix the specs errors due to a change to the min topic title's length 2013-03-11 14:51:24 +01:00
Sam
470dc8c14c Merge branch 'master' of github.com:discourse/discourse 2013-03-11 05:33:56 -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
Jeff Atwood
3414e2bb92 increase default minimum topic title length to 15 2013-03-10 22:45:55 -07:00
Sam
8a91b96ec7 lets give ruby some more memory so tests run faster 2013-03-10 20:14:46 -07:00
Sam
621f946193 fuff with test so it passes 2013-03-10 19:58:42 -07:00
Sam
e62bb9922e exceptions are BAD
the old code wacked on 10ms to every home page request, for no real reason.
2013-03-10 19:11:33 -07: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
849066cff5 Merge pull request #396 from kubabrecka/sidekiq_i18n_1
apply locale in sidekiq jobs
2013-03-10 17:54:23 -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
62f238714a remove perftools, no need for it in the gem file, it blows up on travis and most devs don't need it anyway 2013-03-10 17:30:42 -07:00
Sam
22a4580df5 added profile environment for perftools profiling (1.9.3 only) 2013-03-10 17:21:56 -07:00
Austin Bergstrom
ba80ca2ee5 added observer to Discourse.PagedownEditor value to refresh previewer 2013-03-10 19:56:32 -04:00
Régis Hanol
4a9c30bf33 allows the submission of the create account form by pressing enter 2013-03-11 00:46:28 +01: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