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

66833 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Ormsbee
828430d6c8 Merge pull request #557 from MITx/feature/tomg/courseware_signin 
Added a log in button to the courseware when unauthenticated
 2012-08-24 13:59:32 -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
kimth
45a64a9bd4 Hide queue length information from the student 2012-08-24 16:33:05 -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
Tom Giannattasio
d1760f9a22 styled markdown modal and link 2012-08-24 16:14:04 -04:00
David Ormsbee
d095b7771a Merge pull request #555 from MITx/jarv/empty-defaults-for-comments-params 
empty default for comments_service_key and comments_url because it was b...
 2012-08-24 12:12:50 -07: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
24de129900 Merge pull request #550 from MITx/rocha/master 
Fixed WikiPath regexp.
 2012-08-24 11:32:20 -07:00
Bridger Maxwell
268a87442e Added SECURE_PROXY_SSL_HEADER to env/aws. 2012-08-24 14:18:49 -04:00
David Ormsbee
718e4c24b0 Merge pull request #552 from MITx/feature/arjun/fix_inline_disc 
fix inline discussion
 2012-08-24 11:16:36 -07:00
Arjun Singh
f7e299d04e fix inline discussion 2012-08-24 11:15:06 -07:00
Carlos Andrés Rocha
2bc9d08b25 Fixed WikiPath regexp. It was incorrectly matching [Title](Link) on the same line. 2012-08-24 14:11:35 -04:00
ichuang
dc52956c28 don't list all users if too many 2012-08-24 14:09:57 -04: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
Victor Shnayder
7a67fdc4ed Fix url_name loading 
- cleaned up name loading
- clear fallbacks, including hashing content if no name specified
- log errors in error tracker for content devs to see
 2012-08-24 13:58:14 -04:00
Victor Shnayder
2cf612051c turn subdomain listings off by default in dev env 2012-08-24 13:58:14 -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
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
kimth
97ab53e786 Queuekey --> Queuestate in tests 2012-08-24 08:28:47 -04:00
kimth
fdecaef7ef Fix datetime name conflict 2012-08-24 08:23:46 -04: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
David Ormsbee
5a1c792723 Merge pull request #546 from MITx/feature/rocky/discussion 
hide reply button after closing thread
 2012-08-23 15:17:13 -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
David Ormsbee
9cf9165b04 Merge pull request #545 from MITx/feature/rocky/discussion 
some tiny bug fixes (delete & update follow)
 2012-08-23 15:03:02 -07:00
kimth
673cc2bbb3 Keep queueuing time 2012-08-23 17:43:38 -04:00
Rocky Duan
ca09c7427b some tiny bug fixes 2012-08-23 14:33:18 -07:00
kimth
77f928d118 Queuestate records both secret key and time of queue request 2012-08-23 17:24:59 -04: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
David Ormsbee
f9616c6ed3 Merge pull request #544 from MITx/feature/arjun/fix_password_reset_domain 
making password reset email link have the current site's domain rather than edx.org hardcoded.
 2012-08-23 11:58:09 -07:00