Commits · 6334d7ddaa5427ec652dbdefedf0a504b69ea43e · edx / edx-platform

09 May, 2014 6 commits

Clean up how courses are iterated on instructor dashboard · 6334d7dd
Calen Pennington committed May 09, 2014

6334d7dd Browse Files
Fix cohort.course_id naming · 7bb6d6f2
Calen Pennington committed May 09, 2014

7bb6d6f2 Browse Files
Better unicode handling in instructor tasks/bulk-email · eb11ba76
Calen Pennington committed May 09, 2014

eb11ba76 Browse Files
Return the course from get_course in courseware · 54bd1cbe
Calen Pennington committed May 09, 2014

54bd1cbe Browse Files

Merge remote-tracking branches 'edx/opaque-keys-base-keys',… · d466132a

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

committed May 08, 2014

d466132a Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · d6547988

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]

committed May 08, 2014

d6547988 Browse Files

08 May, 2014 3 commits

Make course ids and usage ids opaque to LMS and Studio [partial commit] · cd746bf8

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]

committed May 08, 2014

cd746bf8 Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 014cb9e5

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]

committed May 08, 2014

014cb9e5 Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 79cf4c72

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]

committed May 08, 2014

79cf4c72 Browse Files

07 May, 2014 5 commits

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 0d88379e

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]

committed May 07, 2014

0d88379e Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · e2bfcf2a

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]

committed May 07, 2014

e2bfcf2a Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 3b036278

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]

committed May 07, 2014

3b036278 Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · d5029abf

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]

committed May 07, 2014

d5029abf Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 17f0b440

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]

committed May 07, 2014

17f0b440 Browse Files

06 May, 2014 4 commits

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 974e66b7

This commit updates miscellaneous files in common.

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]

committed May 06, 2014

974e66b7 Browse Files

fixup! Make course ids and usage ids opaque to LMS and Studio [partial commit] · 03c9b012
Don Mitchell committed May 06, 2014

03c9b012 Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 9811926d

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]

committed May 06, 2014

9811926d Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · 2248968c

This commit adds updated requirements.

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]

committed May 06, 2014

2248968c Browse Files

05 May, 2014 3 commits

Make course ids and usage ids opaque to LMS and Studio [partial commit] · c0568913

This commit adds base classes for CourseKeys and UsageKeys,
and Location and SlashSeparatedCourseKey implementations of both.

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]

committed May 05, 2014

c0568913 Browse Files

Make course ids and usage ids opaque to LMS and Studio [partial commit] · afde40ad

This commit makes the embargo.tests module a real python module.

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]

committed May 05, 2014

afde40ad Browse Files

Reset the jenkins python virtualenv before test runs. · 7852906c
Jay Zoldak committed May 05, 2014

7852906c Browse Files

29 Apr, 2014 8 commits
- Merge pull request #3520 from edx/markhoeber/documentation/devdoc-changelog · d78dd92c
```
added contributor guidelines to change log
```
  Mark Hoeber committed Apr 29, 2014
  d78dd92c Browse Files
- Merge pull request #3467 from edx/clytwynec/add-auto-auth-page-object-for-lms-tests · f4ace615
```
Add AutoAuthPage to lms pages for bok-choy tests
```
  clytwynec committed Apr 29, 2014
  f4ace615 Browse Files
- Merge pull request #3516 from edx/frances/bug/xblock-studio-editor · 021b41c2
```
Fix for xblock settings scroll
```
  frances botsford committed Apr 29, 2014
  021b41c2 Browse Files
- fixed JS link and add contributor guidelines to change log · fc3d8fcd
  Mark Hoeber committed Apr 29, 2014
  
  fc3d8fcd Browse Files
- Merge pull request #3002 from edx/dcs/status-object · c5627b41
```
Convert CAPA inputtype statuses from strings to objects,
```
  Dave St.Germain committed Apr 29, 2014
  c5627b41 Browse Files
- temporary fix for xblock settings scroll · 8ed92f3c
```
UX-623
```
  Frances Botsford committed Apr 29, 2014
  8ed92f3c Browse Files
- Merge pull request #3515 from edx/zub/revert/std1441/deleteitemfromlocmapper · ce9e8d73
```
Revert "remove location of item from loc_mapper and cache"
```
  zubair-arbi committed Apr 29, 2014
  ce9e8d73 Browse Files
- Revert "remove location of item from loc_mapper and cache" · 87408d23
```
This reverts commit d2b8b4f0.
```
  zubair-arbi committed Apr 29, 2014
  87408d23 Browse Files
28 Apr, 2014 11 commits
- Merge pull request #3496 from edx/markhoeber/documentation/doc-327 · c747ebdd
```
Fixed all links in release notes
```
  Mark Hoeber committed Apr 28, 2014
  c747ebdd Browse Files
- Fixed all links in release notes · 5c55b5df
```
moved links to links.rst

Doc-327
```
  Mark Hoeber committed Apr 28, 2014
  5c55b5df Browse Files
- Merge pull request #3499 from edx/markhoeber/documentation/doc-310 · df7ef989
```
Updated note about accessing wiki after hiding page
```
  Mark Hoeber committed Apr 28, 2014
  df7ef989 Browse Files
- Updated note about accessing wiki after hiding page · 1e57b107
```
doc-310
```
  Mark Hoeber committed Apr 28, 2014
  1e57b107 Browse Files
- Merge branch 'release' · b95966e9
```
Conflicts:
	CHANGELOG.rst
```
  David Baumgold committed Apr 28, 2014
  b95966e9 Browse Files
- Merge pull request #3494 from edx/sarina/fix-video-i18n · cba08d0b
```
Fix i18n of video transcript
```
  Sarina Canelake committed Apr 28, 2014
  cba08d0b Browse Files
- Merge pull request #3476 from edx/usman/lms2556-wiki-urls · 23ee963c
```
Fixed transform_url function in WikiAccessMiddleware.
```
  Adam committed Apr 28, 2014
  23ee963c Browse Files
- Fix i18n of video transcript · e76f6dc8
  Sarina Canelake committed Apr 28, 2014
  
  e76f6dc8 Browse Files
- Fixed transform_url function in WikiAccessMiddleware. · f591b1db
```
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
```
  Usman Khalid committed Apr 28, 2014
  f591b1db Browse Files
- Merge pull request #3438 from edx/sarina/fix-video-i18n · 7a513820
```
Don't scrape unnecessary strings for i18n
```
  Sarina Canelake committed Apr 28, 2014
  7a513820 Browse Files
- Merge pull request #3478 from edx/sylvia/docs/TIM-476 · e4c5eb4d
```
Add info about removing prompt
```
  srpearce committed Apr 28, 2014
  e4c5eb4d Browse Files