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

622 Commits

Author SHA1 Message Date
Don Mitchell
62bccd4e93 Split mongo correctly serializes and deserialized references 
STUD-1592, STUD-1603, LMS-2642
 2014-05-28 08:29:13 -04:00
Don Mitchell
1be1283f26 Redirect most studio access through draft modulestore 
rather than have caller figure out whether to call draft or direct.
Fixes get_children to always find draft children in studio.
STUD-1662
 2014-05-27 11:16:29 -04:00
lduarte1991
32e96681f6 Image Annotation Tool: create xmodule and install js files 2014-05-23 14:57:23 -04:00
Calen Pennington
d4280e8529 Fix merge conflicts 2014-05-16 14:10:50 -04:00
Calen Pennington
18c91d0f1d Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/tests/utils.py
	cms/djangoapps/contentstore/views/import_export.py
	cms/djangoapps/contentstore/views/tests/test_import_export.py
	common/djangoapps/student/views.py
	lms/djangoapps/class_dashboard/dashboard_data.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/static/js/staff_debug_actions.js
	lms/templates/notes.html
	lms/templates/staff_problem_info.html
 2014-05-16 14:01:20 -04:00
zubair-arbi
74aa3a5ba0 create course gorups properly on course import 
STUD-1595
 2014-05-16 14:58:11 +05:00
Calen Pennington
8534ef559d Fix cms tests after merge from master 2014-05-13 16:33:14 -04:00
Calen Pennington
6c546fbf1f Fix merge conflicts 2014-05-13 15:31:40 -04:00
Calen Pennington
240d91daeb Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master 
Conflicts:
	cms/djangoapps/contentstore/management/commands/tests/test_import.py
	cms/djangoapps/contentstore/tests/test_import.py
	common/lib/xmodule/xmodule/modulestore/tests/test_mongo.py
	common/lib/xmodule/xmodule/modulestore/xml_importer.py
	lms/djangoapps/bulk_email/tests/test_course_optout.py
	lms/djangoapps/bulk_email/tests/test_email.py
	lms/djangoapps/bulk_email/tests/test_err_handling.py
	lms/djangoapps/class_dashboard/tests/test_dashboard_data.py
	lms/djangoapps/courseware/courses.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/instructor/tests/test_email.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/tests/test_legacy_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_email.py
	lms/djangoapps/instructor/tests/test_legacy_enrollment.py
	lms/djangoapps/instructor/tests/test_legacy_forum_admin.py
	lms/djangoapps/instructor/tests/test_legacy_gradebook.py
	lms/djangoapps/instructor/tests/test_legacy_raw_download_csv.py
	lms/djangoapps/instructor/tests/test_legacy_reset.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/templates/courseware/instructor_dashboard.html
 2014-05-13 15:30:56 -04:00
Adam Palay
a51a0c558e fix importing bug (STUD-1599) 
add target_location_namespace check
 2014-05-12 15:59:41 -04:00
Don Mitchell
ded28af8b4 Make Locators comply with UsageKey accessors 2014-05-12 15:35:54 -04:00
Nimisha Asthagiri
46a976d7e1 fixed asset search query. 
moved location_to_son to LocationBase.py.
 2014-05-09 10:28:34 -04:00
Calen Pennington
0d88379eeb Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit adds all of cms.

These keys are now objects with a limited interface, and the particular
internal representation is managed by the data storage layer (the
modulestore).

For the LMS, there should be no outward-facing changes to the system.
The keys are, for now, a change to internal representation only. For
Studio, the new serialized form of the keys is used in urls, to allow
for further migration in the future.

Co-Author: Andy Armstrong <andya@edx.org>
Co-Author: Christina Roberts <christina@edx.org>
Co-Author: David Baumgold <db@edx.org>
Co-Author: Diana Huang <dkh@edx.org>
Co-Author: Don Mitchell <dmitchell@edx.org>
Co-Author: Julia Hansbrough <julia@edx.org>
Co-Author: Nimisha Asthagiri <nasthagiri@edx.org>
Co-Author: Sarina Canelake <sarina@edx.org>

