Commit Graph

146 Commits

Author SHA1 Message Date
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release
Release into master
2015-10-02 12:58:50 -04:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
2015-09-30 14:12:33 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Jesse Zoldak
d9dbc1f24b Merge pull request #9793 from edx/zoldak/django-session-cookie
Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting
2015-09-22 09:28:42 -04:00
Jesse Zoldak
8a876a5ec3 Add the ability to change the SESSION_SAVE_EVERY_REQUEST django setting 2015-09-21 13:01:42 -04:00
Peter Fogg
fec5129a49 Remove Tender and change Studio help links.
TNL-2695
2015-09-17 16:30:40 -04:00
Zia Fazal
14c14b07db moved SOCIAL_SHARING_SETTINGS out of FEATURES
fixed object has no attribute 'get'

fixed 'LazySettings' object has no attribute

add social settings to cms/env/aws
2015-09-17 19:24:09 +05:00
Ned Batchelder
2a0259095d Change imports from path to use the stablest name.
The old line:

    from path import path

produced pylint errors because of the baroque way that path.py defined
"path".  We tried to get them to change how they defined it, but they
deleted the name instead: https://github.com/jaraco/path.py/issues/102

(Jason then changed his mind, but this is a better way to use path.py,
it avoids the pylint error at least.)
2015-08-27 12:59:25 -04:00
Chris Dodge
6cf5516a84 Integration of edx_proctoring into the LMS 2015-08-13 19:08:50 -04:00
Dongwook
e7aa8fc176 allows platform version formatting as a part of static url served by djpyfs 2015-07-24 20:05:20 +00:00
muzaffaryousaf
38ef22b8a2 Using youtube api (v3) instead of v2 to get the video duration .
TNL-2413
2015-07-24 17:03:46 +05:00
Chris Dodge
3748119961 Integrate timed and proctored exam authoring into Studio 2015-07-23 14:43:17 -04:00
Brandon DeRosier
2bfbda3c1e Revert "edX Course/Library Import/Export API"
This reverts commit c94abd2705.
2015-07-08 16:55:38 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
2015-07-02 15:32:00 -04:00
Will Daly
5e86a64729 User info cookie
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
2015-06-24 09:44:50 -07:00
Will Daly
c31a510607 Deprecate course details API v0 2015-06-12 15:59:20 -04:00
Xavier Antoviaque
b32629d62f Default to filestorage when S3 isn't configured (aws.py)
Also moves the default icons to the badges subfolder to avoid storage conflicts.
2015-06-08 11:30:16 +02:00
David Baumgold
a3887e951c Courseware license (Creative Commons): FED
Use native checkboxes for courseware license options
In Studio settings editor for video module, don't show license if feature-flagged off
Don't let Scope.contents fields leak to Studio editor
JS gettext() must all be on the same line for i18n
Add docstrings for bok-choy tests
Remove LicenseMixin from HTMLDescriptor
Responding to UX review feedback
Add aria-pressed attribute
Use https links instead of protocol-relative links for links to creativecommons.org
Remove license from course outline page in Studio
2015-05-18 14:36:04 -04:00
Feanil Patel
6289b190d9 Fix pep8 and pylint. 2015-05-08 09:01:50 -04:00
Feanil Patel
4cc39abfa4 Update celery config for config files I missed. 2015-05-08 09:01:50 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Nimisha Asthagiri
b124485ed6 MA-611, MA-613 Mobile Push Notification Studio Backend; Integration with Parse 2015-04-18 15:30:19 -04:00
E. Kolpakov
bd891c21db Added setting to enable/disable library indexing + moved is_index_enabled into search indexer classes
Added task and signal to fire library reindex
2015-04-14 12:40:05 +03:00
louyihua
9d3b65282e Fix error when STUDIO_NAME uses non-ascii characters
The replacement strings need to be unicode, so that when STUDIO_NAME contains non-ascii characters python can handle it correctly without raising exceptions.
Also, the value of STUDIO_SHORT_NAME can be read from cms.env.json.
2015-03-28 21:47:59 +08:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib
This makes these files importable, and puts them into the new best guess
as to where files should live.
2015-03-23 12:40:24 -04:00
David Baumgold
cfb1ec115a Define TENDER_SUBDOMAIN to that we can still use vanity URLs 2015-03-11 16:36:55 -04:00
E. Kolpakov
c225d86e83 SettingsService for accessing server-wide settings from XBlock 2015-03-05 18:24:47 +03:00
Xavier Antoviaque
05c857478b xblock-external-ui: Adds support for CORS headers (cross-domain request)
xblock-external-ui: Alternate referer check for CORS requests
xblock-external-ui: Allow to disable httponly on session cookies
xblock-external-ui: Add a unit test for CorsCSRFMiddleware
2015-02-17 10:24:27 +01:00
Bertrand Marron
4789c5c9d0 Use HTTP_X_FORWARDED_PROTO header in studio 2015-02-02 16:54:26 +01:00
Davorin Sego
e09d47b122 Courseware Search integration 2015-01-28 21:34:58 -05:00
Chris Rodriguez
9e2494b21d Video player branding addition for XuetangX 2015-01-28 06:39:21 -05:00
Carlos Andrés Rocha
78375b797b Merge pull request #6738 from edx/rc/2015-01-20
Rc/2015 01 20
2015-01-23 16:10:28 -05:00
David Baumgold
f2d549b619 Proxy TENDER_DOMAIN variable from environment to Studio settings 2015-01-22 10:56:30 -05:00
David Baumgold
ef43840a79 Ignore invalid-name errors for settings files
path.py objects report themselves as class objects, which confuses the heck out of
pylint. It tries to match variable names using the class-rgx regular expression
instead of the constant-rgx regular expression, and it doesn't match, so it
throws an error. Not sure how to fix pylint, so we'll just ignore these errors.
2015-01-16 11:37:28 -05:00
Dennis Jen
17c2af2325 Merge pull request #6513 from edx/release
Merge release back into master
2015-01-09 09:15:57 -05:00
Adam Palay
62157f3725 set studio_name in aws.py (TNL-1138) 2015-01-08 16:28:01 -05:00
stephensanchez
1e7d567b58 Initial framework for the Course About API.
ECOM-248 Course Info API. Basic functionality implemented.

