Robin Ward
|
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 |
|
Robin Ward
|
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 |
|
Sam
|
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 |
|
Régis Hanol
|
bc9e931304
|
site setting for category colors
|
2013-03-17 01:24:52 +01:00 |
|
Neil Lalonde
|
0e63de59b5
|
Comment out report_spec.rb for now because it fails sometimes
|
2013-03-16 19:42:23 -04:00 |
|
Sam
|
9fb3f54427
|
update am serializer to latest with my perf fix
|
2013-03-16 15:57:44 -07:00 |
|
Sam
|
1a20291ff4
|
mini profiler and am serializer update
|
2013-03-16 15:56:16 -07:00 |
|
Sam
|
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 |
|
Sam
|
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 |
|
Régis Hanol
|
83b8a3386f
|
fix: reply draft won't save
|
2013-03-16 18:14:54 +01:00 |
|
Robin Ward
|
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 |
|
Robin Ward
|
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 |
|
Robin Ward
|
43497d8034
|
Merge pull request #479 from kubabrecka/commits_extract1
extract string from commits widget
|
2013-03-16 08:18:06 -07:00 |
|
Kuba Brecka
|
94c0e73ca6
|
extract string from commits widget
|
2013-03-16 12:39:20 +01:00 |
|
Sam
|
837dea355c
|
Merge pull request #471 from kubabrecka/cs_update16
cs translation update
|
2013-03-16 02:44:20 -07:00 |
|
Sam
|
b0dae74f04
|
Merge pull request #475 from svanderbleek/diffy
Use Diffy as DiffEngine implementation
|
2013-03-16 02:43:47 -07:00 |
|
nverba
|
c5b62ac52a
|
refactored redis.yml.sample for easier local precompile, updated docs
|
2013-03-16 01:35:38 +00:00 |
|
Sandy Vanderbleek
|
204dcc43a4
|
Use Diffy as DiffEngine implementation
|
2013-03-15 17:31:51 -07:00 |
|
Régis Hanol
|
a500f6b307
|
bind the text entered in the category name text field to the badge
|
2013-03-16 00:59:11 +01:00 |
|
Régis Hanol
|
de58e30a8f
|
keeping the French l10n up to date
|
2013-03-16 00:40:33 +01:00 |
|
Régis Hanol
|
89815878d9
|
fixes the random login on dev
|
2013-03-16 00:26:32 +01:00 |
|
Wojciech Kocjan
|
e6ccc300dc
|
Support for running discourse with a prefix (i.e. as http://servername/discourse)
|
2013-03-16 00:01:21 +01:00 |
|
Neil Lalonde
|
19860bd2c5
|
Version bump to v0.8.4
|
2013-03-15 18:21:19 -04:00 |
|
Neil Lalonde
|
d9cdde9aa7
|
Add user counts for each trust level to admin dashboard
|
2013-03-15 18:09:02 -04:00 |
|
Neil Lalonde
|
1d9764d8fc
|
Remove admin_report_total_users_view.js
|
2013-03-15 18:09:01 -04:00 |
|
Neil Lalonde
|
8983df9856
|
Show current user count for now, not at different points in time
|
2013-03-15 18:09:01 -04:00 |
|
Jeff Atwood
|
3ba567eba0
|
copyedit on similar topics
|
2013-03-15 14:44:46 -07:00 |
|
Jeff Atwood
|
0db31b3398
|
just set opacity of links on archived not row
|
2013-03-15 14:17:47 -07:00 |
|
Jeff Atwood
|
e22b4fe229
|
fancier favorite star on topics
|
2013-03-15 14:06:04 -07:00 |
|
Kuba Brecka
|
d40ebce979
|
cs translation update
|
2013-03-15 22:05:29 +01:00 |
|
Robin Ward
|
67f0de4b8b
|
Fixed some merge conflicts
|
2013-03-15 16:59:10 -04:00 |
|
Robin Ward
|
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 |
|
Robin Ward
|
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 |
|
Robin Ward
|
be01e7be60
|
Slightly offset the second popup if two are on at once
|
2013-03-15 16:05:57 -04:00 |
|
Robin Ward
|
dd5885bf12
|
FIX: Twitter tags were using property instead of name.
|
2013-03-15 15:42:21 -04:00 |
|
Robin Ward
|
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 |
|
Robin Ward
|
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 |
|
Robin Ward
|
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 |
|
Régis Hanol
|
aef014f439
|
displays the number of characters left when editing the topic title
|
2013-03-15 12:56:14 +01:00 |
|
Jeff Atwood
|
6e7e5cb9e2
|
Merge pull request #467 from nicksahler/patch-3
Wrong file. :|
|
2013-03-15 02:59:55 -07:00 |
|
Nick Sahler
|
fb0da25b2d
|
Wrong file. :|
|
2013-03-15 05:35:26 -03:00 |
|
Neil Lalonde
|
6c4d9ecfdc
|
Use one request to fetch dashboard report data and check version
|
2013-03-14 18:26:26 -04:00 |
|
Régis Hanol
|
cad55bf244
|
extracted hard coded strings in the admin javascript files
|
2013-03-14 23:03:13 +01:00 |
|
Sam
|
6690a2ba3e
|
Merge pull request #463 from kubabrecka/cs_update15
cs translation update + pseudolocalization
|
2013-03-14 14:29:35 -07:00 |
|
Sam
|
2a5cbd8072
|
see: https://github.com/rails-api/active_model_serializers/pull/233
|
2013-03-14 14:27:43 -07:00 |
|
Régis Hanol
|
3bf6625aa4
|
displays a message when a failure happen while creating a new category
|
2013-03-14 22:25:55 +01:00 |
|
Kuba Brecka
|
053eb0aa85
|
cs translation update + pseudolocalization
|
2013-03-14 17:54:00 +01:00 |
|
Neil Lalonde
|
4f42110e39
|
Change layout of the admin dashboard
|
2013-03-14 12:42:45 -04:00 |
|
Robin Ward
|
1715220d77
|
FIX: Hide topics list when loading new topics by category
|
2013-03-14 12:38:05 -04:00 |
|
Robin Ward
|
f47240483c
|
FIX: On refresh, wouldn't say "You liked this"
|
2013-03-14 12:15:24 -04:00 |
|