Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,649 Commits 1 Branch 0 Tags
2fd2eda6ea2075eb16eaee2089cddf2839f5af5c
Commit Graph

1567 Commits

Author SHA1 Message Date
Sarina Canelake
5c9fe4bb7a Merge pull request #3929 from edx/sarina/lms-2786 
Fix location.url [LMS-2786]
 2014-05-29 21:01:46 -04:00
Sarina Canelake
e77dffcbcd Fix location.url [LMS-2786] 2014-05-29 18:01:29 -04:00
Calen Pennington
cfcbdc0145 Move to OpaqueKey implementations from the external library 
[LMS-2757]
 2014-05-29 17:03:35 -04:00
Muhammad Ammar
7afcb9348c Check YouTube Availabitlity for Video Tests 2014-05-29 15:08:47 +00:00
Jay Zoldak
721732bf27 Merge pull request #3920 from edx/zoldak/increase-test-async-timeout 
Increase async script timeout in lettuce tests
 2014-05-29 10:44:37 -04:00
Jay Zoldak
40884a5085 Increase the default timeout for waiting in lettuce tests 2014-05-29 09:35:51 -04:00
Jay Zoldak
11fbaa19bf Increase async script timeout in lettuce tests 2014-05-29 09:05:31 -04:00
Usman Khalid
eceb8318f9 Merge pull request #3833 from edx/usman/lms2738-verify-student-urls 
Added trailing slashes to verify_student app urls.
 2014-05-29 16:22:00 +05:00
Usman Khalid
3aa4598956 Merge pull request #3879 from edx/usman/lms2747-anonymous-ids-collection 
Do not persist anonymous ids when exporting for all students of a course.
 2014-05-29 16:18:43 +05:00
David Adams
384bac2f0e Parse urls with query params for ^/static 
Query params with a value that starts with /static should have their values converted to the full location.
  Query params with a value that does not start with /static should be left unchanged.
 2014-05-28 10:21:55 -07:00
Usman Khalid
3824e234fe Do not persist anonymous ids when exporting for all students of a course. 
For large courses this causes export to take a long time and to time out.

LMS-2747
 2014-05-28 20:48:43 +05:00
Don Mitchell
4944cc763b Get rid of skiptests 2014-05-28 08:20:17 -04:00
Usman Khalid
1ecfac3f84 Added trailing slashes otherwise the course_id regex sometimes eats up get parameters. 
LMS-2738
 2014-05-26 15:50:23 +05:00
Sarina Canelake
d01af063a6 Merge pull request #3861 from edx/sarina/fix-quality 
Fix quality violations from opaque-keys
 2014-05-24 19:34:25 -04:00
Julia Hansbrough
6f7bc7e174 Fixed some TODOs, removed irrelevant ones 2014-05-24 18:49:06 -04:00
Sarina Canelake
110719deae StaffFactories accept course_keys, not courses. Make that clear in the interface. 2014-05-24 18:49:06 -04:00
stv
e4df2c2ceb Add 'forum_roles' endpoint to user_api 
Expose a new endpoint to query a list of users based on a
role name (Moderator, Student, etc.) and a course_id.

This will initially be used by the notifier to send daily digest
messages to forum moderators.
 2014-05-23 13:07:04 -07:00
Sarina Canelake
265fa826ca Opaque-keys: fix pylint violations 2014-05-23 14:23:12 -04:00
Sarina Canelake
bf32f5a7b9 Opaque-keys: fix pep8 violations 2014-05-23 14:22:54 -04:00
Calen Pennington
9feff62857 Merge pull request #3834 from cpennington/ok-merge-from-master 
Merge master into opaque-keys
 2014-05-23 11:36:52 -04:00
Calen Pennington
240fcc1d5a Fix merge conflicts 2014-05-22 16:24:02 -04:00
Diana Huang
a69e42dd5a Merge pull request #3830 from edx/diana/fix-cohorting 
Fix cohorting views
 2014-05-22 12:13:15 -04:00
Diana Huang
ae95e07cce Deserialze values coming into course_groups views 2014-05-22 12:11:48 -04:00
Sarina Canelake
c7bf96f048 Merge pull request #3822 from edx/sarina/course-modes-display 
Sarina/course modes display
 2014-05-22 11:40:15 -04:00
