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

41671 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ibrahim Ahmed
2bb7a9fdb9 Merge pull request #15442 from edx/ibrahimahmed443/WL-1087-video-issue 
fix issue where video modal is not closed by clicking outside the video
 2017-07-03 19:26:43 +05:00
Ibrahim
33f9c46e1b fix issue where video modal is not closed by clicking outside the video 2017-07-03 17:20:21 +05: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
Kevin Falcone
9329a5e3f0 Merge pull request #15440 from edx/jibsheet/tweak-video-upload-pipeline-s3-access 
Change to validate=False which emulates django-storages
 2017-06-30 14:19:23 -04:00
Jesse Shapiro
e408feffb8 Merge pull request #15400 from open-craft/haikuginger/enterprise_audit_enrollment 
[ENT-457] Create EnterpriseCourseEnrollment when enrolling via Track Selection page
 2017-06-30 13:22:17 -04:00
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -04:00
Robert Raposa
168a45b482 Part I: Rename xss-linter (files only). 
This requires the next commit to work, but needed to be
is a separate commit to keep history.
 2017-06-30 13:18:50 -04:00
Jesse Shapiro
d940bbfd09 Create EnterpriseCourseEnrollment when enrolling via Track Selection page 2017-06-30 12:39:14 -04:00
Ari Rizzitano
76c958dd14 Merge pull request #15438 from edx/ari/eslint-config-edx-3.0.0 
eslint config edx v3
 2017-06-30 11:28:36 -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
Jeff LaJoie
a45ac2f45d Merge pull request #15437 from edx/jlajoie/EDUCATOR-793 
EDUCATOR-793: converts TypeError,NotFoundError logging to debug only
 2017-06-29 16:12:08 -04:00
Robert Raposa
a087ce4854 Merge pull request #15416 from edx/robrap/LEARNER-1604-waffle-default 
LEARNER-1604: Change default and refactor old unified_course_view flag.
 2017-06-29 15:37:38 -04:00
Gregory Martin
8543a7504f Merge pull request #15411 from edx/yro/fire-certs-on-pass 
Enqueue Generate Certs Task on Passing Grade
 2017-06-29 15:29:26 -04:00
Jeff LaJoie
5160909d3b EDUCATOR-793: converts TypeError,NotFoundError logging to debug only 2017-06-29 15:17:45 -04:00
Sven Marnach
1d8d44eedb Merge pull request #15223 from proversity-org/proversity/pr-add-invitation-only-field-to-course-serializer 
Add invitation_only field to course serializer
 2017-06-29 20:32:56 +02:00
Gregory Martin
b9425c5b5c Implement signal/handler for learner passing grades 2017-06-29 14:16:06 -04:00
John Eskew
fd2efcba7a Merge pull request #15435 from edx/jeskew/remove_another_1.9_deprecation_warning 
Remove deprecated django.utils.importlib
 2017-06-29 13:58:05 -04:00
Ned Batchelder
bf0f7ce704 Merge pull request #15433 from edx/nedbat/pedantic-footer-2 
Correct spelling of 'Open edX', and pedantic typography in the copyright footer
 2017-06-29 12:15:14 -04:00
Sanford Student
86eca26aa0 EDUCATOR-778: prefetched visible blocks 2017-06-29 12:09:22 -04:00
John Eskew
947e814216 Remove deprecated django.utils.importlib. 2017-06-29 12:08:21 -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
Jeremy Bowman
d48b237c6f Merge pull request #15414 from edx/jmbowman/PLAT-1597 
PLAT-1597 Fix test mongo cleanup hostname in Docker devstack
 2017-06-29 11:57:16 -04:00
Robert Raposa
2e80c1e66b Refactor, enhance, and adjust unified_course_view flag. 
This includes several general enhancement in addition
to the fixes for unified_course_view:
1. Add support for default when no waffle flag defined.
2. Add support for table_blacklist to assertNumQueries.
3. Rename flag to 'course_experience.course_outline_page'.
4. Change flag default to True when it is not defined.
 2017-06-29 11:04:35 -04:00
Jeremy Bowman
d311a83474 Merge pull request #15427 from edx/jmbowman/PLAT-1610 
PLAT-1610 Fix social auth config error in Docker bok-choy tests
 2017-06-29 10:32:48 -04:00
