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

28558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
srpearce
fa0e958b43 Merge pull request #3650 from edx/sylvia/docs/DOC-206 
Sylvia/docs/doc 206
 2014-05-09 12:38:05 -04:00
Sylvia Pearce
c1ef41fe6a Update Video component UI text 2014-05-09 12:37:28 -04:00
Andy Armstrong
6d08a0b47b Improve the translatability of the paging header 2014-05-09 12:07:49 -04:00
Mark Hoeber
dbb87e2609 Merge pull request #3663 from edx/markhoeber/documentation/doc-309 
Note about course staff and discussion admin roles
 2014-05-09 12:05:33 -04:00
Mark Hoeber
3a185b2656 Note about course staff and discussion admin roles 
doc-309
 2014-05-09 11:36:32 -04:00
Diana Huang
558e9c8f20 Merge pull request #3662 from edx/diana/minor-ddt-fix 
Fix ddt decorators
 2014-05-09 11:33:11 -04:00
Diana Huang
f3a7be5a15 Use ddt decorators as specified in doc. 2014-05-09 11:24:57 -04:00
Don Mitchell
01ae09aa6c Merge pull request #3661 from edx/opaque-keys-mod_key 
Opaque keys mod key
 2014-05-09 11:23:14 -04:00
Carson Gee
7c1e6d83e4 Fix message handling to be more internationalizable 2014-05-09 11:21:39 -04:00
Don Mitchell
bd4595fad2 Fix missing field access 2014-05-09 11:19:54 -04:00
Don Mitchell
660f905028 Merge pull request #3658 from edx/opaque-keys-location-to-son 
Opaque keys location to son
 2014-05-09 10:48:51 -04:00
Don Mitchell
ae99a1700a Merge pull request #3659 from edx/opaque-keys-validate 
Opaque keys validate
 2014-05-09 10:47:41 -04:00
Don Mitchell
a558980e3c Merge pull request #3645 from edx/opaque-keys-student-module 
Opaque keys student module
 2014-05-09 10:42:25 -04:00
Don Mitchell
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -04:00
Greg Price
8f90dd835d Merge pull request #3653 from edx/gprice/discussion-link-command 
Add command to get discussion_link for a course
 2014-05-09 10:34:45 -04:00
Don Mitchell
b89b1e0727 Merge pull request #3657 from edx/opaque-keys-access 
Don't fetch the course just to find out if the user has access to it.
 2014-05-09 10:30:09 -04:00
Nimisha Asthagiri
46a976d7e1 fixed asset search query. 
moved location_to_son to LocationBase.py.
 2014-05-09 10:28:34 -04:00
Don Mitchell
69a2d9882e Validate the args to SSCK 2014-05-09 10:26:06 -04:00
Don Mitchell
b337d4f893 Merge pull request #3651 from edx/opaque-keys-xmodule-lib-cleanup 
Responses to comments on https://github.com/edx/edx-platform/pull/3539
 2014-05-09 10:24:17 -04:00
Sarina Canelake
81a8bc39f6 Clarify strings for i18n 2014-05-09 10:23:46 -04:00
Don Mitchell
f73939ab7d Responses to comments on https://github.com/edx/edx-platform/pull/3539 
Conflicts:
	common/lib/xmodule/xmodule/modulestore/locations.py
 2014-05-09 10:18:22 -04:00
Don Mitchell
b3b118ee49 Merge pull request #3655 from edx/opaque-keys-common-lib-xmodule 
Opaque keys common lib xmodule
 2014-05-09 10:13:00 -04:00
Don Mitchell
6834376b8a Don't fetch the course just to find out if the user has access to it. 2014-05-09 10:12:21 -04:00
Calen Pennington
d5468fff4e Merge pull request #3642 from cpennington/opaque-keys-return-course 
Fix some tests on the opaque keys branch
 2014-05-09 10:06:38 -04:00
polesye
18edab35f3 BLD-1057: Fix Video player in FF. 2014-05-09 08:54:09 -05:00
srpearce
f4d97ca55d Merge pull request #3652 from edx/sylvia/docs/DOC-390 
Fixed typos in example code for drag and drop problems
 2014-05-09 09:51:30 -04:00
