Commit Graph

8120 Commits

Author SHA1 Message Date
Don Mitchell
741cdf9557 Merge pull request #3688 from edx/dhm/opaque-keys-bugs
Dhm/opaque keys bugs
2014-05-12 17:06:10 -04:00
Don Mitchell
bf8ca487bb fix staff_grading server error 2014-05-12 16:25:27 -04:00
Julia Hansbrough
f6f802f3db Pass deprecated course keys through 2014-05-12 18:35:40 +00:00
Calen Pennington
cbcb1059a3 fixup! Fix discussions by correctly serializing outgoing course_ids 2014-05-09 16:47:39 -04:00
Calen Pennington
76a04fa805 Fix discussions by correctly serializing outgoing course_ids 2014-05-09 14:51:03 -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
7be81341d7 Revert StudentModule.module_state_key to field rather than computed property 2014-05-09 10:41:12 -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
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
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
e042eb62c3 Use a validly formed bogus task id 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
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
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
cd746bf8e5 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds the non-courseware lms/djangoapps and lms/lib.

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 12:09:23 -04:00
Calen Pennington
d5029abfdc Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/templates.

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:49:55 -04:00
Calen Pennington
9811926d97 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates lms/djangoapps/courseware.

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-06 10:08:32 -04:00
Sarina Canelake
cba08d0bac Merge pull request #3494 from edx/sarina/fix-video-i18n
Fix i18n of video transcript
2014-04-28 14:18:50 -04:00
Adam
23ee963c4c Merge pull request #3476 from edx/usman/lms2556-wiki-urls
Fixed transform_url function in WikiAccessMiddleware.
2014-04-28 12:38:07 -04:00
Sarina Canelake
e76f6dc8fe Fix i18n of video transcript 2014-04-28 12:31:41 -04:00
Usman Khalid
f591b1db28 Fixed transform_url function in WikiAccessMiddleware.
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
2014-04-28 20:33:01 +05:00
Sarina Canelake
7a51382020 Merge pull request #3438 from edx/sarina/fix-video-i18n
Don't scrape unnecessary strings for i18n
2014-04-28 10:45:04 -04:00
muhammad-ammar
dfa45eac16 Merge pull request #3440 from edx/ammar/config-youtube-stub-for-bok-choy
Configure youtube stub for bok-choy
2014-04-28 17:32:33 +05:00
Sarina Canelake
3422fcfe21 Update how translations are pulled 2014-04-27 17:40:18 -04:00
Sarina Canelake
cb5904050a Correct native spelling of Armenian language 2014-04-27 11:06:49 -04:00
Ned Batchelder
82bd46d5a5 Merge pull request #3450 from johncox-google/johncox/feature/buttons
Change signin control from text list to buttons.
2014-04-25 17:38:16 -04:00
David Baumgold
5edae3edb0 Merge pull request #2780 from FiloSottile/progress_success_button
Show a success button at the top of the Progress page
2014-04-25 16:56:58 -04:00
John Cox
0379bd34a0 Fix acceptance tests 2014-04-25 13:34:18 -07:00
marcotuts
a15e43f554 Merge pull request #2810 from edx/marco/discussions/styling-cleanup
Forums visual styling adjustments
2014-04-25 16:08:26 -04:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
John Cox
ce0b640712 Add third-party auth implementation and tests 2014-04-25 12:11:20 -07:00
Sarina Canelake
dac6270345 Fix i18n of video player string 2014-04-25 14:02:24 -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
Usman Khalid
9d3ea699e6 Merge pull request #3455 from edx/usman/lms1466-email-formatting
Wraps long lines in bulk email messages.
2014-04-25 20:23:32 +05:00
Usman Khalid
8fd14bfca7 Wraps long lines in bulk email messages.
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
2014-04-25 18:25:20 +05:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
marco
83defda7d4 visual styling adjustments to discussion listing metadata, simplifying the visual representation of votes, increasing the line height of each post while also increasing the size of the icons for following and comments. visual styling adjustments also included for the discussion itself, pushing comments to be full width within a response, and small typography adjustments to the post count metadata and the add response button 2014-04-24 19:33:03 -04:00
cahrens
ad3d8c7871 Add support for raw HTML editor.
STUD-1562
2014-04-24 14:18:12 -04:00
Adam Palay
c83797ed94 fixes templating error (LMS-2560) 2014-04-24 14:17:43 -04:00
Greg Price
909903eb9c Merge pull request #3391 from edx/gprice/user-profile-pagination
Add pagination to forum user profile
2014-04-24 13:34:53 -04:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00