Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: kevinansfield/discourse
base: 985cbb92f1
...
head fork: kevinansfield/discourse
compare: a663251bd4
Commits on Mar 05, 2013
@goshakkk goshakkk refactor Category
* move callback bodies to separate methods (easier to test)
a1825fe
Commits on Mar 06, 2013
@alxndr alxndr Prevent quote content collisions with multiples in one post
[Fixes #142]
02f29cd
Luís Ramalho Postuguese translations 7324c74
@ismaelga ismaelga Portuguese translations 2396673
Luís Ramalho PT corrections 3333abe
@kubabrecka kubabrecka CZ translation update + pseudolocalization update 98ebd91
@kubabrecka kubabrecka fix wrongly escaped HTML in <noscript> tags 69d9856
@SamSaffron SamSaffron Merge pull request #383 from kubabrecka/cs_update7
CZ translation update + pseudolocalization update
33d1ea5
@SamSaffron SamSaffron Merge pull request #379 from Sinemys/portuguese-translations
Portuguese translations
674ed94
Commits on Mar 07, 2013
@ZogStriP ZogStriP keeping client.fr.yml up to date 9d93292
@SamSaffron SamSaffron Merge pull request #386 from ZogStriP/keeping-client.fr.yml-up-to-date
keeping client.fr.yml up to date
a0949ca
@ZogStriP ZogStriP globalized wikipedia onebox 621995f
@ZogStriP ZogStriP highlight the first of the newly loaded topics when scrolling 0027768
@ryanprayogo ryanprayogo More translation for the Indonesian language fee3182
Sam update mini profiler so I can see ENV 590bb2a
Regis Hanol added the min-search-term-length site setting 5703d6c
@nlalonde nlalonde Handle when github api returns a null author, and other missing info 3af2ab9
@eviltrout eviltrout Cleaned up TopicUserSpec, introduces clearing of pinned topics f8d8272
@eviltrout eviltrout Oops, didn't mean to revert to http on rubygems. 6277397
@eviltrout eviltrout Merge pull request #388 from ryanprayogo/master
More translation for the Indonesian language
0d9b251
@eviltrout eviltrout Merge pull request #387 from ZogStriP/g10n-wikipedia-oneboxer
globalized wikipedia onebox
5349e1b
@eviltrout eviltrout Merge pull request #384 from kubabrecka/fix_html_escapes
fix wrongly escaped HTML in <noscript> tags
c735914
@eviltrout eviltrout Category Topics are no longer invisible, they are pinned. 052887c
@kubabrecka kubabrecka 1st attempt to support i18n in dates and times 2e76e33
@nlalonde nlalonde Disable submit button on signup form when you've submitted the form 1133d90
@nlalonde nlalonde On signup, handle duplicate key errors on email and username better 2ebe033
@nlalonde nlalonde Fix jquery in the github commits widget 7030f9c
@nlalonde nlalonde Add a warning about bundle update to TROUBLESHOOTING.md 0bbcd6f
@eviltrout eviltrout Add opengraph and twitter card support to topics d848a9f
Sam upgrade the ruby racer b27d4dc
Commits on Mar 08, 2013
@kubabrecka kubabrecka updating cs translation d899327
Sam remove N+1 queries d6ca23a
Sam add fast xor, we need really fast xor to keep our password function h…
…onest.
e11af13
@eviltrout eviltrout Merge pull request #394 from kubabrecka/cs_update8
updating cs translation
724057b
@eviltrout eviltrout Merge pull request #390 from ZogStriP/min-search-term-length-site-set…
…ting

added the min-search-term-length site setting
fb573b9
@kubabrecka kubabrecka apply locale in sidekiq jobs 3a8cfff
@kubabrecka kubabrecka messagebus diagnostics process path on Mac OS bdeef46
@eviltrout eviltrout Merge branch 'refactor-category' of git://github.com/goshakkk/discourse
Conflicts:
	app/models/category.rb
b8fd734
@eviltrout eviltrout Merge pull request #397 from kubabrecka/fix_ps_warning
messagebus diagnostics process path on Mac OS
84b240e
@eviltrout eviltrout Merge pull request #380 from alxndr/master
Keep track of state/content between multiple quotes in a single post
82b7d3a
@kubabrecka kubabrecka update cs localization + pseudolocalization bb10212
@eviltrout eviltrout Merge pull request #385 from ZogStriP/highlight-first-of-loaded-topics
highlight the first of the newly loaded topics when scrolling
c5c1ddf
@tangramor tangramor Support for Simplified Chinese thanks to tangramor c5761ea
@eviltrout eviltrout Merge pull request #399 from kubabrecka/update_cs9
update cs localization + pseudolocalization
0af114a
@alxndr alxndr remove duplicated quote_title translation string fe7fd2a
@eviltrout eviltrout User Profile enhancements:
- Added PreloadStore support to avoid duplicate requests
- preliminary SEO
- Support for opengraph/twitter cards
d1d4530
@eviltrout eviltrout Fixes broken jasmine test - PreloadStore now returns null 97ba6f3
@coding-horror coding-horror copyedits 53d8e49
@eviltrout eviltrout First stab at oneboxing of meta.discourse.org 908bba8
@eviltrout eviltrout Oops escape everything but image urls 4c7b0a4
@eviltrout eviltrout Robin sucks at merging! This fixes a n+1 query. 8c02d2f
@nlalonde nlalonde Version bump to 0.8.3 4aa1122
Commits on Mar 09, 2013
@ZogStriP ZogStriP keeping French translations up to date 6478db3
@SamSaffron SamSaffron wrong conditional 325e28c
@eviltrout eviltrout Merge pull request #404 from ZogStriP/keeping-french-translations-up-…
…to-date

keeping French translations up to date
24db302
@Andersos Andersos Small change from xyz.com to example.com a7a1cd7
@nlalonde nlalonde Add stats to the admin dashboard 8927432
@nlalonde nlalonde Fix a jshint failure 3d7dfd3
@ZogStriP ZogStriP keeping french translations up to date 7fc1565
Commits on Mar 10, 2013
@ikbear ikbear Add some zh_CN translation b7687b4
@kubabrecka kubabrecka updating cs translation e27f499
@SamSaffron SamSaffron requiring is mega expensive, lets not do it every request. 22f8100
@eviltrout eviltrout Merge pull request #407 from ZogStriP/keeping-french-l10n-up-to-date
keeping french translations up to date
dac9b4a
@eviltrout eviltrout Merge pull request #409 from kubabrecka/cs_update10
updating cs translation
0b3ae66
@eviltrout eviltrout Merge pull request #408 from ikbear/fix_zh_CN_translation_error
Add some zh_CN translation
45c4382
Martin Potthast Initial version of the German l10n. 8d2b53a
Martin Potthast Added locale to assets. cfc93ad
Martin Potthast Failed to declare de: at the top of the translation files. ba90001
Martin Potthast Revised German l10n d39f324
Martin Potthast Further revisions. ef134b4
Martin Potthast And some further revisions to German l10n. 0ffa0fe
@ZogStriP ZogStriP allows the submission of the create account form by pressing enter 4a9c30b
Austin Bergstrom added observer to Discourse.PagedownEditor value to refresh previewer ba80ca2
Commits on Mar 11, 2013
@SamSaffron SamSaffron added profile environment for perftools profiling (1.9.3 only) 22a4580
@SamSaffron SamSaffron remove perftools, no need for it in the gem file, it blows up on trav…
…is and most devs don't need it anyway
62f2387
@SamSaffron SamSaffron Merge pull request #405 from Andersos/patch-1
Small change from xyz.com to example.com
46b33c3
@SamSaffron SamSaffron Merge pull request #396 from kubabrecka/sidekiq_i18n_1
apply locale in sidekiq jobs
849066c
@SamSaffron SamSaffron Merge pull request #411 from potthast/german-l10n
German l10n of Discourse. Works so far, but lots of fine-tuning still required.
a2facaa
@SamSaffron SamSaffron exceptions are BAD
the old code wacked on 10ms to every home page request, for no real reason.
e62bb99
@SamSaffron SamSaffron fuff with test so it passes 621f946
@SamSaffron SamSaffron lets give ruby some more memory so tests run faster 8a91b96
@coding-horror coding-horror increase default minimum topic title length to 15 3414e2b
@Andersos Andersos Updated pull #405 for all languagefiles
Small change from xyz.com to example.com
bd0c979
@SamSaffron SamSaffron added basic passenger support, no long polling but functions
clean up initializers so they are ordered properly
1c8eef7
@SamSaffron SamSaffron Merge branch 'master' of github.com:discourse/discourse 470dc8c
Regis Hanol fix the specs errors due to a change to the min topic title's length 2039c0f
@eviltrout eviltrout Merge pull request #421 from ZogStriP/fixing-topic-specs
fix the specs errors due to a change to the min topic title's length
d06449b
@eviltrout eviltrout Merge pull request #415 from Andersos/example-1
Updated pull #405 for all language files
b554bf4
@tms tms Always allow reply as new topic, for users who can reply as new topic 52b1d13
@eviltrout eviltrout Merge pull request #413 from ZogStriP/submit-create-account-form-by-p…
…ressing-enter

allows the submission of the create account form by pressing enter
866e0d4
@nlalonde nlalonde Fix report_spec so it's not so fussy and breaks sometimes f1908fd
@nlalonde nlalonde Merge branch 'master' of github.com:discourse/discourse 37cf8b7
@eviltrout eviltrout Cleaned up probe code a little. 4360d1b
@eviltrout eviltrout Merge branch 'date_i18n_support' of git://github.com/kubabrecka/disco…
…urse
de1d488
@eviltrout eviltrout Merge pull request #392 from kubabrecka/date_i18n_support
1st attempt to support i18n in dates and times
d175da6
@eviltrout eviltrout Merge pull request #400 from alxndr/i18n-chinese
remove duplicated quote_title translation string
0b3910c
@eviltrout eviltrout Merge pull request #414 from awbergs/pagedown_observe
added observer to Discourse.PagedownEditor value to refresh previewer
dad71a7
@eviltrout eviltrout Merge branch 'master' of github.com:discourse/discourse 1205e0d
@eviltrout eviltrout Fixes #313 - Without a slug the search urls were wrong. 88bb25f
@eviltrout eviltrout Fixes JSHint error on PageDown. Updated for Uniform Access Principle. 3b7ac01
@eviltrout eviltrout Remove duplicate Spam flag type 1b808a5
@nlalonde nlalonde Convert github commits widget to ember bf37e1b
@ZogStriP ZogStriP fixes the highlight issue @coding-horror reported 8a143ba
@coding-horror coding-horror Merge pull request #426 from ZogStriP/fix-highlight-issue
fixes the highlight issue @coding-horror reported
2115c36
@SamSaffron SamSaffron don't try to load airbrake if there is no config for it a0bdbe0
Commits on Mar 12, 2013
@SamSaffron SamSaffron amend airbrake location 3a58e7a
@SamSaffron SamSaffron 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
babb5b7
@ZogStriP ZogStriP globalized some missing strings 1d7aa1f
@SamSaffron SamSaffron don't show pinned stuff on the front page for anon 3053831
@SamSaffron SamSaffron Merge pull request #427 from ZogStriP/missing-g10n-strings
globalized some missing strings
ec59cbc
@tangramor tangramor modified reports related translations and a few email templates 4b8a392
@tangramor tangramor Merge remote-tracking branch 'upstream/master' into mywork 3a6a4c6
@SamSaffron SamSaffron if you try posting a reply and are looking at a different topic, pop …
…this window up
91b507f
@SamSaffron SamSaffron use font awesome for the composer toolbar (not very happy with headin…
…g and hr icon, but can not find anything better)
a5b2c0c
@kubabrecka kubabrecka cs translation update e0ab379
@kubabrecka kubabrecka extract hardcoded string into locale f5f502d
@SamSaffron SamSaffron Merge pull request #431 from kubabrecka/extract_strings12
extract hardcoded string into locale
a2dfc84
@SamSaffron SamSaffron Merge pull request #430 from kubabrecka/cs_update12
cs translation update
079b2d3
@eviltrout eviltrout Merge pull request #429 from tangramor/master
Add some missed translations for server.zh_CN.yml
9db0dde
@kubabrecka kubabrecka extract hardcoded "post {{number}}" into locale strings ac47c36
@kubabrecka kubabrecka cs translation typo fixes 1cab4d3
@eviltrout eviltrout Merge pull request #432 from kubabrecka/i18n_post_number
extract hardcoded "post {{number}}" into locale strings
c9535ff
@eviltrout eviltrout Merge pull request #434 from kubabrecka/cs_typo_fixes
cs translation typo fixes
1e017dd
@eviltrout eviltrout Fix: When you split topics, featured users and like counts were incor…
…rect.
1103dde
@eviltrout eviltrout When editing a post, provide more information in the composer title a5a97f8
@kubabrecka kubabrecka reports don't work when default_locale != en + some missing translations b97a3c8
@nlalonde nlalonde Add total users report; restructure dashboard reports js 4eda422
@nlalonde nlalonde Better alignment of judgemental faces 9422adf
@nlalonde nlalonde Add flag counts to admin dashboard 40c27ff
@eviltrout eviltrout Fixes bug with creating new topic due to edit text changing. 9d4c8ed
@eviltrout eviltrout Small JSHint issue 59c52a6
@coding-horror coding-horror copyedit on reply to diff topic reminder cde9d8c
@ZogStriP ZogStriP keeping French localization up to date 7365ede
@kubabrecka kubabrecka update cs translation 505bf29
@ZogStriP ZogStriP the composer will now count only significant whitespaces 439ac95
@SamSaffron SamSaffron Merge pull request #440 from ZogStriP/composer-count-only-significant…
…-whitespaces

the composer will now count only significant whitespaces
259827d
Commits on Mar 13, 2013
@SamSaffron SamSaffron Merge pull request #439 from kubabrecka/update_cs14
update cs translation
c8b9f8d
@SamSaffron SamSaffron Merge pull request #438 from ZogStriP/keeping-french-l10n-up-to-date
keeping French localization up to date
5a2d8e3
@SamSaffron SamSaffron 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
38f1853
@SamSaffron SamSaffron correct broke use streams 1d360a4
@SamSaffron SamSaffron change icon for Jeff d1fa3dd
@SamSaffron SamSaffron hacked dates so jeff sees no more 1mons everywhere. fcc6aac
@SamSaffron SamSaffron regression a663251