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

53520 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tyler Hallada
04279bf5af Refer to new sfe file names in templates 2018-03-27 15:17:58 -04:00
Douglas Hall
ea18712fa9 Merge pull request #17802 from edx/douglashall/ENT-823 
Upgrade edx-enterprise to 0.67.0.
 2018-03-27 13:41:35 -04:00
Eric Fischer
022001e53d EDUCATOR-2584 2018-03-27 12:42:00 -04:00
Michael Youngstrom
dc5b75800d Merge pull request #17793 from edx/testeng/bokchoy_auto_cache_update_6c414680e89989ff8a53693971d2066bd3e00c8b 
Bokchoy db cache update
 2018-03-27 12:40:54 -04:00
Douglas Hall
5c1ab83c29 Upgrade edx-enterprise to 0.67.0. 
https://github.com/edx/edx-enterprise/compare/0.66.1...0.67.0
 2018-03-27 12:21:55 -04:00
edx-cache-uploader-bot
7f92409804 Updating migrations 2018-03-27 11:49:05 -04:00
hamzamunir7300
e30e12e83d Merge pull request #17797 from edx/LEARNER-4766 
Footer Chinese Language Dupluication Issue
 2018-03-27 19:34:03 +05:00
Hamza Munir
90f674e358 Footer Chinese Language Dupluication Issue 
Removed the duplicate footer ICP LICENSE.

LEARNER-4766
 2018-03-27 19:19:37 +05:00
Bill Filler
a77d7cad4f Merge pull request #17799 from edx/bfiller/bump-ora2-version 
bump version of ora2 to 2.1.13
 2018-03-27 10:18:28 -04:00
Bill Filler
1657697903 bump version of ora2 to 2.1.13 2018-03-27 10:08:56 -04:00
Noraiz Anwar
0d4c2707d0 Merge pull request #17780 from edx/noraiz/EDUCATOR-2546 
use library summary to fetch metadata
 2018-03-27 18:26:04 +05:00
Ahsan Ul Haq
952906ab35 Merge pull request #17781 from edx/ahsan/LEARNER-4520-pdf-cert-not-generate-discovery 
Discovery for pdf cert generation
 2018-03-27 18:00:07 +05:00
Ahsan Ul Haq
b8a7952762 Merge pull request #17633 from edx/ahsan/LEARNER-3552-Limit-LoginWithAccessTokenView-endpoint 
update LoginWithAccessTokenView to only support DOT type accesstoken
 2018-03-27 17:00:35 +05:00
Ahsan Ulhaq
ea9a679c27 small nit 2018-03-27 16:59:07 +05:00
noraiz-anwar
f18e0b881c use library summary to fetch metadata 2018-03-27 15:57:14 +05:00
Ahsan Ulhaq
7428b2fe94 Discovery for pdf cert generation 
LEARNER-4520
 2018-03-27 15:23:46 +05:00
Awais Jibran
16fda2322d Use get or create rather than create 2018-03-27 14:31:01 +05:00
Nimisha Asthagiri
e5b9452e76 Merge pull request #17385 from mitodl/hack18_instructor_django_plugin 
Changed 'instructor' django app to follow plugin pattern
 2018-03-26 15:20:47 -06:00
Michael Youngstrom
f3672ba215 Merge pull request #17792 from edx/revert-17697-vkaracic/watch_sass 
Revert Watch assets on specific system
 2018-03-26 17:20:00 -04:00
Michael Youngstrom
d4d9a113c1 Revert "Watch assets on specific system." 2018-03-26 16:07:54 -04:00
Michael Youngstrom
5b9b01b04d Merge pull request #17789 from edx/testeng/bokchoy_auto_cache_update_6cbfa1e7607b38f53e3f4ddb58d308850860d22c 
Bokchoy db cache update
 2018-03-26 16:06:35 -04:00
Alex Dusenbery
fb7efb7338 EDUCATOR-2582 | Inspect waffle switch model to find completion tracking date start. 2018-03-26 15:58:28 -04:00
Brittney Exline
1b4ac84141 Merge pull request #17788 from edx/bexline/verify_student_cleanup 
ENT-934 Remove deprecated models in verify_student
 2018-03-26 13:51:35 -06:00
Feanil Patel
4321acd2c0 Merge pull request #17784 from edx/feanil/update_newrelic_agent 
Update newrelic agent.
 2018-03-26 15:39:52 -04:00
