Commit Graph

1810 Commits

Author SHA1 Message Date
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
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
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
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
marcore
686aa3af82 Disable sending activation email also when doing external_auth and setting BYPASS_ACTIVATION_EMAIL_FOR_EXTAUTH=True 2014-09-17 11:30:27 +02:00
Renzo Lucioni
1fbccdaa20 Merge pull request #5183 from edx/renzo/new-audit-track-selection
Prepare track selection page for new audit track
2014-09-15 10:09:26 -04:00
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Waheed Ahmed
a1e911ae39 Fixed InvalidKeyError in course handler in studio.
LMS-11141
2014-09-12 15:16:36 +05:00
cahrens
020094b8fb Create auto cohorts when list_cohorts is called and return number of users per cohort.
TNL-186
2014-09-11 13:51:34 -04:00
Julia Hansbrough
3a0dea20e1 Merge pull request #5168 from edx/flowerhack/third-party-stats
Flowerhack/third party stats
2014-09-11 11:04:38 -04:00
Don Mitchell
4ebe26696e Merge branch 'release'
Conflicts:
	common/djangoapps/student/views.py
2014-09-11 10:31:53 -04:00
Julia Hansbrough
059d0dfff3 Login analytics 2014-09-11 13:53:29 +00:00
zubair-arbi
27c29d0dfd Merge pull request #5140 from edx/zub/bugfix/plat-101-playercontrolsnotvisible
show video controls for all youtube videos
2014-09-11 17:35:49 +05:00
zubair-arbi
e3f499a757 show video controls for all youtube videos
TNL-184
2014-09-11 17:02:27 +05:00
chrisndodge
789193ef10 Merge pull request #5166 from edx/cdodge/hotfix-disable-social-auth-for-white-labels
make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware
2014-09-10 16:52:57 -04:00
Don Mitchell
534d1b52f2 Merge branch 'release' 2014-09-10 12:40:43 -04:00
Chris Dodge
1379158e8d make the 'ENABLE_THIRD_PARTY_AUTH' feature flag be microsite aware 2014-09-10 12:38:40 -04:00
Will Daly
541419e362 Merge pull request #5141 from edx/will/fix-embargo-tests
Fix embargo middleware with tests
2014-09-10 07:58:23 -04:00
Will Daly
512db7be99 Fix embargo middleware with tests 2014-09-09 08:50:10 -04:00
Gabe Mulley
7900e8d346 Add event tracking endpoint to be called by segment.io 2014-09-09 07:25:54 -04:00
Renzo Lucioni
12d5c9b281 Do not call upper on a profile country code of None 2014-09-08 17:33:02 -04:00
Renzo Lucioni
0b2840ee6f Skip audit enrollment if user is in the experimental branch 2014-09-08 14:17:04 -04:00
Sarina Canelake
467f2988e1 Quality cleanup 2014-09-08 12:02:31 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs
XBlock argument passing support backport from SDK
2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Renzo Lucioni
c3359135e7 Refrain from accessing country code if country is None 2014-09-05 10:58:18 -04:00
Renzo Lucioni
aa28fba9ad Revert "Revert "Merge pull request #4976 from edx/will/ecom-128""
This reverts commit 371dfd6187.
2014-09-05 10:51:51 -04:00
Adam
385b3ff48a Merge pull request #5087 from edx/release
Release
2014-09-05 09:31:40 -04:00
Nimisha Asthagiri
08a0c6392e Merge pull request #5070 from edx/reruns/error-handling
Course Rerun: include stack trace in errors and Log errors.
2014-09-04 16:25:43 -04:00
Diana Huang
371dfd6187 Revert "Merge pull request #4976 from edx/will/ecom-128"
This reverts commit a03baee25c, reversing
changes made to 12e2d442e9.
2014-09-04 16:01:28 -04:00
Han Su Kim
578be6cc70 Merge branch 'release' 2014-09-04 15:50:33 -04:00
Nimisha Asthagiri
bdd91daeb6 Include stack trace in Course Rerun errors; Log errors. 2014-09-04 14:31:07 -04:00