Commit Graph

7051 Commits

Author SHA1 Message Date
kimth
3787307d93 Put WAITTIME_BETWEEN_REQUESTS in common rather than dev env 2012-08-24 11:23:26 -04:00
kimth
088d204d9c Added CodeResponse tests 2012-08-24 11:09:27 -04:00
Tom Giannattasio
10c953e8a4 Merge pull request #534 from MITx/feature/kfiedler/wiki
fix wiki falsh message
2012-08-24 08:03:37 -07:00
Calen Pennington
2ac5b0a3bd Merge pull request #542 from MITx/feature/ichuang/fix-admin-page-url-load
admin page should be loaded based on settings.DEBUG not askbot
2012-08-24 08:01:56 -07:00
Arjun Singh
eb4068cc11 Make profile page look reasonable 2012-08-24 03:14:42 -07:00
Arjun Singh
eb65b95232 Removing stray return statement 2012-08-24 03:06:44 -07:00
Rocky Duan
fe74f9bc85 reconstruct after editing 2012-08-24 02:17:58 -07:00
Rocky Duan
cc5fbdd5a7 fixed appearance of loading icon near sort bar 2012-08-24 02:05:11 -07:00
Rocky Duan
80195176e9 use escape html everywhere and only send discussion data relavent 2012-08-24 01:45:55 -07:00
Rocky Duan
88a3e828f6 don't use raw html when rendering 2012-08-24 01:04:11 -07:00
kimth
95a7a5b08b Student must wait XQUEUE_WAITTIME_BETWEEN_REQUESTS between queueing submissions 2012-08-23 18:39:57 -04:00
Rocky Duan
7e6656f2df fixed profiled user id (toggle moderator status) 2012-08-23 15:22:11 -07:00
Rocky Duan
3761b02ce8 hide reply button after closing thread 2012-08-23 15:12:22 -07:00
David Ormsbee
575a91e2ef Merge pull request #539 from MITx/feature/rocky/blank_slate_fix
remove blank slate after new post
2012-08-23 15:08:25 -07:00
Rocky Duan
ca09c7427b some tiny bug fixes 2012-08-23 14:33:18 -07:00
Tom Giannattasio
27729db1c7 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 16:57:19 -04:00
Tom Giannattasio
2783ff7e63 added simple table filtering to gradebook 2012-08-23 16:57:03 -04:00
Tom Giannattasio
b494441e7a started new gradebook functionality 2012-08-23 16:40:48 -04:00
Carlos Andrés Rocha
d94ef54549 Added cheatsheet popup to wiki editor. 2012-08-23 16:30:58 -04:00
Arjun Singh
202edb0ecb making password reset email link have the current site's domain rather than edx.org hardcoded. 2012-08-23 11:47:30 -07:00
ichuang
bc63b99a10 disable subdomain filtering in dev_ike (should allow non-fall2012 courses) 2012-08-23 13:13:58 -04:00
ichuang
8274aa112f the admin page should be loaded based on settings.DEBUG, not askbot 2012-08-23 13:12:46 -04:00
Tom Giannattasio
582694b029 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 13:10:38 -04:00
Tom Giannattasio
9a3a4f4a88 set active accordion state 2012-08-23 13:10:14 -04:00
ichuang
8e7eef24a2 add manage_course_groups command to lms_migration 2012-08-23 13:10:08 -04:00
Rocky Duan
3e6f3430b6 remove blank slate after new post 2012-08-23 10:06:27 -07:00
Arjun Singh
ed6317f37c getting rid of terrible hack in favor of re enabling the dispatcher to sync w/ the comment service 2012-08-23 10:03:36 -07:00
Calen Pennington
f2c5a064aa Pull the http or https from the forwarded proto for the xqueue callback url 2012-08-23 11:49:23 -04:00
David Ormsbee
0b309ea40a Can't return Http404, have to raise it. 2012-08-23 11:27:54 -04:00
Tom Giannattasio
5950520e71 tweaked sequence nav and discussion profile sidebar 2012-08-23 11:11:22 -04:00
David Ormsbee
50f4fae955 Merge pull request #532 from MITx/feature/bridger/new_wiki
Updated django-wiki to better handle relative wiki links.
2012-08-23 07:39:33 -07:00
David Ormsbee
2feda8467e fix unicode error on forum profile view page 2012-08-23 10:32:27 -04:00
Kyle Fiedler
773055cf54 fix wiki falsh message 2012-08-23 10:28:31 -04:00
Bridger Maxwell
07eead2349 Updated django-wiki to better handle relative wiki links. 2012-08-23 10:11:31 -04:00
Tom Giannattasio
a2372e659c Merge branch 'master' into feature/tomg/fall-design 2012-08-23 10:04:17 -04:00
Tom Giannattasio
2c1571d66c applied line height to course content wrapper to avoid strange line heights with improper markup 2012-08-23 10:04:00 -04:00
Arjun Singh
a075cc79fd remove stray import 2012-08-23 06:50:16 -07:00
Arjun Singh
7f3a4889b8 make discussions work for new users 2012-08-23 06:48:37 -07:00
Calen Pennington
5af67c1bf2 Put course location urls in heartbeat page, rather than lists 2012-08-23 09:19:26 -04:00
Calen Pennington
57444bdd25 Make heartbeat url wait for courses to be loaded 2012-08-23 09:16:40 -04:00
John Jarvis
f0b60fed10 adding maintenance static data 2012-08-23 08:30:04 -04:00
Tom Giannattasio
cf2f5d2af2 Merge branch 'master' into feature/tomg/fall-design 2012-08-23 08:24:58 -04:00
Tom Giannattasio
163eb9d49f fixed bottom sequence nav buttons and firefox outling bug 2012-08-23 08:24:54 -04:00
David Ormsbee
d084506d38 Merge pull request #525 from MITx/feature/arjun/comment_depth
Limiting depth of comments
2012-08-23 05:21:02 -07:00
arjun810
ec94d75106 Merge pull request #526 from MITx/feature/forum_config
Feature/forum config
2012-08-23 05:07:11 -07:00
David Ormsbee
ec4858801e read the comment service shared key from django config 2012-08-23 08:02:19 -04:00
David Ormsbee
c52dd5faea another unicode fix for forums 2012-08-23 07:59:53 -04:00
Victor Shnayder
d8342255be Merge pull request #519 from MITx/feature/arjun/cs188_css
cs188 styling
2012-08-23 04:58:24 -07:00
Arjun Singh
d1a8cd3f65 Limiting depth of comments 2012-08-23 04:50:03 -07:00
David Ormsbee
a24fd328d9 Fix error when unicode string is in message viewed in single-thread template 2012-08-23 07:40:18 -04:00