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: 2665617271
...
head fork: kevinansfield/discourse
compare: 81c099a37c
Commits on Mar 15, 2013
@wojciechka wojciechka Support for running discourse with a prefix (i.e. as http://servernam…
…e/discourse)
e6ccc30
@ZogStriP ZogStriP fixes the random login on dev 8981587
Commits on Mar 18, 2013
@ZogStriP ZogStriP fix some issues when editing a topic title and then cancelling it 33c100d
@nlalonde nlalonde Add likes to admin dashboard 6a99d12
@nlalonde nlalonde Add email counts to admin dashboard 50b04b2
@eviltrout eviltrout Merge pull request #469 from wojciechka/master
Support for running discourse with a prefix (i.e. as http://servername/discourse)
e1e1bdd
@eviltrout eviltrout Merge pull request #472 from ZogStriP/fixes-random-login
fixes the random login on dev
c129897
@eviltrout eviltrout Merge pull request #489 from ZogStriP/fix-editing-a-category-and-canc…
…elling

fix some issues when editing a topic title and then cancelling it
c4a5f9d
@ZogStriP ZogStriP keeping french l10n up to date 43e13cf
@nlalonde nlalonde Say 'mod' instead of '5' on users per trust level table 766f437
@nlalonde nlalonde Fix admin dashboard layout on smaller widths 12768f1
@eviltrout eviltrout Move a bunch of callbacks into PostCreator b6224b0
@ZogStriP ZogStriP keep favorite/star button's title in sync with starred status 967b03f
@ZogStriP ZogStriP provide a better title on topic pages for crawlers 125ac9a
@nlalonde nlalonde Username change: check length in js, we don't need the server to do it c24f6d3
@eviltrout eviltrout Move MessageBus observer into PostCreator aea848f
@eviltrout eviltrout Converted flag threshold constants to enums 5aec526
@eviltrout eviltrout Move draft sequence incrementing out of `after_save` d5e4243
@eviltrout eviltrout Moved more `Post` callbacks into service classes 897d48b
@eviltrout eviltrout Convert Post type constants to Enum c1e40f5
@eviltrout eviltrout PostDestroyer to replace callbacks for destroying 59fc3bf
Commits on Mar 19, 2013
@ZogStriP ZogStriP consistent behavior of the composer's create button feecb13
@SamSaffron SamSaffron Merge pull request #494 from ZogStriP/consistent-composer-behavior
consistent behavior of the composer's create button
27b1650
@SamSaffron SamSaffron Merge pull request #491 from ZogStriP/better-topic-title-for-crawlers
provide a better title on topic pages for crawlers
c8b891d
@SamSaffron SamSaffron Merge pull request #490 from ZogStriP/updated-french-l10n
keeping french l10n up to date
cc9ea74
@SamSaffron SamSaffron Merge pull request #487 from ZogStriP/keep-favorite-title-in-sync-wit…
…h-status

keep favorite/star button's title in sync with starred status
0e1174d
@SamSaffron SamSaffron optimise dd03f44
@coding-horror coding-horror less wordy automatic post flag hidden PM 503520d
@SamSaffron SamSaffron oops 1cd26a7
@SamSaffron SamSaffron max upload size message when images are too big. 9805f7d
@kubabrecka kubabrecka cs translation update 9850386
@coding-horror coding-horror tighten up reply to spacing on composer f40e21e
@coding-horror coding-horror tighten composer spacing a bit for topics too f595ace
@SamSaffron SamSaffron mini profiler update with ?pp=flamegraph e6c70cb
@ZogStriP ZogStriP FIX: post removal is in portuguese 9acef70
@SamSaffron SamSaffron Merge pull request #497 from ZogStriP/fix-post-removal-message-in-por…
…tuguese

FIX: post removal message is in portuguese
66b26f6
@SamSaffron SamSaffron hmmm jshint should warn about this.... 851cd26
@SamSaffron SamSaffron fix minor mini profiler edge case ce28982
@eviltrout eviltrout Merge pull request #496 from kubabrecka/cs_update17
cs translation update
b1ca53e
@williamherry williamherry keep chinese i18n up to date 5b987b7
@eviltrout eviltrout Merge pull request #498 from williamherry/add_missing_translation
keep chinese i18n up to date
2d586d8
@eviltrout eviltrout Update Rails for latest security vunerability fixes 1c5613c
@nlalonde nlalonde Dashboard metrics link to their report pages dab49c7
@wojciechka wojciechka Logging in with username and password does not work in prefixed disco…
…urse
14689a4
@eviltrout eviltrout A site setting for how many similar topics are returned 96ac0c5
@eviltrout eviltrout Moved deleting tests to post_destroyer_spec 49c6603
@nlalonde nlalonde New layout for version check on admin dashboard 70f5ee5
@nlalonde nlalonde Move 'upgrade often' nag to the commits widget de84718
@nlalonde nlalonde Installed version is a link to the commit you're on 7b35a93
@nlalonde nlalonde Add encoding: utf-8 to locales/ js.erb files to fix rake assets:preco…
…mpile:all
7ecfc0b
@eviltrout eviltrout Update Ember.js 98847a9
@nlalonde nlalonde Revert "Add encoding: utf-8 to locales/ js.erb files to fix rake asse…
…ts:precompile:all"
1bdb318
@eviltrout eviltrout Add utf-8 headers to all ymls 7988428
@eviltrout eviltrout Revert "Update Rails for latest security vunerability fixes"
This reverts commit 1c5613c.
c518ad0
@eviltrout eviltrout Apply security fixes as a monkey^M^M^M^M^M^Mfreedom patch 1f0b28b
@SamSaffron SamSaffron Hash is faster than delegation and simpler to explain 3da1104
@SamSaffron SamSaffron loading a user in a post_action is wasteful ec948dc
@SamSaffron SamSaffron cache reply_to_user_id in post to eliminate a very nasty n+1 query 2a047df
@SamSaffron SamSaffron this should be optimised at some point 6127b29
Commits on Mar 20, 2013
@SamSaffron SamSaffron these mousemove events trigger an insane amount of get calls, I reall…
…y need my patch accepted in ember
e541c2a
@SamSaffron SamSaffron slight optimisation 7ec0288
@SamSaffron SamSaffron pre-stage our locales as well fcbc77d
@ZogStriP ZogStriP keep French l10n up to date 54399e4
@SamSaffron SamSaffron add indexes so counting topics and posts is faster 204759a
@ZogStriP ZogStriP ensure locales are not overwritten e61ca1f
@nverba nverba Update mini_profiler.rb
Passing a pre-defined Redis connection to MiniProfiler stops connection leakage. Should limit MiniProfiler connections to one per running process. 
9a1fb90
@SamSaffron SamSaffron Merge pull request #503 from nverba/patch-1
Update mini_profiler.rb
c125f5d
@SamSaffron SamSaffron Merge pull request #502 from ZogStriP/ensure-locales-are-not-overwritten
ensure locales are not overwritten
7ca2f7d
@SamSaffron SamSaffron Merge pull request #500 from ZogStriP/keep-french-l10n-up-to-date-201…
…3-03-20

keep French l10n up to date
a95a756
@SamSaffron SamSaffron Merge pull request #499 from wojciechka/master
Logging in with username and password does not work when using prefix URLs
0f5046a
@SamSaffron SamSaffron pull moderator into own column, rename trust levels 62c6054
@SamSaffron SamSaffron SO AWESOME!!!!!!!!!!!!!!!!!!!!!!!! 3f64a54
@SamSaffron SamSaffron Revert "ensure locales are not overwritten"
breaking now
bfeb75a
@SamSaffron SamSaffron symbols should really never be allowed in migrations, just raw sql f3f751d
@SamSaffron SamSaffron we should not be mixing this in to our serializers
1. it gives the class broken methods (like cache in production)
2. it conflicts with am serializers
381e280
@SamSaffron SamSaffron update am serializers to latest 04c6087
@ZogStriP ZogStriP ensure locales are not overwritten 6dab992
@ZogStriP ZogStriP updated PreloadStore API
so that it is more clear that we are deleting preloaded data once read
f1015fd
@tangramor tangramor Update the translations according to the latest en.yml 841bf3f
@nlalonde nlalonde Start detecting install problems and report them on the admin dashboa…
…rd. This commit adds check for Rails.env
1e4dd3e
@tangramor tangramor Add I18n support for "The topic has been deleted" message dc7b690
@nlalonde nlalonde Cache dashboard data in the controller, not the report model c3c25b8
@nlalonde nlalonde Dashboard warning when host_names is localhost c8508d3
@nlalonde nlalonde Dashboard warning when GC params are default d28d81a
@nlalonde nlalonde Merge pull request #506 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
23cee77
@nlalonde nlalonde Improve message when you change your password 5db1963
@eviltrout eviltrout Merge pull request #504 from ZogStriP/ensure-locales-are-not-overwrit…
…ten-take-2

ensure locales are not overwritten
a279664
@eviltrout eviltrout Make spec pending for now -- jenkins does not like it 8b6dbfc
@ZogStriP ZogStriP keep French l10n up to date 6dc6303
@SamSaffron SamSaffron Merge pull request #505 from ZogStriP/updated-preloadstore-api
updated PreloadStore API
cd9d99a
@SamSaffron SamSaffron Merge pull request #507 from ZogStriP/keep-french-l10n-up-to-date-3
keep French l10n up to date
a78287a
@coding-horror coding-horror slightly reduce read time req for trust level 1 002fab3
Commits on Mar 21, 2013
@ZogStriP ZogStriP fix the issue regarding the unban button ad8d078
@jammur jammur Update the Vagrantfile to conform to the latest spec (v1.1). 73b2d6f
@eviltrout eviltrout Updated Vagrantfile to support Vagrant 1.1.2 - you will probably need…
… to download

Vagrant again! http://downloads.vagrantup.com/
ddff23c
@eviltrout eviltrout Update production seed - make meta gray and pin the topics 31c27aa
@SamSaffron SamSaffron Eyeline will no fire any events if the window has no focus
After posts are rendered a debounced eyeline is fired
Dont trigger eyeline from TopicPostsView, its the wrong spot, will only fire on first render
0089619
@SamSaffron SamSaffron Merge pull request #508 from ZogStriP/fix-unban-button-on-user-admin-…
…page

fix the issue regarding the unban button
4a85634
@SamSaffron SamSaffron turns out that instansiating a storage provider and assigning it nowh…
…ere, just don't work
e3d30f1
@wojciechka wojciechka topic and admin dashboard not retrieving data properly when using prefix 910a622
@eviltrout eviltrout Oneboxes should use a sorted array for ordering, not a hash. 9d4ecd7
@eviltrout eviltrout Cache oneboxes in Redis now instead of postgres. babcfe6
@ZogStriP ZogStriP fix: can't click on avatars when on my profile page d84309a
@eviltrout eviltrout Merge pull request #509 from wojciechka/master
Topic and admin dashboard not retrieving data properly when using prefix
97b2f5b
@eviltrout eviltrout Merge pull request #510 from ZogStriP/fix-can-t-click-on-avatars-when…
…-on-my-profile-page

fix: can't click on avatars when on my profile page
c541d96
@coding-horror coding-horror update getting started section 2 86b82b8
@coding-horror coding-horror Update README.md a9fe67c
@coding-horror coding-horror Update README.md f04701e
@eviltrout eviltrout Refactor PostView b6f49e5
@eviltrout eviltrout Fixed a bunch of 'best of' errors and cleaned up JS. 5c4b794
@eviltrout eviltrout Replace "ok" with a close glyph ce3fa4d
@eviltrout eviltrout Show loading when filtering by user / best of 35ec6c6
@nlalonde nlalonde Remove old caching code from report model 38415f2
@nlalonde nlalonde Add 'all' column to admin dashboard counts 40962c8
@nlalonde nlalonde Dashboard warning when clockwork doesn't seem to be running 8cc7f3c
@ZogStriP ZogStriP keeping the French l10n up to date ce33432
@eviltrout eviltrout Merge pull request #512 from ZogStriP/keep-french-l10n-up-to-date-201…
…3-03-21

keeping the French l10n up to date
d81a323
@nlalonde nlalonde Add Java to vagrant image using chef 4d237c4
Commits on Mar 22, 2013
@kidoman kidoman .gitignore: Fix typo in the word refreshing c9a81e6
@kidoman kidoman .gitignore: Allow the binstubs folder generated by bundler to be ignored 929d4cd
@SamSaffron SamSaffron Merge pull request #516 from kid0m4n/fix-typo-1
.gitignore: Fix typo in the word refreshing
799f25b
@SamSaffron SamSaffron Merge pull request #515 from kid0m4n/ignore-binstubs
.gitignore: Allow the binstubs folder generated by bundler to be ignored
b516ecc
@kidoman kidoman .travis.yml: Start building discourse on ruby 2.0. Local build shows …
…green
c3affe3
@SamSaffron SamSaffron Merge pull request #517 from kid0m4n/start-testing-ruby-2
.travis.yml: Start building discourse on ruby 2.0. Local build shows gre...
2620d68
@eviltrout eviltrout Fixes regression with video embeds ee5213b
@Supermathie Supermathie Stage files to cdn77 one at a time
* cdn77 API isn't allowing more than one file in a prefetch request
* modify code to do them one-by-one
eedd696
@SamSaffron SamSaffron Merge pull request #520 from Supermathie/master
cdn prefetch: modify to pull files one-by-one
664915f
Dan Berman someone's been playing too much 9ad5720
@ZogStriP ZogStriP FIX: OpenGraph tags not fully sanitized 2ab08ef
@eviltrout eviltrout Merge pull request #524 from ZogStriP/fix-opengraph-tags-not-fully-sa…
…nitized

FIX: OpenGraph tags not fully sanitized
d5e03b0
@eviltrout eviltrout Merge pull request #522 from panckreous/dberman-typo
someone's been playing too much
d2a3fc8
habfast Improving french translation
Quoting everything
minor correction for respecting french grammar rules
bc1aa12
@kubabrecka kubabrecka cs translation update 377f380
@kubabrecka kubabrecka adding JS support for id and pt languages 4f74d4e
@kubabrecka kubabrecka update JS date formats for new languages d14198c
@nlalonde nlalonde Dashboard warning when sidekiq is not running 6f8d13d
@kubabrecka kubabrecka attemping to fix NL translation (client.nl.yml) which seems to be som…
…ehow broken
30e275f
@eviltrout eviltrout Cleaned up a bunch of JS 5ec8af0
@eviltrout eviltrout Animate in the bottom filter bar bfa14b4
@eviltrout eviltrout Update to master Ember.js 1544711
@kubabrecka kubabrecka removing some unused code b392143
@eviltrout eviltrout Merge pull request #526 from kubabrecka/cs_update
cs translation update
291bd0b
@eviltrout eviltrout Merge pull request #525 from habfast/master
Improving french L10E
de25c82
@eviltrout eviltrout Merge pull request #529 from kubabrecka/i18n_date_formats
update JS date formats for new languages
7527d65
@eviltrout eviltrout Merge pull request #530 from kubabrecka/fix_nl_translation
attemping to fix NL translation (client.nl.yml) which seems to be somehow broken
62f60a4
@eviltrout eviltrout Merge pull request #528 from kubabrecka/missing_js_langs
adding JS support for id and pt languages
7b3149a
@eviltrout eviltrout Merge pull request #531 from kubabrecka/unused_code
removing some unused code
1d7c38b
@dacap dacap Add Spanish translation (WIP) 2481fed
@eviltrout eviltrout Re-enable integrity check 3d4fb43
@moneypenny moneypenny Use consistent new-style hashes in render calls *twitch* 54c7b1a
@nlalonde nlalonde Update admin dashboard views now that ember lets us render the same v…
…iew multiple times with different models
ab412dd
@eviltrout eviltrout The "Best Of" mode uses a percentage ranking of posts. 9c38c13
@nlalonde nlalonde Dashboard memory warning aa6e87c
@eviltrout eviltrout Merge pull request #533 from moneypenny/master
Use consistent new-style hashes in render calls
8761b5a
@eviltrout eviltrout Merge pull request #527 from dacap/spanish
Spanish translation
f1fbb9b
@eviltrout eviltrout Fix i18n integrity issue 86eaf10
@kubabrecka kubabrecka update cs translation 260a113
@nlalonde nlalonde Add moderator and admin count to dashboard 158cda7
@coding-horror coding-horror reduce basic user time required from 25m to 20m f0b57d5
@ZogStriP ZogStriP keep French l10n up to date d2e47ca
Commits on Mar 23, 2013
@nverba nverba added mandrill email example ba189df
@SamSaffron SamSaffron Merge pull request #536 from nverba/heroku-doc
Added mandrill email example and Gemfile step to HEROKU.md
c20aa07
@SamSaffron SamSaffron Merge pull request #534 from kubabrecka/cs_update
update cs translation
4907d16
@kubabrecka kubabrecka adding i18n integrity check for valid YAML and valid content 624649d
@kubabrecka kubabrecka remove unnecessary .gitkeep files 4424328
Jeff Atwood for PMs, switch to envelope glyph instead of lock 38285b6
@SamSaffron SamSaffron update better errors
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
40b2f0f
@SamSaffron SamSaffron correct line endings bceb124
@kubabrecka kubabrecka extract hardcoded string into locales 5de0d85
@SamSaffron SamSaffron Merge pull request #540 from kubabrecka/remove_gitkeep
remove unnecessary .gitkeep files
7b6f54a
@kubabrecka kubabrecka translation status script, take 2 2d405be
@kidoman kidoman topic_poster.rb: Fix formatting of the attributes return value 3f27ffc
@eviltrout eviltrout Merge pull request #544 from kid0m4n/fix-formatting-1
topic_poster.rb: Fix formatting of the attributes return value
6eba6ad
@eviltrout eviltrout Merge pull request #542 from kubabrecka/translation_status2
translation status script, take 2
7642f56
@eviltrout eviltrout Merge pull request #541 from kubabrecka/extract_string
extract hardcoded string into locales
38d0076
@eviltrout eviltrout Merge pull request #538 from kubabrecka/i18n_spec
adding i18n integrity check for valid YAML and valid content
3d210f1
@eviltrout eviltrout Merge pull request #535 from ZogStriP/keep-french-l10n-up-to-date-201…
…3-03-22

keep French l10n up to date [ci skip]
cb9106c
@eviltrout eviltrout Bump up best of to top 20% 842760e
@eviltrout eviltrout Fix bug where new posts wouldn't load after hitting the bottom if you…
…'d filtered
030ecfa
@kubabrecka kubabrecka cs translation update e38565e
@kubabrecka kubabrecka extract hardcoded strings from admin reports 274d665
@eviltrout eviltrout Merge pull request #552 from kubabrecka/extract_strings_reports
extract hardcoded strings from admin reports
1a80412
@eviltrout eviltrout Merge pull request #551 from kubabrecka/cs_update
cs translation update
81c099a