Commit Graph

668 Commits

Author SHA1 Message Date
David Baumgold
320941e850 Add settings comment about STUDIO_NAME and STUDIO_SHORT_NAME 2014-12-23 13:32:15 -05:00
David Baumgold
34c6415527 Use STUDIO_SHORT_NAME for Studio
STUDIO_NAME = "edX Studio"
STUDIO_SHORT_NAME = "Studio"
2014-12-23 11:14:58 -05:00
David Baumgold
7366d2b1a2 Replace "edX Studio" with "{studio_name}"
For theming and internationalization
2014-12-19 13:58:42 -05:00
Fred Smith
251407d7d2 Merge pull request #6314 from edx/release
Release
2014-12-19 13:23:22 -05:00
Don Mitchell
d49c82f9bd Add configuration to studio for asides 2014-12-18 14:43: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
Calen Pennington
980f30c17f Move lms.lib.xblock into lms.djangoapps.lms_xblock in preparation add database backed configuration to it 2014-12-12 21:45:21 -05:00
David Baumgold
3bcf18dd59 Merge pull request #6153 from edx/db/update-pep8
Update pep8 to 1.5.7
2014-12-12 15:00:13 -05:00
David Baumgold
4fcf1f9eae Move simplefilter comments before call 2014-12-12 10:47:58 -05:00
Sarina Canelake
5c433ec9a1 Merge pull request #5731 from Stanford-Online/ataki/upstream
Limit Upload File Sizes to GridFS
2014-12-11 16:36:30 -05:00
David Baumgold
36e77c7463 Fixing pep8 issues 2014-12-11 13:04:49 -05:00
John Jarvis
93f0c75fd3 Adding yaml_config, a new settings module
This reads configuration directly from yaml
and imports it directly into settings
2014-12-10 16:46:12 -05:00
cahrens
e472937854 Add DEFAULT_FILE_STORAGE configuration.
Tests in common are run with both CMS and LMS configuration (with different env files). Ensure the DEFAULT_FILE_STORAGE variables are in both environments.
2014-12-10 15:23:48 -05:00
Jim
fb9320afc1 Limit Upload File Sizes to GridFS.
This commit puts a limit on the size of files that
course staff can upload to MongoDB. The limit is
enforced on the frontend in javascript as well
as backend via the /upload endpoint.

The limit is hard-coded in cms/envs/common.py and
may be changed according to the user's custom
needs.

If the user tries to upload a file that's too
large, an error message will pop up, with a
customizable url that pointing the user to an
external page with an alternate upload procedure.
This url is specified im cms/envs/common.py.
If not set, this url will not be displayed.
2014-12-09 13:30:45 -08:00
jsa
f24f01d217 Add support for user partitioning based on cohort.
JIRA: TNL-710

IMPORTANT: this commit converts the course_groups
package to using migrations.  When deploying to an
existing openedx instance, migration 0001 may fail
with an error indicating that the CourseUserGroup
table already exists.  If this happens, running
the 0001 migration first, with the --fake option,
is recommended.  After performing this step,
remaining migrations should work as expected.
2014-12-05 09:53:44 -05:00
Andy Armstrong
356b2335e9 Add base support for cohorted group configurations
TNL-649
2014-12-05 09:52:26 -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
David Baumgold
970a83d41e removed dev_ike and dev_shared_preview 2014-12-01 14:03:45 -05:00
Sarina Canelake
ff18b7d01a s/pylint: disable=W0611/pylint: disable=unused-import/ 2014-12-01 11:22:12 -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
Sarina Canelake
e15d4aea71 s/pylint: disable=F0401/pylint: disable=import-error/ 2014-12-01 11:22:10 -05:00
Sarina Canelake
d14c39a13e Fix exposed pylint violations 2014-12-01 11:22:10 -05:00
Sarina Canelake
b8c16d5ed7 s/pylint: disable=E1120/pylint: disable=no-value-for-parameter/ 2014-12-01 11:22:09 -05:00
muhammad-ammar
a0dc4c1589 Update AWS Configuration for ORA1 Problem Creation 2014-11-28 11:12:14 +00:00
muhammad-ammar
a493348cf0 Remove ability to add new ORA 1 problems to courses
TNL-827
2014-11-24 11:31:59 +00:00
Ben Patterson
a19b97c61f Don't use 'test' db for mysql since it's reserved.
This db name is reserved and used by mysql installations. This can cause
conflicts when trying to populate our own 'test' database on mysql.
2014-11-13 14:41:50 -05:00
stv
cb894cf35e Fix PEP8: E261 at least two spaces before inline comment 2014-11-10 19:31:09 -08:00
stv
00ae488960 Fix PEP8: E225 missing whitespace around operator 2014-11-10 19:30:18 -08: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
Sarina Canelake
ed76907c0d Remove "ADMIN_MEDIA_PREFIX" (deprecated in Django 1.4)
Delete lms/static/admin resources as they are no longer needed
for the admin page as of Django 1.4

Moved two files that were referenced elsewhere:
lms/static/admin/js/jquery.min.js -> lms/static/js/admin/jquery.min.js
lms/static/admin/js/urlify.js -> lms/static/js/admin/urlify.js
2014-11-01 00:01:17 -04:00
Jason Zhu
4e528140f8 When s3fs cannot be accessed replaced with osfs 2014-10-28 00:01:55 +08:00
polesye
83fbdc2ac4 TNL-481: Add RequireJS Optimizer. 2014-10-20 17:33:21 +03:00
Frances Botsford
c92f52e0bd cleanup and response to PR review 2014-10-17 13:51:43 -04:00
Frances Botsford
e255ac1f29 Initial pass at LMS and Studio RTL 2014-10-17 13:51:42 -04:00
Jesse Zoldak
24f90307f7 Remove references to /tmp in tests
Including:

* Change path for mongo_metadata_inheritance to use unique temp dir
* Update SASS_CACHE_PATH with thread-safe temp dir
* Remove hard coded directory reference for grades download tests
* Remove hard coded directory reference for direct mongo test
2014-10-17 10:00:12 -04:00
Don Mitchell
a63d58cff5 Remove unused credentials from mongo init
was breaking pymongo 2.7
2014-10-09 11:55:14 -04: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
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
Renzo Lucioni
254a0ce6c8 Allow changing of language preference from profile page 2014-09-30 21:11:02 -04:00
Ned Batchelder
364989b9ee Remove JSDraw 2014-09-24 09:56:05 -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
Don Mitchell
040b1c3da5 Merge pull request #5197 from edx/reruns/count_queries
Explain query counts
2014-09-15 15:57:11 -04:00
Don Mitchell
b137f8d7ad Explain query counts
Fix trivial excesses (2 splits configured & don't fetch courses if there are none)
LMS-11220, LMS-11391, LMS-11390
2014-09-15 08:50:10 -04:00
Piotr Mitros
af12acc904 Clean up conventions for underscores vs. dashes in config setting. 2014-09-12 11:52:11 -04:00
Nimisha Asthagiri
3a772752de LMS-11286 Paver Bokchoy support for Split; default store set to Split. 2014-09-11 10:48:09 -04:00
Nimisha Asthagiri
4d36276573 LMS-11297 BokChoy and Acceptance tests configure default_store with update_module_store_settings. 2014-09-11 10:48:08 -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
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00