scratchfoundation/s2forums
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
896 commits 8 branches 0 tags 3.4 MiB
Commit graph

896 commits

This branch
This branch
All branches
Author SHA1 Message Date
Ray Schamp
8b3b605b46 Set up Akismet filtering on posts. 2014-02-13 14:06:27 -05:00
Ray Schamp
1e88a3de5e Disable indexing through celery when it's disabled. 2014-02-10 13:17:04 -05:00
Ray Schamp
fa6ea8011a Only try to update topics if you haven't just set them to None. 2014-02-05 09:45:49 -05:00
Ray Schamp
ea6ef1dc91 Target main site search to forums when Google searching is active. 2014-01-29 11:33:06 -05:00
Ray Schamp
520d51be26 Merge pull request #17 from blob8108/scratchblocks-update 
Fix IE bug
 2014-01-24 07:20:40 -08:00
blob8108
0df0af88f8 Fix IE bug 2014-01-24 15:06:23 +00:00
Ray Schamp
ff4bb9ffee Merge pull request #16 from blob8108/scratchblocks-update 
Scratchblocks update fixes
 2014-01-23 10:50:04 -08:00
blob8108
cf109a18b0 Add charset headers to translations JS 2014-01-23 18:44:39 +00:00
blob8108
82eb1a96c2 Some other fixes 2014-01-23 18:39:14 +00:00
blob8108
56215bdb03 Fix embarassing typo 2014-01-23 18:36:25 +00:00
blob8108
c35fe0ad52 Use unminified JS 2014-01-23 18:36:08 +00:00
Ray Schamp
827c45f7a4 Merge pull request #15 from blob8108/scratchblocks-update 
Scratchblocks update
 2014-01-15 09:35:30 -08:00
blob8108
900e4e9df5 Fix newline 2014-01-15 17:33:18 +00:00
blob8108
02f9946779 Add translations 2014-01-15 13:00:51 +00:00
blob8108
56be6bb3fa Add hook to enable scratchblocks translation for language forums. 2014-01-15 00:04:04 +00:00
blob8108
d996b021c1 Update to scratchblocks version 2.0. 2014-01-15 00:01:24 +00:00
blob8108
edf21f75a1 Move scratchblocks2.parse call to a script tag 
This is so I don't go insane.
 2014-01-14 23:58:04 +00:00
Amos Blanton
ab945c6d8a Merge pull request #14 from jji7skyline/master 
fix title length bug - thanks jji7skyline!
 2013-12-20 10:43:16 -08:00
jji7skyline
94435e8006 fix title length bug 
Added code to check length of topic title when editing a post.
 2013-12-19 10:53:51 +10:00
Amos Blanton
2937220791 Merge pull request #13 from blob8108/paste-os-fix 
Fix "paste OS/version" button - thanks! Should go out Thursday.
 2013-11-18 09:19:05 -08:00
blob8108
6a73786dca Add "paste OS/version" button to no-scratchblocks list 2013-11-15 22:24:25 +00:00
Amos Blanton
7f326b9638 Merge pull request #12 from LiFaytheGoblin/master 
Update scratchr2_settings.py -- Looks good! You might want to double check with us before implementing redmine tickets created by Scratchers, we may want to approve them first. But this looks fine - thanks!
 2013-11-08 07:46:50 -08:00
Amos Blanton
24e247315d Merge pull request #10 from blob8108/blocks-menu 
Sweet, that seems to have done it. Thanks Nathan and Blob8108!
 2013-11-08 07:08:22 -08:00
blob8108
110898b043 Merge pull request #1 from nathandinsmore/blocks-menu 
Fixed scratchblocks menus
 2013-11-07 23:47:00 -08:00
Nathan Dinsmore
7d83273f3e Fixed scratchblocks menus 2013-11-08 04:44:38 +00:00
blob8108
548b100a66 Hopefully fix scratchblocks not rendering in drop-down menu 2013-11-07 17:17:20 +00:00
blob8108
191e664046 Markitup interface for inserting scratchblocks. 
Update scratchblocks plugin to newest version.
 2013-11-07 17:17:20 +00:00
LiFaytheGoblin
17250624b8 Update scratchr2_settings.py 
(Hopefully) adding Feature #1211 on the Bugtracker: http://scratchexp.media.mit.edu/issues/1211
 2013-11-05 21:00:28 +01:00
idreyn
65c32ec9cb Merge pull request #11 from idreyn/master 
Non-moderators can no longer re-open closed topics that they own.
 2013-10-21 07:55:22 -07:00
idreyn
1766eb8130 Non-moderators can no longer re-open closed topics that they own. 2013-10-21 10:50:55 -04:00
Glen Chiacchieri
d2a06bed15 fix syntax error 2013-10-15 17:50:49 +00:00
Glen Chiacchieri
d2ca88ed43 fix exceptions when no user agent 2013-10-15 17:36:32 +00:00
Glen Chiacchieri
cecd11eb9c fix getting group query on topic page 2013-09-26 15:05:33 +00:00
Glen Chiacchieri
cc4a038a27 fix exception when bad page number given 2013-09-25 15:57:18 +00:00
Glen Chiacchieri
1394a6c495 don't show follow button for closed topics 2013-09-20 18:35:45 +00:00
Glen Chiacchieri
42693dd8d3 speed up group lookup (remove hundreds of queries) on topic page 2013-09-19 13:13:09 +00:00
Glen Chiacchieri
0686997d69 fix spacing on new browser/os button 2013-09-18 20:23:47 +00:00
Glen Chiacchieri
eeb4db9843 button for adding browser/os/flash details to forum post 2013-09-18 19:35:31 +00:00
Glen Chiacchieri
79e00ad094 Merge branch 'master' of github.com:LLK/s2forums 2013-09-17 17:22:47 +00:00
Glen Chiacchieri
ae72b893f9 stop follow button overlap 2013-09-17 17:21:45 +00:00
Amos Blanton
6fad945645 Merge pull request #9 from LiFaytheGoblin/patch-2 
Thanks LiFaytheGoblin!
 2013-09-16 09:45:57 -07:00
Glen Chiacchieri
067eebc060 try to fix forum subscriptions 2013-09-16 16:40:08 +00:00
LiFaytheGoblin
33f67b5773 Update scratchr2_settings.py 
Added scratch-dach.info (German Scratch Wiki) to img host whitelist
 2013-09-16 18:20:52 +02:00
Glen Chiacchieri
f673bbc920 remove circular import 2013-09-16 15:59:28 +00:00
Glen Chiacchieri
7430f067a5 remove scratchr2 2013-09-16 15:21:36 +00:00
Glen Chiacchieri
f2308a674d move notifying forum topic subscribers after topic is saved 2013-09-12 19:05:33 +00:00
Glen Chiacchieri
b96cfc62d1 Revert "Merge pull request #8 from blob8108/blocks-menu" 
This reverts commit f4edc19730, reversing
changes made to 2f250cdf55.
 2013-09-12 14:17:48 +00:00
Glen Chiacchieri
2e1214161a don't follow threads automatically when replying to thread 2013-09-10 16:15:49 +00:00
Glen Chiacchieri
b8630db074 updates to text of follow/unfollow buttons 2013-09-10 16:09:13 +00:00
Glen Chiacchieri
a6e6e4b7f2 Merge branch 'master' of github.com:LLK/s2forums 2013-09-09 20:53:17 +00:00