edx-cache-uploader-bot
0dbaffa405 Updating migrations 2018-03-26 15:08:41 -04:00
Brian Beggs
6b9f52b224 Merge pull request #17697 from vkaracic/vkaracic/watch_sass 
Watch assets on specific system.
 2018-03-26 15:02:21 -04:00
Troy Sankey
fe9990608d Merge pull request #17782 from edx/pwnage101/improve-old-banner-appearance 
move global status messages to the user notificatio area
 2018-03-26 14:58:54 -04:00
Brittney Exline
956b627501 ENT-934 Remove deprecated models in verify_student 
These models say they are to be fully removed in Hawthorn, so let's make it happen!
 2018-03-26 14:48:34 -04:00
Michael LoTurco
a3fdf8827d Merge pull request #17785 from edx/MLoTurco/learner-3925-support-link 
Adds entitlement tool to support tool home
 2018-03-26 13:44:43 -04:00
Michael LoTurco
537b6652c2 adds entitlment tool to support tool home 2018-03-26 12:53:22 -04:00
Feanil Patel
dec7f2413a Update newrelic agent. 
Move to the latest minor version of the NR plugin because 3.x removes some deprecated functions.
 2018-03-26 12:15:23 -04:00
Troy Sankey
b1ce012a94 move global status messages from the header to the user notification area 2018-03-26 12:06:29 -04:00
Eric Fischer
b35d227cc3 Merge pull request #17760 from edx/efischer/EDU-499 
Remove PRUNE_OLD_VERSIONS waffle flag
 2018-03-26 11:59:31 -04:00
Michael Youngstrom
1ca1838ce8 Merge pull request #17455 from edx/estute/jenkins-ff-57-b 
Support firefox 59 upgrade for CI and local testing
 2018-03-26 11:50:56 -04:00
Joseph Mulloy
ed499d823e Merge pull request #17775 from edx/jdmulloy/ops2943/disable_enrollment_admin 
Disable course enrollments admin page OPS-2943
 2018-03-26 11:40:56 -04:00
Joseph Mulloy
e8d95c1c73 Disable course enrollments admin page OPS-2943 2018-03-26 11:40:16 -04:00
Alex Dusenbery
12c7168842 Bump edx-completion to 0.1.1 2018-03-26 11:39:31 -04:00
Gavin Sidebottom
7626d4abf0 Changed 'instructor' django app to follow plugin pattern 2018-03-26 10:44:41 -04:00
Stuart Young
6544b659ce Changes needed to bump to ff59 2018-03-26 09:58:28 -04:00
Michael Youngstrom
05d006ea05 Merge pull request #17779 from edx/youngstrom/remove-a11y-test 
Remove test_video_player_a11y test
 2018-03-26 09:48:02 -04:00
Anthony Mangano
b5cc114d03 Merge pull request #17759 from edx/refactor-xsslint-rules 
Define xss-linter rules on linter classes
 2018-03-26 09:35:03 -04:00
Albert (AJ) St. Aubin
7c6c2a1664 Merge pull request #16757 from appsembler/omar/search-for-courses-api 
Add search for courses API to allow building a mobile native search view
 2018-03-26 07:31:36 -04:00
Michael Youngstrom
afb7673b97 Remove a11y test 2018-03-25 21:53:03 -04:00
Mike
0e2b667bb4 Added ability to change header and content of static pages in two ways. 
1. Using the pageheader and pagecontent block names.
2. Setting SiteConfiguration settings for each individual html page.

Co-authored by: Tomasz Gargas <tomasz@opencraft.com>
 2018-03-24 21:37:09 +01:00
Michael LoTurco
4c2eab4100 Merge pull request #17756 from edx/MLoTurco/learner-3925-div-form 
add entitlement creation and reissue to support
 2018-03-23 18:26:18 -04:00
Michael Youngstrom
6313a6e82b Merge pull request #17763 from edx/youngstrom/remove-failing-ff-59-tests 
Remove tests that are flaky with firefox 59
 2018-03-23 17:32:11 -04:00
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
Alex Dusenbery
10be8bcd4e add entitlement support creation and reissue 
Learner-3925
 2018-03-23 17:10:46 -04:00
Anthony Mangano
edc98939b5 Define XSS-linter rules on Linter classes. 2018-03-23 16:58:27 -04:00
Michael Youngstrom
d4afacb9b2 Remove test_bad_import 2018-03-23 16:40:04 -04:00