Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

4136 Commits

Author SHA1 Message Date
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
Waheed Ahmed
29aa933140 Converted annotation lettuce test into bok-choy test. 
TNL-353
 2014-09-29 13:12:06 +05:00
Stephen Sanchez
c88e914077 Merge pull request #5398 from edx/sanchez/fix_about_page_header 
Allowing new styles on White Label about pages.
 2014-09-26 08:18:08 -04:00
Stephen Sanchez
3fd3bd4e43 Crude solution to allowing new styles on White Label about pages. 2014-09-25 20:31:18 +00: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
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
Andy Armstrong
74fb8e93ed Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk 
Revert "Revert "add an additional tag so we can route zendesk tickets be...
 2014-09-24 14:21:41 -04:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +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
Paul Medlock-Walton
b797c6bd09 username and email request for lti module 
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
 2014-09-24 20:05:42 +03: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
zubair-arbi
c7418a306c Merge pull request #5240 from edx/zub/bugfix/tnl-324-downloadvideoexportimport 
Don't set 'download_video' field on importing video from xml until expli...
 2014-09-24 18:12:10 +05: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
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
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
zubair-arbi
bdf2c28641 update video module to always set download_video field on export 2014-09-22 13:15:40 +05:00
zubair-arbi
3f026c1e90 Don't set 'download_video' field on importing video from xml until explicitly set 
TNL-324
 2014-09-22 13:15:40 +05:00
Waheed Ahmed
3c8eacd440 Disabled student view if course is not yet released for students. 
LMS-6617
 2014-09-22 12:50:46 +05: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
ac862b7a97 only load tabs if user is enrolled in course (TNL-286) 
add tests for static tabs
 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
Adam Palay
1b06edb6ff display banner on course info page if user is not enrolled (TNL-286) 
write failing tests for info page banner
 2014-09-18 11:35:18 -04:00
Adam Palay
e569e090c2 redirect users from about page to info page when there is a marketing site (TNL-286) 2014-09-18 11:35:17 -04:00
Adam Palay
7f4da14185 Add middleware optionally to catch unenrolled students who fail has_access (TNL-286) 2014-09-18 11:35:17 -04:00
Usman Khalid
7bb0d5f5d8 Merge pull request #5174 from edx/usman/tnl-208-instructor-permissions 
Added instructor persmission checking to _has_access_error_desc() in courseware.access
 2014-09-18 15:43:58 +05:00
Ned Batchelder
2d05ffacdf Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-17 07:24:52 -04:00
Ned Batchelder
1a7009ec1f Merge pull request #5251 from edx/ned/revert-lti-username-email 
Revert "username and email request for lti module"
 2014-09-17 06:59:42 -04:00
Ned Batchelder
4edeeb72c2 Revert "username and email request for lti module" 
This reverts commit 3f159ea52b.
 2014-09-16 16:13:41 -04:00
chrisndodge
23531e8966 Merge pull request #5220 from edx/cdodge/dont-redirect-to-dashboard-when-having-and-empty-dashboard 
only redirect to dashboard if user has course enrollments, otherwise rem...
 2014-09-15 22:06:13 -04:00
Chris Dodge
50cdd2b087 only redirect to dashboard if user has course enrollments, otherwise remain on the course catalog page (aka homepage or root) 
update lettuce test to match new expected behavior

add Jason's feedback

only apply new redirect logic for microsites

switch to use a feature flag to determine whether to support redirect behavior
 2014-09-15 20:52:44 -04:00
Jesse Zoldak
76517de87d Disable intermittently failing annotation acceptance test TNL-353 2014-09-15 12:23:47 -04:00
Renzo Lucioni
cc6e63dd22 Prepare track selection page for new audit track 2014-09-12 13:58:13 -04:00
Usman Khalid
660cdf79c0 Added instructor persmission to _has_access_error_desc() in courseware.access. 
TNL-208
 2014-09-11 19:17:57 +05:00
Waheed Ahmed
5fd1ade766 Fixed 404 on courseware when users last visited subsection becomes unpublished. 
LMS-6492
 2014-09-11 18:35:58 +05:00
Don Mitchell
8f90e39626 Merge pull request #5149 from edx/mongo/bulk_operation 
Generalize bulk_operations logic
 2014-09-10 16:16:40 -04:00
Don Mitchell
4faed64859 Generalize bulk_operations logic 
LMS-11366
 2014-09-10 15:35:28 -04:00
Ben Patterson
dc75f6870a Acceptance tests (lettuce): hardcode sleeps to fix flakiness 
This is a quick fix (because the long fix was taking far too long
due to animation). The truer fix is to port these tests to bok-choy.
 2014-09-10 13:44:49 -04:00
Nimisha Asthagiri
041d72ccc6 Update mongo counts. 2014-09-04 18:14:13 -04:00
Don Mitchell
b28af4fdaa Temporarily disable bulk operations b/c old mongo 
does too much work on exit and doesn't handle nesting
 2014-09-04 17:28:17 -04:00
chrisndodge
c5fc9b2fc8 Merge pull request #4771 from edx/cdodge/ecommerce-invoicing 
Cdodge/ecommerce invoicing
 2014-09-02 15:32:41 -04:00
Calen Pennington
1e2d5ffe03 Merge pull request #5031 from edx/andya/merge-hotfix-2014-08-29 
Merge hotfix-2014-08-29 to master
 2014-09-02 15:32:05 -04:00
Muhammad Shoaib
2cc0433833 Implement mediated bulk purchase epic 
Updating EX-60 logic
 2014-09-02 13:03:24 -04:00
Stephen Sanchez
8eeb091de8 Merge pull request #5036 from edx/sanchez/fix_django_header_tests 
Sanchez/fix django header tests
 2014-09-02 10:44:16 -04:00
Calen Pennington
fb56588090 Tweak mongo count numbers 2014-09-02 10:29:23 -04:00
Stephen Sanchez
2f4fb30592 Cleaning up ddt syntax for new footer test. 2014-09-02 13:14:28 +00:00
htareque
3f159ea52b username and email request for lti module 
added username and email functionality, so that username and email can be passed to the lti third party app

rev2: added customizable text box

rev3: added revisions from auraz
 2014-09-02 08:12:36 -04:00