ECOM-248 adding factory for about descriptor and test cases for course info api

ECOM-248 adding test cases for couse info api.

ECOM-248 re-factoring code. updating test cases.

Tests for course_about data module

ECOM-248 Adding test cases for the exceptions.

ECOM-248 re-factoring code. fixing quality issues.

ECOM-248 fixing test cases and moved parse video method into utils.

added github username in authors

ECOM-248 removed merging issue of test_data

ECOM-248 removed unused files
2015-01-07 20:03:54 +05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release
Release
2014-12-19 13:23:22 -05:00
John Jarvis
a9d731165c optionally using environment variable for edx-platform hash 2014-12-16 15:13:08 -05:00
Nimisha Asthagiri
0687a62a8f Add back end for Studio video upload feature
This feature allows upload of video assets to S3. This requires that the
VIDEO_UPLOAD_PIPELINE setting be properly configured and that each
course be configured with a token issued by the media team for their
processing purposes (e.g. linking the video with a YouTube channel).

Co-authored-by: Greg Price <gprice@edx.org>
2014-12-15 13:09:59 -05:00
Muhammad Ammar
927249bcdc Merge pull request #6085 from edx/ammar/update-advance-config
Update AWS Configuration for ORA1 Problem Creation
2014-12-02 15:35:57 +05:00
Sarina Canelake
d406261e4b s/pylint: disable=W0614/pylint: disable=unused-wildcard-import/ 2014-12-01 11:22:11 -05:00
Sarina Canelake
f223ac8404 s/pylint: disable=W0401/pylint: disable=wildcard-import/ 2014-12-01 11:22:11 -05:00
muhammad-ammar
a0dc4c1589 Update AWS Configuration for ORA1 Problem Creation 2014-11-28 11:12:14 +00:00
Adam Palay
459e4696c0 change djfs settings not to throw an error when the app starts up 2014-11-06 13:56:33 -05:00
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08:00
David Baumgold
fc5148438d Merge pull request #4730 from edx-solutions/secure-cookies
secure-cookies: Allow to use secure HTTPS cookies (Django setting)
2014-10-09 10:24:34 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage
Upgrades to latest pyfs to support auth not through environment variables
2014-09-08 10:46:18 -04:00