Commit Graph

16394 Commits

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
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
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
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
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
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
Jeremy Bowman
353b4c4f67 PLAT-1499 Use appropriate default settings in Docker devstack 2017-07-03 12:04:27 -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
Robert Raposa
b370fe2314 Part II: Rename xss linter. 2017-06-30 13:20:23 -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
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
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
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
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
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
Jeremy Bowman
f1902f9e51 PLAT-1610 Fix social auth config error in Docker bok-choy tests 2017-06-28 13:28:22 -04:00
Clinton Blackburn
a42264715b Corrected create permissions for ExperimentData create endpoint 2017-06-27 19:35:31 -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
Ivan Ivic
6e45f00041 Created new embargo check api
LEARNER-1523
LEARNER-1524
2017-06-26 15:02:04 -04:00
Gregory Martin
3e805fa61b add cert task firing on whitelist append 2017-06-26 11:44:38 -04:00
Sven Marnach
3460adc824 Merge pull request #14831 from open-craft/smarnach/immutable-emails
Add feature flag to disable email address changes.
2017-06-26 16:49:52 +02:00
George Song
32deb6a66a Merge pull request #15258 from mreyk/teltek/bugfix/sysadmin-csv-download
Fix sysadmin csv download as unicode
2017-06-26 06:41:39 -07:00
Brian Mesick
f9216656fc Merge pull request #15393 from edx/bmedx/django_1.11_upgrade_mock_django_PLAT_1494
Remove mock-django dependency
2017-06-23 16:36:50 -04: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
Brittney Exline
cc460bbb0d Merge pull request #15391 from edx/bexline/ent_authentication_flow
ENT-447 Add ability to hide auth warnings for enterprise context.
2017-06-23 15:55:03 -04:00
Brittney Exline
611af39d53 ENT-447 Add ability to hide auth warnings for enterprise context.
When a user comes in through an sso provider and arrives at the login
or registration page, there is a warning message that comes up to indicate
that the user has to take an action to sign in and register and thus
link their sso account to their edx account. However, it is confusing,
particularly for the enterpise context. This diff disables these messages
from being rendered if these pages are being shown in an enterprise context.
2017-06-23 14:03:53 -04:00
Harry Rein
aea407b13e Merge pull request #15355 from edx/HarryRein/LEARNER-1485-course-reviews-tool
LEARNER-1485: Adding a reviews page and link from the course tool bar
2017-06-23 13:09:13 -04:00
Marko Jevtic
75531b2fef [LEARNER-437] Reflect discount on the Program About Page (WL) 2017-06-23 17:34:06 +02: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
Marko Jevtic
d48100d386 [LEARNER-1367] Move Program Marketing page from private themes repo to edx platform repo
[LEARNER-311] Enable a purchase button on the Program page - platform (WL)
2017-06-23 16:27:37 +02:00
bmedx
41def5c938 Remove mock-django dependency
- PLAT-1494 since mock-django only seems to support up to Django 1.9a1, and is only used in one file we're opting to try to simplify and remove the dependency.
2017-06-23 09:22:11 -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
Matthew Piatetsky
72fb972288 Merge pull request #15358 from edx/LEARNER-1312b
LEARNER-1312 Track Selection Choice (v2)
2017-06-22 17:17:20 -04:00
Matthew Piatetsky
5c7e67e919 Create test for new version of track selection page
LEARNER-1312
2017-06-22 16:28:00 -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