Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,280 Commits 1 Branch 0 Tags
db492cc400a12368f0eb10b317398bcd2ef2470c
Commit Graph

1865 Commits

Author SHA1 Message Date
Matthew Mongeau
db492cc400 Add back in calculator related code. 2012-08-27 09:43:37 -04:00
Matthew Mongeau
80b31f46df Wip 2012-08-27 09:43:37 -04:00
Rocky Duan
eb8ee01d21 fixed a tiny bug that loading icon sometimes doesn't appear at the right place / doesn't go away 2012-08-25 12:12:57 -07:00
David Ormsbee
955dc94711 Merge pull request #554 from MITx/feature/victor/fix-staff-profile-view 
Set request.user = student when impersonating a student
 2012-08-25 08:39:46 -07:00
David Ormsbee
9734347c48 Merge pull request #556 from MITx/kimth/course-replace-in-infopage 
Do URL replacement in course info page
 2012-08-24 14:52:48 -07:00
Victor Shnayder
7a6fa1dd41 Fix access control for impersonation case 
- only relevant in tests due to start dates
- still irritatingly intricate logic...
 2012-08-24 16:52:19 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
Tom Giannattasio
4a06decafd Merge branch 'master' into feature/tomg/courseware_signin 2012-08-24 16:42:01 -04:00
Tom Giannattasio
7d14632c3a added log in button to unauthenticated courseware 2012-08-24 16:41:12 -04:00
Victor Shnayder
b8659e084c Set request.user = student when impersonating a student 
* currently only in the staff view of student progress page

[Fix #34379687]
 2012-08-24 16:30:16 -04:00
kimth
31216ccd9f Do URL replacement in course info page 2012-08-24 16:16:26 -04:00
John Jarvis
4c21abc433 empty default for comments_service_key and comments_url because it was breaking configs that do not have it in env.json 2012-08-24 15:05:18 -04:00
Calen Pennington
b5c90166df Merge pull request #553 from MITx/feature/bridger/new_wiki 
Added SECURE_PROXY_SSL_HEADER to env/aws. Re-enabled wiki directories
 2012-08-24 11:47:25 -07:00
Bridger Maxwell
268a87442e Added SECURE_PROXY_SSL_HEADER to env/aws. 2012-08-24 14:18:49 -04:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Bridger Maxwell
8e9211d2dd Re-enabling link to wiki 'see all children'. The bug for which this was disabled is already fixed. 2012-08-24 14:04:17 -04:00
Tom Giannattasio
9cab1d9de8 fixed merge conflict 2012-08-24 13:33:48 -04:00
Tom Giannattasio
b72ec72528 pulled temp data from gradebook 2012-08-24 13:32:16 -04:00
David Ormsbee
d0f2f31063 Merge pull request #547 from MITx/feature/rocky/discussion 
fixed profiled user id (toggle moderator status)
 2012-08-24 08:25:42 -07: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
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
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
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