Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
41,749 Commits 1 Branch 0 Tags
978e9fe656bb249237ba1ceea0ebec1aa0b06fa7
Commit Graph

7530 Commits

Author SHA1 Message Date
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
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
Ned Batchelder
8dab37122c Update translations (autogenerated message) 2017-06-21 14:36:35 +00:00
sarahkf
2b81a9409d Merge pull request #15327 from edx/sarahkf/python-template 
fixed CC logo text alternative
 2017-06-20 13:42:45 -04:00
sarahkf
dc121e54cb Merge pull request #15326 from edx/sarahkf/ARIA-roles 
fixed aria-label to just say legal
 2017-06-20 13:41:48 -04:00
Sarah Fischmann
540af5edcd Fixed legal aria-label to be a valid label 
AC-596

fixed aria-label to just say legal

translate legal label
 2017-06-20 11:33:30 -04:00
Sarah Fischmann
58bb4fbc61 Fixed CC logo text alternative 
AC-631

fixed CC logo text alternative

fixed template so python evaluates gettext()
 2017-06-20 09:49:05 -04:00
Salah Alomari
b8ba64cbe1 Set copyright year dynamically 2017-06-19 14:33:55 +03:00
Adam
691d6872c7 Merge pull request #15294 from edx/adam/add-precedes-to-coursegraph-3 
write courses to neo4j in background tasks (EDUCATOR-583)
 2017-06-15 15:10:11 -04:00
Andy Armstrong
0b90c60b5f Merge pull request #15301 from edx/andya/webpack-jquery 
Handle issues with JQuery in Studio and LMS
 2017-06-15 12:11:28 -04:00
Christina Roberts
09e22f373b Merge pull request #15312 from edx/christina/share-template 
Remove extra div.
 2017-06-14 13:36:36 -04:00
Qubad786
afd45996d9 fix studio header menu 2017-06-14 11:49:30 +05:00
Andy Armstrong
4ed9776a4b Handle issues with JQuery in Studio and LMS 
LEARNER-1341
 2017-06-13 20:53:29 -04:00
Carol Tong
c8de3af589 Merge pull request #15313 from edx/carol/DOC-3687 
DOC-3687: Change help target for enrollment track groups on Studio Group Configs page
 2017-06-13 16:48:26 -04:00
sarahkf
086b503b51 Merge pull request #15219 from edx/sarahkf/courseware-lang 
Added course level lang attribute for LMS WIP
 2017-06-13 16:06:59 -04:00
Carol Tong
82b8cf40b3 Change help target for enrollment track groups 2017-06-13 15:51:13 -04:00
Sarah Fischmann
eafb79defc Added lang attribute in LMS and Studio; added language col to course_overviews 
Added course level lang attribute for LMS

added lang attribute to Studio

fixed error when trying to get language attribute on course that does not exist

simplified code

added lang attribure to more places in LMS, added migration for language attribute in course_overview

fixing contraints in the database for language attribute

added lang attribute to several more places in LMS and Studio

added lang attribute to discussion and custom pages; cleaned up code

fixed issue that was causing test failures

moved lang attribute higher in tree in two places
 2017-06-13 14:42:29 -04:00
Sylvia Pearce
fe3105cc38 Update Studio help tokens following doc reorg for Publisher 2017-06-13 13:52:07 -04:00
cahrens
fdc9ebe809 Remove extra div. 
This was probably left over from a previous variation
(there was no closing div).
 2017-06-13 11:51:42 -04:00