Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

22621 Commits

Author SHA1 Message Date
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
Qubad786
f064e991bf duplicate video id in basic tab 2017-03-07 15:33:33 +05:00
Ahsan Ulhaq
8688edaf4f Merge pull request #14595 from edx/ahsan/ECOM-7312-lms-user-menu-dropdown-a11y-issues 
LMS user menu dropdown a11y issues
 2017-03-07 15:12:05 +05:00
Eric Fischer
50371ee59a Allow masquerade on progress page 2017-03-06 16:53:26 -05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
Brittney Exline
57fd280b00 Merge pull request #14563 from edx/bexline/sf_oauth 
ENT-191 Adding new edx-enterprise packages to be optionally installed
 2017-03-06 10:07:44 -05:00
Eric Fischer
83f2be4929 Merge pull request #14588 from edx/efischer/kill_stuff 
Kill edx-reverification-block
 2017-03-06 09:29:36 -05:00
Michael Youngstrom
01ed17426f Merge pull request #14628 from edx/michaelyoungstrom/revert_django_setting 
[WIP] Revert Django renderer change
 2017-03-03 17:37:41 -05:00
Michael Youngstrom
fa74e0bf19 Revert Django renderer change 
Force run on PR

Remove force run on PR
 2017-03-03 17:34:02 -05:00
Brandon DeRosier
20ae9948d1 Merge pull request #14610 from open-craft/bdero/fix-enterprise-api-url 
Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set
 2017-03-03 14:30:10 -05:00
Brian Jacobel
b9abeab7d5 Cheat around a Bourbon depr warning by using a private mixin 2017-03-03 14:15:16 -05:00
Brian Jacobel
0ad9a020f5 Remove use of the bourbon box-sizing mixin 2017-03-03 13:37:45 -05:00
alisan617
190501b873 Merge pull request #14609 from edx/alisan/site-status-PL 
platform site status message bar styling clean up
 2017-03-03 12:02:27 -05:00
Douglas Hall
d70101a256 Merge pull request #14499 from edx/hasnain-naveed/WL-766/front-end 
WL-766 Program marketing page view
 2017-03-03 11:47:36 -05:00
Brian Jacobel
f3bce3ee20 Merge pull request #13903 from proversity-org/proversity/feature-cookie-consent 
add cookie consent feature flag and popup banner
 2017-03-03 11:16:16 -05:00
alisan617
7802e518d3 remove white error img replace with FA icon 2017-03-03 09:50:54 -05:00
mikedikan
dca22ff229 Merge pull request #14613 from edx/mdikan/remove-deprecated-references-to-apiconfig 
Remove deprecated references to ProgramsApiConfig model
 2017-03-03 07:42:21 -05:00
Ned Batchelder
65febd6122 Merge pull request #14618 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-03-03 06:28:24 -05:00
Ahsan Ulhaq
2d1bb9bf7f Hidden html sontent on the dashboard are rendered 
ECOM-6977
 2017-03-03 13:17:31 +05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00
Hasnain
d6d2b2d50f Add program marketing view 
This change adds the URL configuration and Django view required
to implement a program marketing page. It is left to theme builders
to implement a template that fulfills their own UX requirements.

WL-766
 2017-03-02 14:38:01 -05:00
Ned Batchelder
6c44eee00e Update translations (autogenerated message) 2017-03-02 19:25:59 +00:00
Umar Nawaz
b23854244d Merge pull request #14604 from edx/unawaz/ECOM-6902-a11y-footer-links 
a11y footer links to ul
 2017-03-02 10:30:50 -08:00
Nimisha Asthagiri
952143b776 Block Structure Storage management command 
TNL-6524
 2017-03-02 12:07:26 -05:00
umar-nawaz
cee0eb8779 a11y footer links to ul 2017-03-02 15:28:22 +05:00
Brittney Exline
0cdce8ed71 ENT-191 Adding new edx-enterprise packages to be optionally installed 
We introduced two more apps in edx-enterprise that need to be pulled in.
 2017-03-02 06:10:53 +00:00
Nimisha Asthagiri
00d466224e Consolidate Block Structure folders 
TNL-6518
 2017-03-01 21:19:28 -05:00
