c4a5f9d47b
Merge pull request #489 from ZogStriP/fix-editing-a-category-and-cancelling
...
fix some issues when editing a topic title and then cancelling it
2013-03-18 07:41:49 -07:00
c1298979bb
Merge pull request #472 from ZogStriP/fixes-random-login
...
fixes the random login on dev
2013-03-18 07:30:06 -07:00
e1e1bdd0b1
Merge pull request #469 from wojciechka/master
...
Support for running discourse with a prefix (i.e. as http://servername/discourse )
2013-03-18 07:24:11 -07:00
50b04b2209
Add email counts to admin dashboard
2013-03-18 10:08:09 -04:00
6a99d12784
Add likes to admin dashboard
2013-03-18 10:08:08 -04:00
33c100da17
fix some issues when editing a topic title and then cancelling it
2013-03-18 12:00:50 +01:00
2665617271
Merge pull request #485 from williamherry/add_missing_translation_for_chinese
...
add missing translation for chinese
2013-03-17 14:46:18 -07:00
0b4339c103
For Evil Trout blog part 2: switch between bar chart and table
2013-03-17 15:03:34 -04:00
9511beec11
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
2013-03-17 11:59:24 -06:00
4e1c3b635f
add missing translation for chinese
2013-03-18 00:48:56 +08:00
42c234e927
Merge pull request #483 from ZogStriP/site-setting-for-category-color
...
site setting for category colors
2013-03-17 04:48:01 -07:00
4e057335d5
Merge pull request #464 from ZogStriP/fix-issues-when-a-failure-happen-while-creating-a-new-category
...
displays a message when a failure happen while creating a new category
2013-03-17 04:47:44 -07:00
efd883fdf3
Revert "update am serializer to latest with my perf fix"
...
turns out it is broken for now due to other am updates
2013-03-16 19:13:11 -07:00
bc9e931304
site setting for category colors
2013-03-17 01:24:52 +01:00
0e63de59b5
Comment out report_spec.rb for now because it fails sometimes
2013-03-16 19:42:23 -04:00
9fb3f54427
update am serializer to latest with my perf fix
2013-03-16 15:57:44 -07:00
1a20291ff4
mini profiler and am serializer update
2013-03-16 15:56:16 -07:00
46b3c364f8
Merge pull request #470 from nverba/update
...
refactored redis.yml.sample for easier local precompile, updated docs
2013-03-16 15:51:01 -07:00
ee1460e932
Merge pull request #480 from ZogStriP/fix-reply-draft-wont-save
...
fix: reply draft won't save
2013-03-16 15:01:50 -07:00
83b8a3386f
fix: reply draft won't save
2013-03-16 18:14:54 +01:00
e4dfb0a935
Merge pull request #474 from ZogStriP/bind-category-text-field-to-category-badge
...
bind the text entered in the category name text field to the badge
2013-03-16 08:20:10 -07:00
ab2073f152
Merge pull request #473 from ZogStriP/update-french-l10n-1
...
keeping the French l10n up to date
2013-03-16 08:18:55 -07:00
43497d8034
Merge pull request #479 from kubabrecka/commits_extract1
...
extract string from commits widget
2013-03-16 08:18:06 -07:00
94c0e73ca6
extract string from commits widget
2013-03-16 12:39:20 +01:00
837dea355c
Merge pull request #471 from kubabrecka/cs_update16
...
cs translation update
2013-03-16 02:44:20 -07:00
b0dae74f04
Merge pull request #475 from svanderbleek/diffy
...
Use Diffy as DiffEngine implementation
2013-03-16 02:43:47 -07:00
c5b62ac52a
refactored redis.yml.sample for easier local precompile, updated docs
2013-03-16 01:35:38 +00:00
204dcc43a4
Use Diffy as DiffEngine implementation
2013-03-15 17:31:51 -07:00
a500f6b307
bind the text entered in the category name text field to the badge
2013-03-16 00:59:11 +01:00
de58e30a8f
keeping the French l10n up to date
2013-03-16 00:40:33 +01:00
89815878d9
fixes the random login on dev
2013-03-16 00:26:32 +01:00
e6ccc300dc
Support for running discourse with a prefix (i.e. as http://servername/discourse )
2013-03-16 00:01:21 +01:00
19860bd2c5
Version bump to v0.8.4
2013-03-15 18:21:19 -04:00
d9cdde9aa7
Add user counts for each trust level to admin dashboard
2013-03-15 18:09:02 -04:00
1d9764d8fc
Remove admin_report_total_users_view.js
2013-03-15 18:09:01 -04:00
8983df9856
Show current user count for now, not at different points in time
2013-03-15 18:09:01 -04:00
3ba567eba0
copyedit on similar topics
2013-03-15 14:44:46 -07:00
0db31b3398
just set opacity of links on archived not row
2013-03-15 14:17:47 -07:00
e22b4fe229
fancier favorite star on topics
2013-03-15 14:06:04 -07:00
d40ebce979
cs translation update
2013-03-15 22:05:29 +01:00
67f0de4b8b
Fixed some merge conflicts
2013-03-15 16:59:10 -04:00
1a60301a17
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
2013-03-15 16:49:17 -04:00
76d8df6ac6
Merge pull request #462 from kubabrecka/colorpicker3
...
implement color picking from predefined set for category badges + option to change foreground color
2013-03-15 13:43:59 -07:00
be01e7be60
Slightly offset the second popup if two are on at once
2013-03-15 16:05:57 -04:00
dd5885bf12
FIX: Twitter tags were using `property` instead of `name`.
2013-03-15 15:42:21 -04:00
87b950fc49
We are randomly seeing the wrong serializing used in test. Trying to revert
...
this to see if it is the cause.
Revert "see: https://github.com/rails-api/active_model_serializers/pull/233 "
This reverts commit 2a5cbd8072
2013-03-15 15:23:43 -04:00
ad082cea70
Big commit:
...
- Support for a popup that shows similar topics
- Cleaned up a lot of Javascript
- Cleaned up use of Promises
2013-03-15 14:35:33 -04:00
7714e2050e
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]
2013-03-15 06:49:03 -07:00
aef014f439
displays the number of characters left when editing the topic title
2013-03-15 12:56:14 +01:00
6e7e5cb9e2
Merge pull request #467 from nicksahler/patch-3
...
Wrong file. :|
2013-03-15 02:59:55 -07:00
Robin Ward
Neil Lalonde
Régis Hanol
Sam
Shawn Holmes
William Herry
Kuba Brecka
nverba
Sandy Vanderbleek
Wojciech Kocjan
Jeff Atwood