Commit Graph

7547 Commits

Author SHA1 Message Date
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
2017-07-17 11:19:56 -04:00
sarahkf
51208f370a Merge pull request #15339 from edx/sarahkf/fix-structure-files-and-uploads
fixed files and uploads template in Studio
2017-07-17 10:46:05 -04:00
Sarah Fischmann
f617deea05 Fix files and uploads template in Studio
EDUCATOR-605

fixed template in places that only affect Studio

changed > to dash and article to div

Added translation of aria-label

EDUCATOR-605

Capitalize Files and Uploads

EDUCATOR-605

fixed aria label on div
2017-07-17 09:40:08 -04:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
2017-07-14 16:05:13 -04:00
George Song
59794ea9c9 Merge pull request #15338 from ravi-ojha/educator_269
Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled
2017-07-12 10:50:55 -07:00
Joel Barciauskas
01db7a7d74 Add course import REST API to Studio 2017-07-12 11:48:35 -04:00
rabiaiftikhar
6e873a4838 EDUCATOR-810 fix UnicodeDecodeError 2017-07-12 07:28:46 +00:00
Sylvia Pearce
121ef86fa1 Fix Studio context-sensitive help link to video documentation 2017-07-11 14:08:23 -04:00
Alex Dusenbery
6dfa47b2fc EDUCATOR-565 | Add POLICY_CHANGE_GRADES_ROUTING_KEY, fix errors in compute_all_grades_for_course circuitry. 2017-07-11 14:01:38 -04:00
cahrens
21bcf02d97 Remove unneeded mustache references. 2017-07-11 12:06:27 -04:00
Steven Zheng
e340b2431e Add django management command to create course from json 2017-07-10 16:02:20 -04:00
Joel Barciauskas
6b08528193 Don't allow any user to create courses by default
* Change settings default
* Set `ENABLE_CREATOR_GROUP` to False for devstack
* Set `ENABLE_CREATOR_GROUP` to False for tests

In f095c5fec6 it was decided to enable
anyone to make courses in Studio by default in order to make things
easier in dev environments. This was before the code was open source.
This default is likely in effect for many Open edX instances, but almost
no one would want this setting outside of development.
2017-07-10 12:47:42 -07:00
Eric Fischer
05cdc60226 Merge pull request #15501 from edx/efischer/limit_libraries
Limit libraries as well if course listing is limited
2017-07-10 12:57:38 -04:00
Brian Beggs
1720bcf356 Merge pull request #15345 from edx/bbeggs/host_fixes
ADD LMS_BASE and CMS_BASE to devstack_docker config files
2017-07-09 12:11:42 -04:00
Brian Beggs
83e52905cf ADD LMS_BASE and CMS_BASE to devstack_docker config files 2017-07-07 17:02:51 -04:00
Eric Fischer
dcd385df6a Include libraries in optimized studio home 2017-07-07 16:11:12 -04:00
Ned Batchelder
0023986551 Merge pull request #15481 from edx/nedbat/update-translations
Update translations (autogenerated message)
2017-07-06 15:00:59 -04:00
Christina Roberts
8fb8647473 Merge pull request #15360 from open-craft/replaceafill/aws_with_filesystem_storage_tested
Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module
2017-07-06 12:36:56 -04:00
Ned Batchelder
5c4ece2968 Update translations (autogenerated message) 2017-07-06 15:17:35 +00:00
Mushtaq Ali
d2b420a9a5 Change opacity and user messages 2017-07-06 12:35:07 +05:00
Qubad786
556213659b Add waffle switch to toggle video thumbnail feature. 2017-07-06 12:35:07 +05:00
Mushtaq Ali
eabfba48a2 Change video image requirements text hover - EDUCATOR-577 2017-07-06 12:35:06 +05:00
Mushtaq Ali
9750cd2ab1 Video Uploads Cleanup - Replace table grid layout with div grid layout and do related adjustments - EDUCATOR-562 2017-07-06 12:35:06 +05:00
Mushtaq Ali
7bf717f75d Add video image settings to aws settings so that lms can pull values from lms.env.json 2017-07-06 12:35:06 +05:00
Mushtaq Ali
cf6200cbb3 Add frontend video image validations - EDUCATOR-447 2017-07-06 12:35:05 +05:00
Mushtaq Ali
e8fee2e09a Add backend video image validations - EDUCATOR-45 2017-07-06 12:35:05 +05:00
muhammad-ammar
626f2896a0 add video poster support
EDUCATOR-44
2017-07-06 12:35:05 +05:00
muhammad-ammar
763f0051bd video thumbnail ui 2017-07-06 12:35:04 +05:00
Muhammad Ammar
dca12d65c2 Save or update course video image - TNL-6762 2017-07-06 12:35:00 +05:00
Aamish Baloch
7b91095398 Merge pull request #15467 from edx/aamishbaloch/YONK-691
YONK-691: Configurable profile image sizes
2017-07-06 12:09:16 +05:00
Jeremy Bowman
e4c8ff3aa4 Merge pull request #15445 from edx/jmbowman/PLAT-1499
PLAT-1499 Use appropriate default settings in Docker devstack
2017-07-05 13:22:14 -04:00
Christina Roberts
bcb610f7dd Merge pull request #15434 from pepeportela/teltek/external_help_button_shape
Keep button shape for long strings
2017-07-05 11:28:59 -04:00
Aamish Baloch
ac45850d15 YONK-691: Configurable profile image sizes 2017-07-05 18:50:01 +05:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Ravi Ojha
4d95ea30a6 Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled
Summary: We show "Issue Open Badges" setting in Studio
Course -> Settings -> Advanced Settings, even if the flag
ENABLE_OPENBADGES is set to False. With this commit, it
will only show up in Advanced Settings if ENABLE_OPENBADGES
is set to True.
2017-07-04 22:57:40 +05:30
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -04:00
Robert Raposa
a864b450a8 Merge pull request #15436 from edx/robrap/rename-xss-linter
Rename xss linter.
2017-06-30 16:22:38 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Kevin Falcone
f6827a9a8e Change to validate=False which emulates django-storages
On many buckets, we use s3://bucket/path to separate environments
because AWS used to have a really low limit on the number of buckets
we could have, and we wanted to share them across environments.

