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

45498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Troy Sankey
fdab6a352e Merge pull request #17769 from edx/pwnage101/fix-maintenance-banner 
add missing maintenance banner settings
 2018-03-23 17:26:58 -04:00
Troy Sankey
9f30a75a08 add missing maintenance banner settings 2018-03-23 16:34:47 -04:00
Ned Batchelder
187e39ff54 Merge pull request #17771 from edx/nedbat/use-fixed-find-packages-packages 
Use updated packages to avoid installing unwanted stuff
 2018-03-23 15:56:16 -04:00
McKenzie Welter
5ac792425e Merge pull request #17767 from edx/McKenzieW/serialize-support-detail-creation-datetime 
Include created datetime in entitlement support detail serializer
 2018-03-23 13:57:54 -04:00
Douglas Hall
b1f05ba0d5 Merge pull request #17768 from edx/douglashall/ENT-916 
Upgrading edx-enterprise to 0.66.1.
 2018-03-23 13:42:10 -04:00
Ned Batchelder
727573486f Use updated packages to avoid installing unwanted stuff 2018-03-23 13:00:13 -04:00
Douglas Hall
6b93f3212d Upgrading edx-enterprise to 0.66.1. 
https://github.com/edx/edx-enterprise/compare/0.66.0...0.66.1
 2018-03-23 11:21:44 -04:00
Eric Fischer
97151ae4f4 Merge pull request #17761 from edx/efischer/EDUCATOR-2456 
Delete some unused settings
 2018-03-23 11:21:12 -04:00
McKenzie Welter
a6ac6781c3 include created datetime in entitlement support detail serializer 2018-03-23 11:19:38 -04:00
McKenzie Welter
fa90d6e651 Merge pull request #17640 from edx/McKenzieW/learner-4400 
Move support actions to existing entitlement api
 2018-03-23 10:37:52 -04:00
Eric Fischer
2b9ee25618 Clean up unused settings 
Initially introduced here:
  e0aa8cf78a (diff-8a23909bc8d201fba8525b1dd6396247)

Rendered irrelevant here:
  ece0ea00e9
 2018-03-23 10:26:16 -04:00
hamzamunir7300
e9d6c8537c Merge pull request #16395 from edx/footer-design-non-bootstrap 
Footer Design Implementation without using bootstrap WIP
 2018-03-23 08:35:49 +05:00
Michael Youngstrom
32b845695c Merge pull request #17757 from edx/youngstrom/remove-failing-ff-59-tests 
Remove tests that fail on firefox 59
 2018-03-22 22:25:57 -04:00
Michael Youngstrom
aad9acfb35 Remove test_task_list 2018-03-22 20:14:44 -04:00
Hamza Munir
a69ecd83d5 Footer Design Implementation without using bootstrap WIP 
The New footer design implementation without using bootstrap. Using flexbox
creating new classes to assign different widths in different screen breakpoints.

LEARNER-2312
 2018-03-23 02:37:59 +05:00
Stuart Young
7fdf16566b remove test_enroll_unregister_student 2018-03-22 15:15:48 -05:00
Stuart Young
9b005ca508 remove test_video_end_time_wo_default_start_time 2018-03-22 15:14:49 -05:00
Michael Youngstrom
94a556200d Remove test_country_field 2018-03-22 16:13:55 -04:00
Michael Youngstrom
2059bfa5c9 Remove test_course_updated_with_entrance_exam 2018-03-22 16:13:09 -04:00
McKenzie Welter
e5d1f04a89 move support actions to existing entitlement api 2018-03-22 16:11:46 -04:00
Stuart Young
6776974236 remove test_register_success 2018-03-22 15:11:04 -05:00
Stuart Young
fa7952dfe5 remove test_third_party_register 2018-03-22 15:09:36 -05:00
Michael Youngstrom
73324d8601 remove test_archived_course 2018-03-22 16:08:38 -04:00
Michael Youngstrom
5314b93b87 Remove test_create_library test 2018-03-22 16:07:46 -04:00
Stuart Young
973d277417 remove test_language_field 2018-03-22 15:06:05 -05:00
Rabia Iftikhar
32863e4463 Merge pull request #17730 from edx/ri/EDUCATOR-2428-certificate-delivered-column 
EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report
 2018-03-23 00:26:44 +05:00
