Commit Graph

24365 Commits

Author SHA1 Message Date
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
David Baumgold
175180d022 Upgrade mysql-python to 1.2.5 2014-05-08 13:19:01 -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
Carson Gee
c23a05b50d Merge pull request #3213 from carsongee/cg/video_transcript_static
Add static fallback method for video transcripts
2014-05-08 11:51:04 -04:00
lduarte1991
edeebe7bea Fixes from @singingwolfboy in PR #3466 2014-05-08 11:37:49 -04:00
David Baumgold
e1e87e1a15 Merge pull request #3570 from edx/db/pr-table-for-release
Make release table by PR, instead of by commit
2014-05-08 10:42:36 -04:00
Feanil Patel
1a9b505572 Merge pull request #3622 from edx/feanil/fix_enrollment_bug
Field name is 'username' not 'user'
2014-05-08 09:44:12 -04:00
muhammad-ammar
e3f3841bf8 Merge pull request #3518 from edx/ammar/bok-choy-video-tests-batch4
Bok-Choy video tests batch4
2014-05-08 18:23:19 +05:00
Calen Pennington
014cb9e564 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit is the base library for OpaqueKeys.

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 07:40:25 -04:00
Calen Pennington
79cf4c7239 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit migrates roles from named groups to a relational table.

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 07:14:27 -04:00
Muhammad Ammar
af6c5efbb3 Bok-Choy video tests batch4 2014-05-08 10:53:08 +00:00
David Baumgold
b319086589 get_github_creds() returns a two-tuple 2014-05-07 16:42:05 -04:00
Mark Hoeber
04376e085e Merge pull request #3637 from edx/markhoeber/documentation/doc-308
Fixed typo
2014-05-07 16:32:03 -04:00
srpearce
828cff4971 Merge pull request #3635 from edx/sylvia/docs/TIM-464
Add peer- and self- only information
2014-05-07 16:31:41 -04:00
David Baumgold
c1f5fe6ed9 wordsmithing 2014-05-07 16:16:54 -04:00
Carson Gee
2998a2e9b7 Code review changes
i18n
2014-05-07 16:16:37 -04:00
Mark Hoeber
37ce55ce16 Fixed typo
doc-308
2014-05-07 16:16:01 -04:00
David Baumgold
ab94cb023f move comment 2014-05-07 16:08:28 -04:00
David Baumgold
911405cd41 make sure the script works with the table flag 2014-05-07 16:05:53 -04:00
David Baumgold
6e48d54a7d Refactor to support two-factor authentication 2014-05-07 15:58:26 -04:00
Carson Gee
c0644dc984 Only do static transcript redirect for english language, and don't offer static redirect for download
Rename video test to real YouTube-ID
2014-05-07 15:11:41 -04:00
Carson Gee
ab6c82342e Add last resort method to download and showing of video transcript 2014-05-07 15:11:41 -04:00
marcotuts
8504688381 Merge pull request #3636 from edx/diana/disable-flaky-js-test
Disable flaky Javascript test
2014-05-07 15:08:40 -04:00
Diana Huang
4778eff817 Disable a flaky ORA Javascript test. 2014-05-07 14:51:27 -04:00
Giulio Gratta
6963d24e5d Merge pull request #3597 from caesar2164/giulio/help-modal-features
Changes for Help Modal to work on Stanford Site
2014-05-07 10:32:22 -07: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
Calen Pennington
e2bfcf2a36 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit updates common/djangoapps.

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:54:49 -04:00
Calen Pennington
3b03627872 Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds custom django fields for CourseKeys and UsageKeys.

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:52:24 -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
17f0b440ac Make course ids and usage ids opaque to LMS and Studio [partial commit]
This commit adds custom mongoengine fields for CourseKeys and UsageKeys.

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:48:36 -04:00
Sylvia Pearce
febadfa638 Add peer- and self- only information 2014-05-07 11:22:17 -04:00
Ned Batchelder
5e34c21ff4 Merge pull request #3628 from edx/ned/fix-ignorable-404-ends
IGNORABLE_404_ENDS is wrong and unused
2014-05-07 11:17:05 -04:00
David Baumgold
d49c97bd27 return tuple, not list
so the output can be memoized
2014-05-07 11:12:46 -04:00
David Baumgold
a5f078c6c4 include commits-without-prs table 2014-05-07 11:06:45 -04:00
marcotuts
909d6db4a3 Merge pull request #3629 from edx/jrbl/oops-fix-dashboard-template
Fix dashboard template around final grade status
2014-05-07 10:57:54 -04:00
Mark Hoeber
9fb2a8c753 Release Notes for 5-6-14
Doc-331
2014-05-07 10:53:04 -04:00
Alison Hodges
4a06fcc8c0 Merge pull request #3568 from edx/ahodges/documentation/DOC258
Ahodges/documentation/doc258
2014-05-07 09:14:49 -04:00
Alison Hodges
0d4df33379 Describe date format for close/reopen discussions 2014-05-07 09:13:08 -04:00
Anton Stupak
f2086f2336 Merge pull request #3586 from edx/anton/i18n-custom-response
CustomResponse i18n.
2014-05-07 15:13:13 +03:00
Anton Stupak
ed70a0823c Merge pull request #3608 from edx/anton/i18n-code-response
CodeResponse i18n.
2014-05-07 13:39:28 +03:00
Waheed Ahmed
7b92d52f9f Merge pull request #3510 from edx/waheed/stud1583-toggle-cheatsheet-not-working
Fixed cheatsheet for open ended editor.
2014-05-07 14:12:18 +05:00
Waheed Ahmed
998af82baa Fixed cheatsheet for open ended editor.
STUD-1583
2014-05-07 12:58:35 +05:00
muhammad-ammar
ca0315ed9b Merge pull request #3492 from edx/ammar/bok-choy-youtube-stub-video-tests
Convert lettuce video tests specifically using youtube stub
2014-05-07 12:48:56 +05:00
Muhammad Ammar
411a13b56c Convert lettuce video tests specifically using youtube stub 2014-05-07 06:11:07 +00:00