Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

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: 3cb729df21
...
head fork: kevinansfield/discourse
compare: 95a939d6af
Checking mergeability… Don't worry, you can still create the pull request.
Commits on Mar 22, 2013
@SamSaffron SamSaffron update better errors
allow me to pass a special IP address in dev mode so I can debug ( set TRUSTED_IP )
a73c9dd
@SamSaffron SamSaffron refactor analysis of read posts and centralize logic e99f137
@kubabrecka kubabrecka fix duplicate auth_token in development database images 113d0e0
@sbauch sbauch added email whitelist SiteSetting feature to replicate email blacklis…
…t. email_validator method now also uses the regex method for both the whitelist and blacklist.
77e3434
Commits on Mar 23, 2013
@SamSaffron SamSaffron cleanup 35a9051
@SamSaffron SamSaffron so subtle ... ae2cfa3
@nverba nverba Update Sidekiq and config 0c7579e
@kubabrecka kubabrecka implement MemInfo.mem_total on Mac OS X 0e27af8
Commits on Mar 24, 2013
@nlalonde nlalonde Fix a typo and add a step to DEVELOPER-ADVANCED.md ff3028d
@ZogStriP ZogStriP [fixes #391] exception when wrong resource type in URL 0da8f35
@SamSaffron SamSaffron Merge pull request #559 from ZogStriP/fix-exception-when-wrong-resour…
…ce-type-in-url

[fixes #391] exception when wrong resource type in URL
b1d1ab7
@SamSaffron SamSaffron Merge pull request #532 from kubabrecka/fix_duplicate_tokens
fix duplicate auth_token in development database images
ca99772
@SamSaffron SamSaffron Merge pull request #492 from sbauch/email-whitelist
added email whitelist SiteSetting feature to replicate email blacklist S...
36a0694
@kidoman kidoman Convert a lot of :a => b to a: b and bring peace to the world 5dfb04e
@SamSaffron SamSaffron Merge pull request #547 from kid0m4n/convert-ruby-1-9-syntax
Convert a lot of :a => b to a: b and bring peace to the world
deb603f
Commits on Mar 25, 2013
@SamSaffron SamSaffron correct multisite functionality for omniauth 988a712
@SamSaffron SamSaffron Merge branch 'scroll_work' 4cc1b88
@SamSaffron SamSaffron get rid of metamorph 3f0251d
@SamSaffron SamSaffron fix missing info error 6804c99
@SamSaffron SamSaffron wow, this has been broken for OH so long, we need to segragate users …
…correctly so MP results work as expected
67c4384
@SamSaffron SamSaffron update mp 42eb1fa
@SamSaffron SamSaffron comment out dead code
add some explanations
f921d1c
@SamSaffron SamSaffron fix mp in prd 622568f
@nlalonde nlalonde Update DEVELOPER-ADVANCED.md 0784c3b
@malachaifrazier malachaifrazier Update VAGRANT.md
Updated to include direct link to Guard Repo 
f9ae79b
@SamSaffron SamSaffron Merge pull request #562 from malachaifrazier/patch-2
Update VAGRANT.md to include direct link to Guard Repo 
5b312dd
@tangramor tangramor Update zh_CN and zh_TW to current en.yml a168ee2
@eviltrout eviltrout Merge pull request #563 from tangramor/master
Update the zh_CN and zh_TW translations to the latest en.yml
ef5da83
@nlalonde nlalonde Merge pull request #550 from kubabrecka/memtotal_macos
implement MemInfo.mem_total on Mac OS X
4fec7d2
@eviltrout eviltrout Merge branch 'update-sidekiq' of git://github.com/nverba/discourse
Conflicts:
	config/initializers/sidekiq.rb
7c505df
@nlalonde nlalonde Remove the extra column from per_day_counts_report 4fb3b58
@nlalonde nlalonde Fail version_check job silently in development mode 95a939d