[LMS-2370]
 2014-05-07 12:56:43 -04:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls 
Switch PDF Textbooks to use portable URLs
 2014-04-25 13:46:28 -04:00
zubiar-arbi
7b5c647c8e properly remove users from instructor/staff groups on a course delete 
STUD-1555
 2014-04-24 17:11:19 +05:00
Carson Gee
6136ed2e13 Switch PDF Textbooks to use portable URLs 2014-04-16 13:05:25 -04:00
Will Daly
08413afdfd Allow import of native XBlocks in draft 
Added tests for importing a pure XBlock
 2014-04-08 07:52:11 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor. 
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
 2014-03-31 18:49:56 +03:00
zubiar-arbi
2b389a2dfa raise ItemNotFoundError if course not found in modulestore (course_listing) 
STUD-1455
 2014-03-31 14:12:38 +05:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page. 
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
 2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Carson Gee
2c03c63990 Properly get lazily translated exception message 2014-03-26 21:46:22 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase 
Install new ORA (edx-tim)
 2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2 
Support for displaying submissions API scores in Progress page.
 2014-03-25 09:42:55 -04:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex 
STUD-1433
 2014-03-21 15:48:29 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids 
Enable/disable unicodes in course id's
 2014-03-17 12:04:51 -04:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory 
Dhm/meld pretty factory
 2014-03-17 09:44:19 -04:00
Alexander Kryklia
dd20e84c84 Fix donwload subs for non youtube videos and non-en language. 
Check for status in test.
Add test for track url.
Fix test to use cookie.
Use download_track in feature file.
Add new tests for get_transcript.
Add html5 test.
Add content check.
Add tests for available_translations dispatch.
Disable flaky cms test.
Add  w/o english transcript tests.
Add to changelog.
 2014-03-14 18:30:42 +02:00
Alexander Kryklia
7fe675b1d0 Allow uppercase transcripts srt extension. 2014-03-13 17:06:17 +02:00
Andy Armstrong
6d2cd987dc Merge release-2014-03-12 back to master. 
https://edx-wiki.atlassian.net/wiki/display/ENG/Release+Page%3A+2014-03-12
 2014-03-12 16:07:00 -04:00
Don Mitchell
0895e90ab8 Generate split test data via split 2014-03-12 15:15:47 -04:00
Don Mitchell
542b146f2f Split: add schema version and drop pretty_id (was placeholder looking for purpose) 
STUD-1359
 2014-03-12 11:30:44 -04:00
Usman Khalid
cb2243a495 Do not remap the wiki_slug if reimporting into the same course. 
LMS-2136
 2014-03-11 20:47:21 +05:00
Don Mitchell
adb7fbcb4b Merge pull request #2849 from edx/dhm/split_course_id 
Make course_id a required arg to split.create_course
 2014-03-11 10:22:46 -04:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it. 
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
 2014-03-10 16:13:18 +05:00
Don Mitchell
d754791213 Make course_id a required arg to split.create_course 
and remove attempt to make it unique. Instead raise exception on dupe.
STUD-1359
 2014-03-06 17:21:10 -05:00
Han Su Kim
bdfd81d2f3 Merge remote-tracking branch 'origin/master' into release, conflicts resolved 
Conflicts:
	cms/envs/common.py
	common/lib/xmodule/xmodule/seq_module.py
	lms/envs/common.py
	requirements/edx/edx-private.txt
 2014-03-06 16:56:16 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD 
STUD-600
 2014-03-05 14:32:56 -05:00
Diana Huang
bce7d9e43d Add tests and clean up A/B testing 
Also fixes STUD-1351
 2014-03-05 13:46:03 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks 
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
 2014-02-27 14:53:05 -05:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml 
update course info module to save content without modifying
 2014-02-26 21:34:10 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140 
STUD-1140
 2014-02-26 15:40:44 +05:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata' 
STUD-154
 2014-02-26 13:11:59 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test 
Add tests of local_resource_url
 2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00