codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-25 00:29:30 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
2134 commits 7 branches 179 tags 87 MiB
Commit graph

2134 commits

This branch
This branch
All branches
Author SHA1 Message Date
Robin Ward
f8e8538e19 Merge pull request #836 from kubabrecka/cs_update44 
cs translation update
 2013-05-10 06:31:46 -07:00
Robin Ward
8782038b20 Merge pull request #838 from ZogStriP/fix-user-education-displays-object-ojects 
FIX: user education displays [object Object]
 2013-05-10 06:31:16 -07:00
Régis Hanol
8ebed7a4b1 FIX: user education displays [object Object] 2013-05-10 15:15:21 +02:00
Sam
ac36b591e9 Merge pull request #837 from ZogStriP/fix-pinned-topic-excerpt-is-not-properly-truncated 
FIX: pinned topic excerpt is not properly truncated
 2013-05-10 04:32:06 -07:00
Régis Hanol
297680c28d FIX: pinned topic excerpt is not properly truncated 2013-05-10 12:28:17 +02:00
Kuba Brecka
b029417644 cs translation update 2013-05-10 09:02:51 +02:00
Sam
942f168ab6 UI still a tad rough, but we have a first pass of secure categories 2013-05-10 16:47:47 +10:00
Sam
4030722a8f gemfile cleanup, move git to https for better compat. 2013-05-10 11:50:58 +10:00
Sam
222e4674fc Merge pull request #835 from ZogStriP/keep-french-l10n-up-to-date 
keep French l10n up to date
 2013-05-09 18:35:44 -07:00
Régis Hanol
16c8836977 keep French l10n up to date 2013-05-10 00:22:02 +02:00
Sam
0534b32f19 turns out I should not have removed 2013-05-09 19:48:10 +10:00
Sam
5280b3a01b more group progress, UI getting there, controller mostly done 
changed it so notify moderators goes to the moderators group
allow admins to grant self moderation and revoke self moderation
 2013-05-09 17:37:34 +10:00
Sam
4f328e3e45 +x on files makes no sense unless they really are executable 
rails in the script dir makes no sense, use binstubs or bundler instead
 2013-05-09 17:35:15 +10:00
Sam
0f0fd281a8 group progress, never email banned users 2013-05-09 11:34:58 +10:00
Robin Ward
c1185d92eb Trivial: Remove extra comma 2013-05-08 12:13:23 -04:00
Robin Ward
0d8c962fdf Fix: Multi-Select should close when an operation succeeds. A little refactoring, too. 2013-05-08 12:04:10 -04:00
Robin Ward
2ba08d23cb Merge pull request #831 from kubabrecka/cs_update43 
cs translation update
 2013-05-08 07:40:58 -07:00
Robin Ward
d458e00197 Merge pull request #832 from kubabrecka/kb_fix 
max_upload_size_kb is in "kB" not "kb"
 2013-05-08 07:39:51 -07:00
Robin Ward
4e16badeae Merge pull request #833 from kubabrecka/admin_api_l10n 
Localize admin API section
 2013-05-08 07:39:02 -07:00
Neil Lalonde
f35a44aeae Add ability for admins and mods to send another activation email to a user, to activate an account, and deactivate an account 2013-05-08 10:10:47 -04:00
Kuba Brecka
05bc63b102 Localize admin API section 2013-05-08 09:13:10 +02:00
Kuba Brecka
09221bb72e max_upload_size_kb is in "kB" not "kb" 2013-05-08 08:43:47 +02:00
Kuba Brecka
0f4b443317 cs translation update 2013-05-08 08:37:34 +02:00
Sam
6b536dcde5 work in progress ... groups 2013-05-08 15:20:38 +10:00
Sam
7571152d1d fix issue adding users to groups 2013-05-08 10:32:29 +10:00
Sam
b26057292e change md route to raw 2013-05-08 10:26:55 +10:00
Robin Ward
6843ba7ed6 Fix regression: default to JSON type on GET requests. 2013-05-07 17:17:21 -04:00
Neil Lalonde
f9a82f3aa0 Add a spec for category list with empty category 2013-05-07 15:52:45 -04:00
Neil Lalonde
52ee1928cc Oops, I made a spec fail by refactoring after I made the test pass and didn't check the tests 2013-05-07 15:40:18 -04:00
Neil Lalonde
8e24a608b0 Show empty categories on categories page to people people who can edit and delete categories 2013-05-07 15:31:56 -04:00
Robin Ward
bd99d5a40c Calls to Discourse.ajax no longer need getURL -- will be done automatically. 2013-05-07 15:16:27 -04:00
Robin Ward
0b4fc5d81c Deprecate success and error in Discourse.ajax 2013-05-07 11:25:21 -04:00
Robin Ward
6cbcd6e4a6 The last of the callback style AJAX have been converted to promises. 2013-05-07 10:58:41 -04:00
Robin Ward
dfd423a188 Thanks JSHINT! 2013-05-07 10:33:04 -04:00
Robin Ward
be191a95da More promises instead of callbacks. 2013-05-07 10:27:12 -04:00
Robin Ward
4200f4107b Merge branch 'master' of github.com:discourse/discourse 2013-05-07 10:27:09 -04:00
Sam
2a98e8773f Merge pull request #828 from ZogStriP/hide-show-preview-in-composer-preference-is-saved-in-local-storage 
FIX: hide/show preview in composer preference is saved in local storage
 2013-05-07 03:49:39 -07:00
Régis Hanol
4606cb4f3b FIX: hide/show preview in composer preference is saved in local storage 2013-05-07 12:34:47 +02:00
Sam
71728b3adb oops 2013-05-07 18:02:56 +10:00
Sam
20493106cd fix post trashing 2013-05-07 17:56:56 +10:00
Sam
a232e77fa8 whitspace 2013-05-07 17:33:04 +10:00
Sam
68e6405aca redis rack cache was crazy, it was just storing stuff in redis FOREVER, added a PR to fix, forked to my repo, sourcing a sane version 2013-05-07 17:33:04 +10:00
Jeff Atwood
a64e04ca42 Merge pull request #826 from sanderdatema/dutch_translation 
Dutch translation updated
 2013-05-06 21:56:34 -07:00
Jeff Atwood
3bfd3c9723 Merge pull request #825 from ZogStriP/do-not-show-clic-count-in-category-tag 
do not show the clic count in category tag
 2013-05-06 21:56:04 -07:00
Sam
381c42724f comments 2013-05-07 14:50:02 +10:00
Sam
066c2bed42 better comments 2013-05-07 14:46:46 +10:00
Sam
e9fc272db7 remove acts_as_paranoid, use .trash! , .recover! and .with_deleted as needed 
makes upgrading to rails 4 possible
 2013-05-07 14:39:01 +10:00
Robin Ward
397553e29c More promises instead of callbacks. 2013-05-06 14:44:19 -04:00
Robin Ward
a71a15913c Site Customization saving should use a promise instead of success callback. 2013-05-06 14:20:20 -04:00
Sander Datema
1b1cd0973d Dutch translation updated 
Updated til commit e70526d851
 2013-05-06 19:44:44 +02:00