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

156 Commits

Author SHA1 Message Date
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
Matthew Mongeau
db492cc400 Add back in calculator related code. 2012-08-27 09:43:37 -04:00
kimth
115eebdb76 Use reverse for course_info url replacement 2012-08-24 16:47:50 -04:00
ichuang
8274aa112f the admin page should be loaded based on settings.DEBUG, not askbot 2012-08-23 13:12:46 -04:00
David Ormsbee
fafbe41644 Merge pull request #502 from MITx/pmitros/berkeley_enrollment_hack 
Enrollment hack for allowing Berkeley to add their students.
 2012-08-22 13:59:07 -07:00
Piotr Mitros
a301abd5ad Enrollment hack for allowing Berkeley to add their students. 2012-08-22 15:49:48 -04:00
Calen Pennington
5ca636e606 Use the university profile page for courses and index if we are in a branded subdomain. N.B. THIS DOESN'T WORK WITH MIT_SSL_AUTH 2012-08-22 14:43:49 -04:00
Victor Shnayder
2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus 
Adding a syllabus page (accessible via course navigation)
 2012-08-21 14:33:07 -07:00
Arjun Singh
02ecfb4730 Adding comments about removing the syllabus tab ASAP. 2012-08-21 13:25:29 -07:00
Calen Pennington
dca434ad34 Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate 
add gitreload to lms-migration code
 2012-08-21 12:52:52 -07:00
Arjun Singh
99703761b0 Merge master 2012-08-21 12:01:09 -07:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
Victor Shnayder
5f612c7819 Oops. Make modx_dispatch and xqueue callback work again. 
- use get_instance, not get_item
- finish the id->location rename for modx_dispatch arg
 2012-08-20 16:04:16 -04:00
Bridger Maxwell
92a293f07e Removed profile info from Profile page and renamed it to Progress. 2012-08-20 13:50:28 -04:00
Rocky Duan
238adb1a03 Merge branch 'master' into profile 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
 2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
ichuang
4365b4a092 more flexible event logs retrieval 2012-08-17 16:17:00 +00:00
ichuang
7dd7de9566 add gitreload to lms migration, so it doesn't have to run separately 2012-08-17 15:57:12 +00:00
Rocky Duan
c89e290cdd use only one conf param 2012-08-16 13:43:48 -07:00
Calen Pennington
9118e585cc Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks 
Feature/halogenandtoast/multiple textbooks
 2012-08-16 09:47:53 -07:00
Matthew Mongeau
ae09598d9a Display textbooks in course navigation, handle in urls and views. 2012-08-16 10:31:17 -04:00
Rocky Duan
5009b78150 Merge branch 'ccp0101/moderation' of github.com:dementrock/mitx into merge 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/djangoapps/django_comment_client/permissions.py
	lms/static/coffee/src/discussion/content.coffee
	lms/static/coffee/src/discussion/utils.coffee
	lms/templates/discussion/_recent_active_posts.html
	lms/templates/discussion/_search_bar.html
	lms/templates/discussion/_thread.html
	lms/templates/discussion/_trending_tags.html
	lms/urls.py
 2012-08-14 17:32:30 -07:00
Bridger Maxwell
9f770ef921 Visiting the wiki from a course you aren't in does a redirect to the regular wiki. 2012-08-14 19:16:45 -04:00
Bridger Maxwell
ceaa6a4ff2 You can now click around in the wiki without losing your course nav bar. 2012-08-14 18:44:23 -04:00
Bridger Maxwell
85f1899cb6 Wiki pages can now be viewed from the course URL and the course nav is shown. It doesn't follow the user yet. 2012-08-14 17:15:44 -04:00
Rocky Duan
eb47093b1c Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	common/djangoapps/student/models.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-14 12:54:43 -07:00
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
eeeb677354 Fixed wiki urls bug. Fixed reverse for course wiki. 2012-08-14 11:39:49 -04:00
Bridger Maxwell
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04:00