Michael Youngstrom
35a5453dbb Remove test_login_redirect 2018-03-22 14:22:52 -04:00
Michael Youngstrom
ccaf6557a2 Remove test_if_captions_are_draggable 2018-03-22 14:10:53 -04:00
Michael Youngstrom
6aea5e1c88 Remove test_locked_sections_do_not_appear_in_lms 2018-03-22 14:04:37 -04:00
Alex Dusenbery
f9fbb0ae58 Revert "EDUCATOR-2540 | Bump edx-completion to 0.1.0" 
This reverts commit 20647b57fb.
 2018-03-22 13:27:14 -04:00
Albert (AJ) St. Aubin
273ec926d3 Merge pull request #17744 from edx/aj/LEARNER-4494 
Updating the default long term expiration to be 730 days for entitlem…
 2018-03-22 11:57:02 -04:00
J. Cliff Dyer
f3be0ad775 Send all update_aggregators task to LMS. 2018-03-22 10:41:43 -04:00
Alex Dusenbery
a996822094 Revert "Revert "Track viewing of individual blocks."" 
This reverts commit e2675f57b5f747b6a9e21067c75911fbd0341943.
 2018-03-22 10:37:40 -04:00
Bill Filler
305bd7dd4b Merge pull request #17650 from edx/ibrahimahmed443/WL-1473-add-fields-instructor-dashboard 
Ibrahimahmed443/wl 1473 add fields instructor dashboard
 2018-03-22 09:56:43 -04:00
Matthew Piatetsky
cf937bb893 Merge pull request #17747 from edx/REV-19 
Control refund message with optimizely flag
 2018-03-22 09:22:12 -04:00
Matthew Piatetsky
60fb4aa277 Control refund message with optimizely flag 2018-03-21 17:19:46 -04:00
Albert St. Aubin
7010eff423 Adding migration to update the expiration_period default 2018-03-21 17:09:03 -04:00
Albert (AJ) St. Aubin
9ac87b5ea3 Merge pull request #17741 from edx/aj/increase_enrollments_throttle 
LEARNER-4676: Increase the Throttle on the enrollments API to allow ecommerce to re…
 2018-03-21 16:22:47 -04:00
Albert St. Aubin
eeb97318b6 Updated tests to use new 24 months 2018-03-21 15:57:15 -04:00
Albert St. Aubin
7a02324bf1 Updating the default long term expiration to be 730 days for entitlements 
[LEARNER-4494]
 2018-03-21 15:45:38 -04:00
Alex Dusenbery
20647b57fb EDUCATOR-2540 | Bump edx-completion to 0.1.0 2018-03-21 15:17:58 -04:00
Albert St. Aubin
f2ee173aae Increase the Throttle on the enrollments API to allow ecommerce to request more frequently 
[LEARNER-4676]
 2018-03-21 14:14:52 -04:00
rabiaiftikhar
0f63a2727e EDUCATOR-2428 add acceptance criteria for certificate delivered column in grade report 2018-03-21 21:31:07 +05:00
Michael Terry
a576d682ff Improve password complexity messaging 
Send password form instructions that include password complexity and
also send error messages back that include all parts of the
complexity instead of single parts at a time.

And clean up phrasing to be more consistent.
 2018-03-21 10:29:53 -04:00
Attiya Ishaque
795dda47d8 Merge pull request #17719 from edx/ai/EDUCATOR-2520-incorrect-message 
Fix incorrect message feedback in discussion feature.
 2018-03-21 17:24:22 +05:00
attiyaishaque
1bca5bab10 Fix incorrect message feedback in discussion feature. 2018-03-21 14:13:08 +05:00
Troy Sankey
fdf8f0da46 Merge pull request #17735 from edx/pwnage101/maintenance-banner 
maintenance banner for 1.11 migration
 2018-03-20 19:00:18 -04:00
Tyler Hallada
2948fe8798 Merge pull request #17737 from edx/thallada/upgrade-studio-frontend 
Upgrade studio-frontend to 1.6.1
 2018-03-20 18:19:13 -04:00
Troy Sankey
9afe485f44 add the maintenance banner to the student dashboard and course homepage 2018-03-20 17:55:31 -04:00
Troy Sankey
1773107db4 Maintenance banner functionality, including a new waffle switch and setting 
This adds the following new waffle switch (and namespace):

open_edx_util.display_maintenance_warning

and a new setting:

settings.MAINTENANCE_BANNER_TEXT

The provided view decorator allows developers to select which views
receive the static banner, and the banner can be globally toggled via
the waffle switch.  The text of the banner is determined by the setting,
which is currently not translated.
 2018-03-20 17:54:48 -04:00