Brandon DeRosier
48fe4ad10b Keep default ENTERPRISE_API_URL if LMS_ROOT_URL not set 2017-03-01 15:48:25 -05:00
Sanford Student
576516b599 ensure that modified start/end are treated as UTC by django 2017-03-01 15:15:17 -05:00
Eric Fischer
7b85c0ea00 Remove in-course reverification 
This is unused, and will no longer be supported on edx.org. Also adds a
DeprecatedModel utility class.

TNL-6126
 2017-03-01 10:46:29 -05:00
Nimisha Asthagiri
090fc12b5a Merge pull request #14512 from edx/beryl/cbs_waffled_manager 
Storage-backed Versioned Block Structures: Manager and Store
 2017-03-01 10:26:56 -05:00
Ahsan Ulhaq
c3d7712986 LMS user menu dropdown a11y issues 
ECOM-7312
 2017-03-01 16:03:50 +05:00
Andy Armstrong
f6876ce199 Merge pull request #13937 from edx/andya/use-ui-blocks 
[WIP] Use web fragments for discussion and static tabs
 2017-03-01 00:36:48 -05:00
Nimisha Asthagiri
02c24cb259 Block Structure query count and API changes 2017-02-28 23:54:57 -05:00
Nimisha Asthagiri
1ee2c27f49 Storage-backed versioned Block Structures: Manager and Store 2017-02-28 23:54:57 -05:00
Nimisha Asthagiri
77a29242e3 Merge pull request #14571 from edx/beryl/cbs_models 
Storage-backed versioned Block Structures: Models
 2017-02-28 23:50:21 -05:00
Andy Armstrong
248558f1d4 Render Discussion tab using web fragments 2017-02-28 23:39:39 -05:00
George Song
5e21f64c2c Merge pull request #14585 from vagupta16/fix-course-about-invalid-course-id-upstream 
Ensure that course_about uses a valid course ID
 2017-02-28 09:32:16 -08:00
David Ormsbee
39fc6ce1f5 Merge pull request #14586 from edx/ormsbee/test_bulk_ops_1 
Move more tests to use bulk_operations
 2017-02-28 09:42:50 -05:00
Eric Fischer
715076a48b Cleaner grades exception handling 2017-02-27 13:53:31 -05:00
Jeremy Bowman
c8f7587f6b Merge pull request #14552 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-02-27 12:01:06 -05:00
Jesse Shapiro
c6e6c8727d Merge pull request #14556 from open-craft/haikuginger/fix-enterprise-enrollment-api-url 
[ENT-208] Update AWS ENTERPRISE_ENROLLMENT_API_URL variable
 2017-02-27 10:41:44 -05:00
Nimisha Asthagiri
2f3b0b4cc8 Storage-backed versioned Block Structures: Settings 2017-02-27 00:39:22 -05:00
cahrens
8fedc08c2a Support web fragments for tabs. 2017-02-24 17:55:32 -05:00
David Ormsbee
d439da4418 Merge pull request #14583 from edx/ormsbee/remove_dealer_git_for_lms 
Remove dealer.git use for LMS.
 2017-02-24 17:37:43 -05:00
Brandon DeRosier
36b0068bd1 Merge pull request #14542 from open-craft/bdero/ent-162 
ENT-162 Create an EnterpriseCourseEnrollment during the enrollment flow
 2017-02-24 16:24:19 -05:00
David Ormsbee
ca1f76cedb Move more tests to use bulk_operations. 2017-02-24 15:21:45 -05:00
Varun Gupta
c235ad70bd ensure that course_about uses a valid course ID 2017-02-24 11:17:16 -08:00
David Ormsbee
4dc087ae69 Remove dealer.git use for LMS. 
We use the dealer.git library to determine the current revision of
edx-platform at startup time and store that as EDX_PLATFORM_REVISION in
our settings. This can take a surprisingly long time and involve a lot
of disk IO to initialize.

Studio still needs this functionality because it determines its static
asset folder based partly on the hash. This is horrible, because it
means all static assets are invalidated on every release instead of
just the ones that change. But that will be the subject of a different
PR.
 2017-02-24 11:16:11 -05:00