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

41697 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Robert Raposa
eff621b7ba Merge pull request #15468 from edx/robrap/reduce-thresholds 
Reduce xss thresholds.
 2017-07-05 11:56:37 -04:00
Christina Roberts
224606bd97 Merge pull request #15392 from open-craft/smarnach/notify-default 
Add flag to configure whether "Notify users by email" is checked by default.
 2017-07-05 11:32:39 -04:00
Clinton Blackburn
e1312b3812 Updated Django Waffle to 0.12.0 2017-07-05 11:30:02 -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
Robert Raposa
cbcc8d4d18 Reduce xss thresholds. 2017-07-05 10:12:26 -04:00
David Ormsbee
b0abd5b02a Merge pull request #15461 from edx/ormsbee/snb_devplus 
Removed old (unused) devplus.py env for LMS.
 2017-07-05 09:19:24 -04:00
M. Rehan
378f05622b Merge pull request #15463 from edx/mrehan/set-val-yt-id-on-save 
Override video xmodule's youtube id with the id coming from val YT profile
 2017-07-05 18:08:26 +05:00
Qubad786
acfa80a663 Override video's youtube_id_1_0 with val yt id on save. 2017-07-05 14:58:13 +05:00
Sven Marnach
7ac436c28e Add flag to configure whether "Notify users by email" is checked by default. 2017-07-05 11:19:02 +02:00
Andy Armstrong
a6392e514a Merge pull request #15415 from edx/andya/use-edx-bootstrap 
Implement a skeleton page with Bootstrap
 2017-07-04 18:29:13 -04:00
Harry Rein
7ea3b013ad Style LMS header, footer and nav for Bootstrap. 2017-07-04 17:24:12 -04:00
Andy Armstrong
3cd985da20 Implement a skeleton page with Bootstrap 
LEARNER-1174
 2017-07-04 15:55:06 -04:00
David Ormsbee
3e2520396d Removed old (unused) devplus.py env for LMS. 
This used to be where we enabled some prod-like features on the dev
environment, but it's horribly out of date (it actually predates
the vagrant-based devstack).
 2017-07-04 08:00:02 -04:00
Ibrahim Ahmed
c6e085173d Merge pull request #15460 from edx/ibrahimahmed443/WL-1088 
Do not capitalize words in start button
 2017-07-04 15:53:49 +05:00
Afzal Wali Naushahi
f4da106e36 Merge pull request #15334 from edx/afzaledx/Learner-1146 
Learner-1146
 2017-07-04 15:17:38 +05:00
Ibrahim
90d0a3637c Do not capitalize words in start button 2017-07-04 14:59:39 +05:00
Afzal Wali
383208c4c8 multitenant Program cache. 
Fetched Programs and Program details from Course Discovery service for all sites and stored the uuids in cache with site-specfic keys.
Learner-1146
 2017-07-04 14:20:55 +05:00
Diana Huang
51fc7b73bf Merge pull request #15457 from edx/diana/replace-updates-urls 
Replace urls in html updates.
 2017-07-03 16:05:51 -04:00
Kevin Falcone
ea7b14eba3 Merge pull request #15455 from edx/jibsheet/bump-newrelic 
Bump up the NewRelic plugin version
 2017-07-03 15:20:25 -04:00
Diana Huang
378b1f86c6 Replace urls in plan html updates. 2017-07-03 15:03:29 -04:00
Kevin Falcone
0c4fa745bd Bump up the NewRelic plugin version 
Most bugfixes are python3 or Tornado specific, but several releate
to Django 1.10 and they improved transaction traces since we last
updated.

https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes/python-agent-286370
 2017-07-03 12:55:54 -04:00
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -04:00
Jesse Shapiro
8838162abb Merge pull request #15453 from open-craft/haikuginger/fix-failing-catalog-integration-tests 
[ENT-457] Fix failing course_mode tests
 2017-07-03 12:03:07 -04:00
Jesse Shapiro
add01fdfab Specify catalog URL to configure 2017-07-03 10:48:11 -04:00
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