Jeremy Bowman
6080f76d19 Merge pull request #15426 from edx/jmbowman/PLAT-1323 
PLAT-1323 Remove older, slower code path for course export
 2017-06-29 10:30:28 -04:00
Ned Batchelder
01018ec418 Correct spelling of 'Open edX', and pedantic typography in the copyright footer 2017-06-29 10:22:38 -04:00
Jose Antonio Gonzalez
aca096138b add invitation_only field to course serializer 2017-06-29 16:08:58 +02: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
Ibrahim Ahmed
c26190a709 Merge pull request #15429 from edx/ibrahimahmed443/WL-1078-program-details-changes 
Ibrahimahmed443/wl 1078 program details changes
 2017-06-29 16:25:17 +05:00
Ibrahim
44f1f7f975 start button fix in mobile 2017-06-29 13:06:19 +05:00
Clinton Blackburn
beba48a5d4 Added model and API endpoints for experiment-scoped data 2017-06-28 16:25:39 -04:00
Clinton Blackburn
be51c71913 Added ExperimentData API endpoint for bulk upserts 
This endpoint allows the Rapid Experiments Team to quickly update data for multiple learners.
 2017-06-28 16:25:39 -04:00
Joel Barciauskas
89c4705234 Merge pull request #14847 from edx/jbarciauskas/refactor-heartbeat-extensible 
Refactor heartbeat endpoint for extensibility
 2017-06-28 15:59:26 -04:00
Jeremy Bowman
5cbdd5de61 PLAT-1323 Remove older, slower code path for course export 2017-06-28 14:55:19 -04:00
Jeremy Bowman
f1902f9e51 PLAT-1610 Fix social auth config error in Docker bok-choy tests 2017-06-28 13:28:22 -04:00
Brian Mesick
c8681746ad Merge pull request #15402 from edx/bmedx/django_1.11_upgrade_django_pyfs_PLAT-1594 
Upgrade django-pyfs to 1.0.6
 2017-06-28 13:25:44 -04:00
Clinton Blackburn
a42264715b Corrected create permissions for ExperimentData create endpoint 2017-06-27 19:35:31 -04:00
Brittney Exline
e71f1afdf3 Merge pull request #15408 from edx/bexline/send_to_registration_first 
ENT-447 Add flag to third party auth SAML provider to send to the registration page first
 2017-06-27 16:55:29 -04:00
Michael Frey
6f60d3b905 Merge pull request #15417 from edx/mjfrey/catch-exception 
catch InvalidKeyError
 2017-06-27 15:58:51 -04:00
Brittney Exline
ae8a5f2bf7 ENT-447 Add flag to third party auth SAML provider to send to the registration page first 2017-06-27 13:12:00 -04:00
Bill DeRusha
f920493b6a Merge pull request #14729 from OmarIthawi/omar/username-unicode 
Add optional support for Unicode usernames
 2017-06-27 12:11:52 -04:00
Joel Barciauskas
7895875559 Refactor the heartbeat djangoapp to be a bit more extensible 
We may want to add additional heartbeat checks, particularly depending
on the context (e.g. different environments). This is meant to be a
start at enabling a more plug-in style heartbeat check that provides
more detailed diagnostics if desired.
 2017-06-27 11:45:37 -04:00
Calen Pennington
29acb6c733 Merge pull request #15413 from cpennington/ret/fix-sock-pricing 
Use the right helper function for finding course upgrade price for th…
 2017-06-27 10:45:43 -04:00
Michael Frey
f92d02feae catch InvalidKeyError 2017-06-27 09:49: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
Harry Rein
e6c94400d1 Merge pull request #15406 from edx/HarryRein/LEARNER-1534-no-updates-bug 
Only display updates course tool when updates exist.
 2017-06-26 17:27:00 -04:00
Jeremy Bowman
84201666ae PLAT-1597 Fix test mongo cleanup hostname in Docker devstack 2017-06-26 16:37:32 -04:00
Michael Frey
330c4daa73 Merge pull request #15361 from edx/iivic/LEARNER-1523 
Created new embargo check api
 2017-06-26 16:29:52 -04:00
Calen Pennington
849f24ab13 Use the right helper function for finding course upgrade price for the sock 2017-06-26 16:24:45 -04:00
Feanil Patel
4dad21e3b8 Merge pull request #15412 from edx/revert-14327-mtyaka/problem-builder-2.6.6 
Revert "Bump problem builder to v2.6.9."
 2017-06-26 16:24:15 -04:00