muhammad-ammar
50a99de6e1 Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6 
Bok-Choy Video Tests Batch6
 2014-05-09 18:31:04 +05:00
Calen Pennington
e042eb62c3 Use a validly formed bogus task id 2014-05-09 09:23:52 -04:00
Calen Pennington
002bfd475e Clean up partial import statemen 2014-05-09 09:23:52 -04:00
Calen Pennington
ac7675be2c Make dashboard.tests a python module 2014-05-09 09:23:52 -04:00
Calen Pennington
60cecc4e12 Fix syntax error 2014-05-09 09:23:52 -04:00
Calen Pennington
6334d7ddaa Clean up how courses are iterated on instructor dashboard 2014-05-09 09:23:51 -04:00
Calen Pennington
7bb6d6f281 Fix cohort.course_id naming 2014-05-09 09:23:51 -04:00
Calen Pennington
eb11ba76a7 Better unicode handling in instructor tasks/bulk-email 2014-05-09 09:23:51 -04:00
Calen Pennington
54bd1cbed5 Return the course from get_course in courseware 2014-05-09 09:23:51 -04:00
Don Mitchell
8827118bb0 fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit] 2014-05-09 09:13:17 -04:00
Adam
efcd13e836 Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox 
fix wiki hide button not working in firefox (STUD-1581)
 2014-05-09 07:04:03 -05:00
polesye
47ec168ea4 BLD-1057: Fix Video player in FF. 2014-05-09 15:00:18 +03:00
Waheed Ahmed
31f3ef0ab3 Merge pull request #3632 from edx/waheed/lms2617-verify-mode-none 
Redirected to dashboard if course mode is none.
 2014-05-09 16:37:54 +05:00
Waheed Ahmed
40a03ebb79 Redirected to dashboard if course mode is none. 
LMS-2617
 2014-05-09 15:34:26 +05:00
Muhammad Ammar
aa0e8041af Bok-Choy Video Tests Batch6 2014-05-09 07:22:03 +00:00
Calen Pennington
d466132a1f Merge remote-tracking branches 'edx/opaque-keys-base-keys', 'edx/opaque-keys-cms', 'edx/opaque-keys-common-djangoapps', 'edx/opaque-keys-common-lib-xmodule', 'edx/opaque-keys-common-misc', 'edx/opaque-keys-django-fields', 'edx/opaque-keys-embargo-tests', 'edx/opaque-keys-library', 'edx/opaque-keys-lms-courseware', 'edx/opaque-keys-lms-djangoapps', 'edx/opaque-keys-lms-templates', 'edx/opaque-keys-mongoengine-fields', 'edx/opaque-keys-requirements' and 'edx/opaque-keys-roles-table' into opaque-keys 2014-05-08 20:32:28 -04:00
Calen Pennington
d654798856 Make course ids and usage ids opaque to LMS and Studio [partial commit] 
This commit updates common/lib/xmodule.

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-08 20:28:53 -04:00
Carson Gee
b3ec4d1b6b Switching to new dashboard API and adding rescore to actions list 2014-05-08 19:03:14 -04:00
Greg Price
5e849bfb76 Add command to get discussion_link for a course 
This will be used to detect courses that are linking to Stack Exchange
sites so we can handle them specially when generating data dumps.
 2014-05-08 17:40:13 -04:00
Sylvia Pearce
91534bf0f0 Fixed typos in example code for drag and drop problems 2014-05-08 17:00:59 -04:00
Mark Hoeber
2d132e10eb Merge pull request #3649 from edx/markhoeber/documentation/doc-344 
Added warnings about file size
 2014-05-08 15:54:53 -04:00
Mark Hoeber
95e1ee6e7b Added warnings about file size 
doc-344
 2014-05-08 15:54:07 -04:00
David Baumgold
43b4a6b40e Merge pull request #3646 from edx/db/mysql-python-upgrade 
Upgrade mysql-python to 1.2.5
 2014-05-08 14:36:55 -04:00
Jason Bau
78950bb501 Merge pull request #3566 from edx/jbau/django-1.4.12 
Bump django 1.4 minor version to 1.4.12 to pick up patches
 2014-05-08 11:06:38 -07:00