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

185 Commits

Author SHA1 Message Date
Brian Wilson
bc40a7f127 make test-reg dialog non-modal, and pass course_id in URL. Add to course info. 2012-12-18 16:16:55 -05:00
Brian Wilson
c7d379beb6 add first pass at wiring test registration dialog 2012-12-18 03:20:02 -05:00
Victor Shnayder
c5c4305f9e Merge pull request #1110 from MITx/diana/instructor-grading-styling 
Updates to the instructor grading pages
 2012-12-10 10:39:19 -08:00
Carlos Andrés Rocha
faae6a36dc Merge pull request #1107 from MITx/content/btalbot/new-universities 
Add Georgetown news announcement, landing page and updated FAQ

[Finished cd#40805397 #40805401]
 2012-12-10 03:32:41 -08:00
Diana Huang
7f9fcfffdf Add support for the new staff grading views on the backend 2012-12-07 17:01:27 -05:00
Carlos Andrés Rocha
cc68ba5bc9 Add Georgetown news announcement, landing page and updated FAQ 
[#40805397]
 2012-12-07 11:59:13 -05:00
David Ormsbee
7596deb40a Merge pull request #1094 from MITx/feature/victor/instructor-grading 
Feature/victor/instructor grading
 2012-12-07 08:44:58 -08:00
Carlos Andrés Rocha
e3d180505f Add Wellesley College news announcement and frontpage changes 2012-12-04 09:45:30 -05:00
Victor Shnayder
ed6a8f68ac starting to stub out the backend staff grading service [wip] 2012-11-30 09:51:35 -05:00
Victor Shnayder
f5d9e963cc Initial wiring of a staff grading tab. 
- no actual functionality, but have a tab that renders static html via a view
 2012-11-30 09:51:33 -05:00
Victor Shnayder
6b5125c4df fix typos, logger configs 2012-11-30 09:51:33 -05:00
Carlos Andrés Rocha
6326e4dc7e Add stub for Gates foundation announcement 
[#39636489 #39636491 #39636495 #39636903]
 2012-11-19 06:14:08 -05:00
David Ormsbee
156dc1fb6c Merge branch 'master' into feature/victor/actual-askbot-removal 
Conflicts:
	lms/envs/aws.py
 2012-11-15 14:24:55 -05:00
Victor Shnayder
2846c61d15 Revert "remove (almost) all references to askbot." 
This reverts commit 793354a0dc.
 2012-11-09 18:18:37 -05:00
John Jarvis
fceed0fc70 view for the certificate callback URL 2012-11-09 18:18:34 -05:00
Victor Shnayder
76f0cf4a86 remove (almost) all references to askbot. 2012-11-09 18:18:33 -05:00
David Ormsbee
92f2fbf0f8 Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next. 2012-11-07 13:55:08 -05:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
David Ormsbee
2e03a4846c Merge pull request #935 from MITx/feature/rocha/cengage-press-release 
Add Cengage book press release
 2012-10-18 11:55:02 -07:00
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
David Ormsbee
491f10d1bf Merge branch 'master' into feature/dave/email_bugfixes 2012-10-18 12:23:09 -04:00
Carlos Andrés Rocha
e9ec63e4b6 Add ajax endpoint to retrieve and assign course software licenses 2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
c5a148639d Add announcement of UT joining edx and related changes 2012-10-15 06:57:50 -04:00
ichuang
fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax 
Feature/victor/capa ajax

I'm happy with all the changes to inputtypes, modulo the minor comments.
I didn't read chemcalc.py closely, but the tests look good.
 2012-10-12 13:51:10 -07:00
David Ormsbee
01ac01b62c Re-enable change name, and fix up change email styles 2012-10-12 14:31:20 -04:00
Victor Shnayder
19d3cb3870 Add a chemicalequationinput with live preview 
- architecturally slightly questionable: the preview ajax calls goes to an LMS view instead of an input type specific one.  This needs to be fixed during the grand capa re-org, but there isn't time to do it right now.
- also, I kind of like having a generic turn-a-formula-into-a-preview service available
 2012-10-12 13:52:48 -04:00
David Ormsbee
96bdd03406 re-enable email change functionality 2012-10-12 09:54:47 -04:00
Carlos Andrés Rocha
386480905f Fix openid provider URL matching for usernames with non-word characters 2012-10-09 17:48:46 -04:00
Carlos Andrés Rocha
3492243ffa Add Elsevier press release 2012-09-25 09:41:50 -04:00
David Ormsbee
b4ae3abe4d Merge pull request #752 from MITx/feature/victor/less-greedy-urls 
Make static tab url pattern less greedy
 2012-09-21 14:42:03 -07:00
Victor Shnayder
8d0cc1007a add a debug_request view that prints the request. 2012-09-21 16:51:49 -04:00
Victor Shnayder
cc13b61e30 add a trailing slash to avoid conflicts with slash-appending redirects 2012-09-21 15:12:23 -04:00
Victor Shnayder
8a57093309 Make static tab url pattern less greedy 
* should fix links without trailing slash
 2012-09-21 15:05:50 -04:00
Ibrahim Awwal
7727e9f2a2 Match custom static tabs after discussion URLs so that discussion can actually work. 2012-09-20 19:22:25 -07:00
Victor Shnayder
4a162dadae bugfixes for static tabs 
- move courseware wiki views above catch-all rule
- handle courses with no custom tabs
 2012-09-20 01:11:59 -04:00
Victor Shnayder
7a88223ef7 custom tabs 
* still needs better error checking and testing
 2012-09-20 00:51:23 -04:00
ichuang
ccbbb5a993 commit_id may be specified for modulestore reload - for multi-worker configs 
also show pid in migration and instructor dashboard views for thread debugging
 2012-09-09 19:39:11 -04:00
Carlos Andrés Rocha
11399d6031 Added protored exam press release page 2012-09-06 16:06:57 -04:00
David Ormsbee
bea6db620a Merge pull request #533 from MITx/feature/halogenandtoast/calculator 
Put in calculator in courseware
 2012-09-06 13:00:09 -07:00
David Ormsbee
5e9fce5cae Merge branch 'master' into feature/halogenandtoast/calculator 2012-09-05 13:58:12 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Victor Shnayder
c89031b077 Export of answer distibutions to csv 
- go through all students, all of their problems, save count for each answer
- return csv
- url exists, but no links to it yet
- Will need to integrate with Ike's new dashboard code
 2012-09-05 13:40:29 -04:00
ichuang
2efe481237 move instructor dashboard into its own lms djangoapp; add new 
functionality - grade dump and download as csv, manage staff list,
force reload of course from xml
 2012-09-02 19:05:34 -04:00
David Ormsbee
69ea7aa873 Merge pull request #597 from MITx/feature/victor/nested-links 
Feature/victor/nested links
 2012-08-31 13:48:05 -07:00
Victor Shnayder
021ccde1b4 Make jump_to work with the xml modulestore 
* it now works in the context of a specific course_id
* add tracking of parent locations to xml modulestore
* adjust lots of tests, including some refactoring
* NOT working yet: jumping to the right position in a sequence.
 2012-08-30 18:47:11 -04:00
Victor Shnayder
22aa325d83 Enable linking into the middle of sequences 
* add a url that has an extra /{position} at the end
* pass it through to get_module
 2012-08-30 16:37:40 -04:00
Carlos Andrés Rocha
902a887e79 [34078525] pep8 renaming of some extern_auth functions 2012-08-29 18:46:35 -04:00
Tommy MacWilliam
6de28fc592 feature flag, consumer displayed, logging 
- provider placed behind separate feature flag
- domain of openid consumer displayed in login page
- added logging for successful login, changed log messages to include
  "OpenID"
 2012-08-29 10:37:02 -04:00
Tommy MacWilliam
4b6694a4ce OpenID provider implementation 
- endpoint supports both SReg and AX
- identity taken from edX username
- sreg fullname and ax http://axschema.org/namePerson taken from edX
  name
- sreg email and ax http://axschema.org/contact/email taken from edX
  email
 2012-08-29 10:29:42 -04:00