If you combine this with an IAM policy that only allows you access
to the s3://bucket/path that you "own", then get_bucket fails.
http://boto.cloudhackers.com/en/stable/ref/s3.html#boto.s3.connection.S3Connection.get_bucket
The HEAD appears to be similar to get_all_keys which requires
ListObjects on the bucket with no conditions.

django-storages (Which is what we write new S3 access in) actually
always passes validate=False unless you're allowing it to create buckets
for you (which we never do).
https://github.com/jschneier/django-storages/blob/1.4.1/storages/backends/s3boto.py#L320-L334
2017-06-29 16:51:12 -04:00
sarahkf
b673ceee5d Merge pull request #15300 from edx/sarahkf/fix-color-contrast
fixing color contrast issues in studio
2017-06-29 12:00:30 -04:00
Sarah Fischmann
78ef8db40a Fixing color contrast issues in Studio
AC-727
began changing colors in course content, files and uploads, and when creating a course

finished fixing contrast issues on files and uploads page

fixed advanced settings and issue with hovering in files and uploads

fixed color issues in studio home page and when hovering

fixed contrast in updates, pages, textbooks, and group configurations

fixed issues when configuring a section of a course in course outline

fixed hovering colors to make contrast more visible

fixed colors on the green button

AC-727
2017-06-29 10:02:49 -04:00
jportela
ed784d9609 Keep button shape for long strings 2017-06-29 13:53:36 +00:00
Jeremy Bowman
5cbdd5de61 PLAT-1323 Remove older, slower code path for course export 2017-06-28 14:55:19 -04:00
Omar Al-Ithawi
1b46c3e646 Add optional support for Unicode usernames
Refactoring: Use format with named variables
2017-06-27 14:18:49 +03:00
Alex Dusenbery
95460dd143 EDUCATOR-514 | Hide the certificate_available_date field until we enable the feature. 2017-06-26 11:30:15 -04:00
Douglas Cerna
c567add628 Set the MEDIA_ROOT and MEDIA_URL settings in the cms.envs.aws module 2017-06-25 19:47:39 -06:00
Brian Beggs
7074e3abba Merge pull request #14902 from Salomari1987/salah/copyright-year
Set COPYRIGHT_YEAR dynamically
2017-06-23 16:06:35 -04:00
Harry Rein
82daaa5ad3 Adding a reviews page to the course and updating the reviews module on the course about page. Removed the existing coursetalk implementation and put it in a fragment, removed the tests as well. Added configuration settings to specify the reviews template as well as the reviews provider. This is all protected by a waffle flag. 2017-06-23 11:27:48 -04:00
Diana Huang
3d09290c14 Add a dismiss button to welcome message.
Store user's preference indefinitely.
2017-06-22 18:26:50 -04:00
Jeremy Bowman
5a6b8cd35b PLAT-1228 Support bok-choy in Docker Devstack 2017-06-22 15:03:12 -04:00