Calen Pennington
cd862b3253 Merge remote-tracking branch 'edx/master' into opaque-keys 
Conflicts:
	cms/djangoapps/contentstore/tests/test_contentstore.py
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/item.py
	cms/djangoapps/contentstore/views/preview.py
	cms/djangoapps/contentstore/views/tests/test_container.py
	cms/static/js/spec/views/unit_spec.js
	cms/static/js/utils/module.js
	cms/templates/container.html
	cms/templates/studio_vertical_wrapper.html
	cms/templates/studio_xblock_wrapper.html
	common/djangoapps/student/views.py
	lms/templates/notes.html
	lms/templates/textannotation.html
	lms/templates/videoannotation.html
 2014-05-22 10:52:00 -04:00
Calen Pennington
4b69cf5472 Merge pull request #3810 from cpennington/ok-management-commands 
Fix management commands
 2014-05-21 21:53:43 -04:00
Sarina Canelake
4723467345 Validate forms to allow old and new style course key serialization syntax 2014-05-21 17:44:50 -04:00
Don Mitchell
bef8134eea Merge pull request #3806 from edx/dhm/opaque_migrate_0036 
Migration for role_coursenum deprecated roles
 2014-05-21 16:33:33 -04:00
Calen Pennington
708d758d65 Merge pull request #3808 from cpennington/ok-course-mode-errors 
Call other CourseModeView methods using serialized course_id
 2014-05-21 16:21:27 -04:00
Calen Pennington
1f9c7b2ed4 Merge pull request #3809 from cpennington/ok-dead-code 
Remove dead code
 2014-05-21 16:21:17 -04:00
Calen Pennington
1c60da02df fixup! Fix management commands 2014-05-21 16:20:46 -04:00
Julia Hansbrough
5752312bbb Merge pull request #2776 from aboudreault/embargo-restrict-additions 
Extended Embargo feature to support site access restriction and ip network
 2014-05-21 15:24:07 -04:00
Calen Pennington
06d680cded Don't use Empty directly, let the manager handle it 2014-05-21 14:38:16 -04:00
Calen Pennington
1f849e441d Fix management commands 2014-05-21 14:36:41 -04:00
Calen Pennington
4af2249a9d Remove dead code 2014-05-21 14:28:04 -04:00
Calen Pennington
3d90c83199 Call other CourseModeView methods using serialized course_id 2014-05-21 14:27:01 -04:00
Don Mitchell
9af40ae2cc Migration for role_coursenum deprecated roles 2014-05-21 12:03:09 -04:00
John Jarvis
d25136893c Merge pull request #3712 from edx/jarv/cert-mode 
returning enrollment mode for both active and inactive users
 2014-05-21 10:07:17 -04:00
David Baumgold
6e0e13003f Merge pull request #3744 from lduarte1991/lduarte-harvardx 
Reconnecting Token Generator for Annotation Tool [Fix]
 2014-05-20 15:34:34 -04:00
David Baumgold
75ff35e208 proxy raw further along 2014-05-20 14:01:55 -04:00
David Baumgold
8080261aa7 generate raw URLs that are not rewritten by static_replace 2014-05-20 13:27:47 -04:00
Sarina Canelake
9dc48c00b4 Merge pull request #3779 from edx/sarina/fix-grades-management-commands 
Sarina/fix grades management commands
 2014-05-20 11:35:54 -04:00
Don Mitchell
e2332d1922 Fix old dashboard list cohorts 2014-05-20 10:37:03 -04:00
Alan Boudreault
877ec3f963 some minor improvements to embargo 2014-05-20 10:03:06 -04:00
Jason Bau
411dc09af7 Autoactivate inactive users on external_auth login 
Conditional on existing flag BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH
 2014-05-19 13:35:35 -07:00
Sarina Canelake
189f53bc71 Fix grades management commands 2014-05-19 16:11:45 -04:00
Alan Boudreault
db161543d8 Modified EMBARGO_SITE to SITE_EMBARGOED, improved logs 2014-05-19 15:53:45 -04:00
Alan Boudreault
25948e3694 Fix minor typo in a test 2014-05-19 15:12:02 -04:00
Alan Boudreault
ba6e61b907 Extended Embargo feature to support site access restriction and ip network 2014-05-19 15:12:02 -04:00
Don Mitchell
5a62c83d05 Handle some records not having lower_id 2014-05-19 13:31:03 -04:00