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: 6e7e5cb9e2
...
head fork: kevinansfield/discourse
compare: 2665617271
Commits on Mar 14, 2013
@kubabrecka kubabrecka implement color picking from predefined set for category badges + opt…
…ion to change foreground color
8784c55
@ZogStriP ZogStriP displays a message when a failure happen while creating a new category 3bf6625
@ZogStriP ZogStriP extracted hard coded strings in the admin javascript files cad55bf
Commits on Mar 15, 2013
@ZogStriP ZogStriP displays the number of characters left when editing the topic title aef014f
@eviltrout eviltrout Merge pull request #465 from ZogStriP/extracted-hard-coded-string-in-…
…admin-javascript-files

extracted hard coded strings in the admin javascript files [ci skip]
7714e20
@eviltrout eviltrout Big commit:
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
ad082ce
@eviltrout eviltrout We are randomly seeing the wrong serializing used in test. Trying to …
…revert

this to see if it is the cause.

Revert "see: rails-api/active_model_serializers#233"

This reverts commit 2a5cbd8.
87b950f
@eviltrout eviltrout FIX: Twitter tags were using `property` instead of `name`. dd5885b
@eviltrout eviltrout Slightly offset the second popup if two are on at once be01e7b
@eviltrout eviltrout Merge pull request #462 from kubabrecka/colorpicker3
implement color picking from predefined set for category badges + option to change foreground color
76d8df6
@eviltrout eviltrout Merge branch 'fixes-topic-title-length-too-short' of git://github.com…
…/ZogStriP/discourse

Conflicts:
	app/assets/javascripts/discourse/controllers/composer_controller.js
	app/assets/javascripts/discourse/views/composer_view.js
	config/locales/client.en.yml
1a60301
@eviltrout eviltrout Fixed some merge conflicts 67f0de4
@kubabrecka kubabrecka cs translation update d40ebce
@coding-horror coding-horror fancier favorite star on topics e22b4fe
@coding-horror coding-horror just set opacity of links on archived not row 0db31b3
@coding-horror coding-horror copyedit on similar topics 3ba567e
@nlalonde nlalonde Show current user count for now, not at different points in time 8983df9
@nlalonde nlalonde Remove admin_report_total_users_view.js 1d9764d
@nlalonde nlalonde Add user counts for each trust level to admin dashboard d9cdde9
@nlalonde nlalonde Version bump to v0.8.4 19860bd
@ZogStriP ZogStriP keeping the French l10n up to date de58e30
@ZogStriP ZogStriP bind the text entered in the category name text field to the badge a500f6b
Commits on Mar 16, 2013
@svanderbleek svanderbleek Use Diffy as DiffEngine implementation 204dcc4
@nverba nverba refactored redis.yml.sample for easier local precompile, updated docs c5b62ac
@SamSaffron SamSaffron Merge pull request #475 from svanderbleek/diffy
Use Diffy as DiffEngine implementation
b0dae74
@SamSaffron SamSaffron Merge pull request #471 from kubabrecka/cs_update16
cs translation update
837dea3
@kubabrecka kubabrecka extract string from commits widget 94c0e73
@eviltrout eviltrout Merge pull request #479 from kubabrecka/commits_extract1
extract string from commits widget
43497d8
@eviltrout eviltrout Merge pull request #473 from ZogStriP/update-french-l10n-1
keeping the French l10n up to date
ab2073f
@eviltrout eviltrout Merge pull request #474 from ZogStriP/bind-category-text-field-to-cat…
…egory-badge

bind the text entered in the category name text field to the badge
e4dfb0a
@ZogStriP ZogStriP fix: reply draft won't save 83b8a33
@SamSaffron SamSaffron Merge pull request #480 from ZogStriP/fix-reply-draft-wont-save
fix: reply draft won't save
ee1460e
@SamSaffron SamSaffron Merge pull request #470 from nverba/update
refactored redis.yml.sample for easier local precompile, updated docs
46b3c36
@SamSaffron SamSaffron mini profiler and am serializer update 1a20291
@SamSaffron SamSaffron update am serializer to latest with my perf fix 9fb3f54
@nlalonde nlalonde Comment out report_spec.rb for now because it fails sometimes 0e63de5
Commits on Mar 17, 2013
@ZogStriP ZogStriP site setting for category colors bc9e931
@SamSaffron SamSaffron Revert "update am serializer to latest with my perf fix"
turns out it is broken for now due to other am updates
efd883f
@eviltrout eviltrout Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happe…
…n-while-creating-a-new-category

displays a message when a failure happen while creating a new category
4e05733
@eviltrout eviltrout Merge pull request #483 from ZogStriP/site-setting-for-category-color
site setting for category colors
42c234e
@williamherry williamherry add missing translation for chinese 4e1c3b6
@Hanzo55 Hanzo55 Update README.md
- bullet pointed the getting started guide
- added a reference to the Admin "How To" wiki page
- clarified the developer guide as adequate for beginners
9511bee
@eviltrout eviltrout For Evil Trout blog part 2: switch between bar chart and table 0b4339c
@SamSaffron SamSaffron Merge pull request #485 from williamherry/add_missing_translation_for…
…_chinese

add missing translation for chinese
2665617