Commit Graph

5589 Commits

Author SHA1 Message Date
David Baumgold
62fcc6f23a Use ddt for shib tests 2014-10-02 12:18:15 -04:00
Usman Khalid
4e796c575a Merge pull request #5366 from edx/usman/tnl367-transaction-level-decorator
MySQL transaction isolation level decorator.
2014-10-02 19:16:46 +05:00
Stephen Sanchez
aba57382ab Merge pull request #5420 from edx/sanchez/enrollment-success-message
Add new enrollment message to the dashboard
2014-10-02 09:59:39 -04:00
Stephen Sanchez
bf112f7ef0 Add new enrollment message to the dashboard
The body of the enrollment message template

Tokenize platform name in message.

Changing to a datetime enrollment approach

Adding sorting. A little refactoring.

Adding confguration model for time delta

Adding admin registration and basic form for new config model.

Fixing docstring typo

Updating default time delta to 0, adding test to show it disabled functionality.

Removing the form from configuration and tweaking the enrollment message html
2014-10-02 12:32:35 +00:00
David Baumgold
31931827bf Kill DISABLE_RESET_EMAIL_TEST flag
We're better served by just directly testing if we're in the LMS or not.
2014-10-01 11:42:41 -04:00
Christina Roberts
7f4cc1c75c Merge pull request #5407 from edx/cohort-management
Cohorts UI
2014-10-01 11:01:03 -04:00
Usman Khalid
32063fe003 Added commit_on_success_with_read_committed decorator to views
which raise IntegrityErrors.

TNL-367
2014-10-01 19:48:37 +05:00
Usman Khalid
ae09573228 commit_on_success_with_read_committed should only work with atmost
1 level of transactions.

TNL-367
2014-10-01 19:45:38 +05:00
Usman Khalid
25a90301b3 Tests for the commit_on_success_with_read_committed decorator.
TNL-367
2014-10-01 19:45:38 +05:00
Usman Khalid
5ba236f405 Created commit_on_success_with_read_committed decorator.
This decorator executes the decorated function inside a
transaction with isolation level set to READ COMMITTED.

TNL-367
2014-10-01 19:42:47 +05:00
Adam
6a5fc054ba Merge pull request #5445 from edx/release
Release
2014-10-01 09:32:23 -04:00
Andy Armstrong
6219ecacfe Support adding cohorts from the instructor dashboard
TNL-162
2014-10-01 09:22:32 -04:00
Nimisha Asthagiri
f72974d4df TNL-328 Server-side work for displaying type of cohort. 2014-10-01 09:22:30 -04:00
Nimisha Asthagiri
3bb1ab080d TNL-160 Default cohorts, automatically created. 2014-10-01 09:22:30 -04:00
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Adam Palay
0c4f98a89b update password reset template (TNL-503) 2014-09-29 16:15:31 -04:00
Don Mitchell
8fe55c9aee Fix acceptance tests to work w/ split
11300
2014-09-29 11:25:55 -04:00
Don Mitchell
4ca5012f3c Use split to test views 2014-09-29 11:25:55 -04:00
Tim Babych
3f2346260c Merge pull request #5393 from edx/anton/js-double-loading-studio
Fix double loading of cms-modules.js.
2014-09-29 16:39:40 +03:00
zubair-arbi
40f270c945 add couse key verification decorator in common for use in both studio and lms
PLAT-88
2014-09-29 13:26:43 +05:00
polesye
e588fb8f05 TNL-272: Fix double loading of cms-modules.js. 2014-09-26 21:28:54 +03:00
Sarina Canelake
fbd9cc1310 Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode
Fix UnicodeError with anonymous student IDs
2014-09-25 16:43:18 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release'
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login
Automatically log in users who access third party login after trying to register for a course
2014-09-25 10:40:33 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile.
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
2014-09-25 08:36:22 -04:00
Braden MacDonald
8e32672228 Fix UnicodeError with anonymous student IDs 2014-09-24 20:17:47 -07:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
Julia Hansbrough
5d5ff8d9c1 Docs 2014-09-24 17:24:42 +00:00
Julia Hansbrough
3fbbe57cef Add auto-registration to third party login flow 2014-09-24 17:24:42 +00:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
Julia Hansbrough
4d77b0552f Move server-side validation to enroll method 2014-09-24 17:23:25 +00:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk
add an additional tag so we can route zendesk tickets better for white l...
2014-09-24 08:52:43 -04:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order"
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
2014-09-23 18:45:59 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
2014-09-23 15:53:10 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites
add tests

fix

use org
2014-09-23 15:39:21 -04:00
Usman Khalid
ed84c1b27a Merge pull request #5246 from edx/usman/plat104-static-content-server
Improvements to byte range handling in StaticContentServer.
2014-09-24 00:15:46 +05:00
Usman Khalid
5af162ebdf Refactored ContentServer tests to use ddt.
PLAT-104
2014-09-23 21:36:46 +05:00
Usman Khalid
7e29a5a65c Added tests for parse_range_header() in contentserver.
PLAT-104
2014-09-23 21:36:45 +05:00
Usman Khalid
ec508f591c StaticContentServer middleware conforms closer to spec for byte range requests.
This commit makes the following changes:
1. If there are syntactic errors in the Range header, it is ignored and
the full content is returned. This conforms to the spec.
2. In case of multiple ranges in the header, the full content is returned.
This behavior differs from the spec which says that a multipart response
should be returned.

PLAT-104
2014-09-23 21:36:45 +05:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration.
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
2014-09-23 12:31:46 -04:00
David Baumgold
c0a25da964 Skip invalid test when in CMS 2014-09-23 12:02:31 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
John Eskew
4aa2dc5289 Merge pull request #5302 from edx/release
Release merge - post hotfix-2014-09-19-1
2014-09-19 14:31:16 -04:00
Adam Palay
0a385544a3 update number of queries in embargo test 2014-09-19 10:19:23 -04:00
Ned Batchelder
10bd2b003f Merge pull request #5129 from edx/ned/python-zip-assets
Python zip file importable from an asset
2014-09-18 19:31:47 -04:00
Ned Batchelder
616bbbab4e Importable python_lib.zip assets
Lots of plumbing to allow an asset named python_lib.zip to be imported
by jailed Python code.

This function can find the "python_lib.zip" asset, and is passed down
through ModuleSystem and LoncapaSystem so that capa problems have access
to the zipfile.
2014-09-18 17:59:12 -04:00
John Eskew
9e830d08c4 Merge branch 'release' into 'master' after successful rc/2014-09-17 deploy. 2014-09-18 12:27:32 -04:00
Chris Dodge
8e1d0f7f23 For microsites, since we don't have a footer override yet for django templates, remove the footer all together 2014-09-17 10:52:04 -04:00