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

45341 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
00ccc879bd Remove flaky lti scenario. 2018-03-08 11:24:33 -05:00
Michael LoTurco
335bf4b035 Merge pull request #17575 from edx/MLoTurco/learner-3925-feature-utils 
Add utils for EntitlementSupportApp
 2018-03-07 10:37:10 -05:00
Simon Chen
46956b99e6 Merge pull request #16671 from proversity-org/proversity/edx-pr-customize-course-info-title 
Customize course info title
 2018-03-07 09:31:40 -05:00
Feanil Patel
9cd770a3d4 Merge pull request #17624 from edx/feanil/update_django_1.8 
Update to take new security fix.
 2018-03-07 09:10:50 -05:00
Brian Mesick
9eda60a5c2 Merge pull request #17521 from edx/bmedx/test_user_create_mgmt 
Add tests for create_user / create_random_users management commands
 2018-03-07 09:09:22 -05:00
Jose Antonio Gonzalez
99f6d78def customize course info title 2018-03-07 10:12:08 +02:00
Michael LoTurco
a4f294b441 Add convenience functions for Entitlement Support Tool 
Adds getter for ecommerce order dashboard url and for getting
the entitlement support details reasons.

Learner-3925
 2018-03-06 17:49:08 -05:00
Ari Rizzitano
60ed509684 Merge pull request #17557 from edx/ari/no-textbooks-interop 
convert textbooks page to webpack
 2018-03-06 17:28:31 -05:00
bmedx
7dc2e75778 Add tests for create_user / create_random_users management commands 2018-03-06 17:04:39 -05:00
Ari Rizzitano
c5b199a1a2 fix linting errors and un-vendor backbone-associations 
remove erroneous asset_index listing

remove indirect define

remove pageFactoryArguments index

max length seems excessive for this file

lintfix

un-vendor backbone associations
 2018-03-06 15:35:47 -05:00
Calen Pennington
970bc6a50d Move the context course and sock into require_page compatible forms 2018-03-06 15:35:46 -05:00
Ari Rizzitano
6998b311fe fix page_bundle 2018-03-06 15:35:46 -05:00
Calen Pennington
52e7af4148 Move pattern-replacement file lists into a separate file 
Move pattern-replacement file lists into a separate file

punt the react stuff for now
 2018-03-06 15:35:23 -05:00
Calen Pennington
c8e1e14479 Fix all text!*.underscore import issues in webpack 2018-03-06 15:35:23 -05:00
Rabia Iftikhar
3be942bf8f upgrade backbone-associations, fix tests 
Merge pull request #17559 from edx/ri/EDUCATOR-2231-remove-enrollment-dates-references

EDUCATOR-2231 remove course run enrollment dates references from studio

add NoTextbooks component

make backbone-associations work

webpackify context course

test fixup
 2018-03-06 15:30:56 -05:00
Eric Fischer
5d0d37112a Merge pull request #17593 from edx/efischer/clean_git_checkout 
Fail js tests if dirty package-lock
 2018-03-06 14:50:38 -05:00
Michael LoTurco
229d3b81cb Merge pull request #17627 from edx/MLoTurco/learner-3925-model-tweak 
Remove reference to reason field, add action field
 2018-03-06 14:32:06 -05:00
Michael LoTurco
d6f910d5da Remove reference to reason field, add action field 
As work progressed on entitlement support tool,
additional clarity around the entitlement support
detail fields was needed, this adds the action field
at a later point the reason field will be removed

Learner-3925
 2018-03-06 13:35:17 -05:00
Sofiya Semenova
2e0ee010c5 Merge pull request #17555 from edx/sofiya/course-outline 
Auto-open first unit in course outline if user has no completion data
 2018-03-06 12:02:57 -05:00
Eric Fischer
383d67f879 Fail js tests if dirty package-lock 2018-03-06 11:45:26 -05:00
Sofiya Semenova
774fe73ca9 Auto-open first unit in course outline if user has no completion data 2018-03-06 10:52:22 -05:00
Feanil Patel
a6cec7779c Update to take new security fix. 2018-03-06 09:59:39 -05:00
Mushtaq Ali
14e462e966 Merge pull request #17488 from edx/mushtaq/export-transcripts 
Export video transcripts
 2018-03-06 18:03:06 +05:00
Mushtaq Ali
ff175923e6 VAL version bump 2018-03-06 15:26:29 +05:00
Mushtaq Ali
36483f938d Export video transcripts - EDUCATOR-1789 2018-03-06 15:25:46 +05:00
Alessandro Roux
89d8e7b539 Merge pull request #17619 from edx/five-hundos-on-stage 
Fix 500 error in the LMS student dashboard
 2018-03-05 16:26:28 -05:00
Ned Batchelder
6bbb68ee1c Merge pull request #17370 from mitodl/pdpinch/tensor-variables 
Allow primes and tensor notation in variable names
 2018-03-05 15:32:48 -05:00
sandroroux
22b7da39b6 Add resume buttons to the edx.org dashboard. 2018-03-05 15:14:50 -05:00
Douglas Hall
1ee7966df7 Merge pull request #17615 from edx/douglashall/upgrade_enterprise_0_66_0 
Upgrade edx-enterprise to 0.66.0.
 2018-03-05 15:12:50 -05:00
edX Transifex Bot
d5f410b45d Update translations 2018-03-05 14:43:34 -05:00
Douglas Hall
8adcc431a5 Upgrade edx-enterprise to 0.66.0. 
https://github.com/edx/edx-enterprise/compare/0.65.7...0.66.0
 2018-03-05 12:20:07 -05:00
Rabia Iftikhar
a28d87ea7d Merge pull request #17559 from edx/ri/EDUCATOR-2231-remove-enrollment-dates-references 
EDUCATOR-2231 remove course run enrollment dates references from studio
 2018-03-05 17:20:44 +05:00
rabia23
f65195c0ed EDUCATOR-2231 remove course run enrollment dates references from studio 2018-03-05 11:27:22 +00:00
edX Transifex Bot
917d325e5f Update translations 2018-03-04 16:38:33 -05:00
Alessandro Roux
fd48e3848e Merge pull request #17418 from edx/resume-button-on-dashboard 
EDUCATOR 2190: Course card resume buttons on the student dashboard.
 2018-03-02 15:59:41 -05:00
sandroroux
3f22ce3031 These changes add a resume button to course cards on the student dashboard. 2018-03-02 14:52:30 -05:00
Dennis Jen
f49000ab53 Merge pull request #17609 from edx/dsjen/bump-sfe 
Bump SFE to 1.3.5 (increase file upload count)
 2018-03-02 13:36:35 -05:00
McKenzie Welter
35cf22bd12 Merge pull request #17606 from Dillon-Dumesnil/patch-1 
Update base.txt
 2018-03-02 12:00:01 -05:00
Anthony Mangano
fc4a1b0f45 Merge pull request #17600 from edx/xss-linter-configurable-skip-dirs-and-linters 
Configurable XSS-linter
 2018-03-02 10:39:50 -05:00
Dennis Jen
c183c0b994 Bump SFE to 1.3.5 (increase file upload count) 2018-03-02 10:26:34 -05:00
Jeremy Bowman
9beabad8c0 Merge pull request #17601 from edx/jmbowman/PLAT-1989 
PLAT-1989 Upgrade django-openid-auth for Django 1.11 fix
 2018-03-02 09:50:49 -05:00
Dillon-Dumesnil
a35eb2211c Update base.txt 2018-03-02 09:34:09 -05:00
Michael Terry
c9318c3e51 Convert learner_dashboard to es2015 2018-03-02 08:57:34 -05:00
Ahsan Ul Haq
acf7de7c02 Merge pull request #17604 from edx/ahsan/LEARNER-2945-financial-assisstance-max-length 
Update min length of financial assisstance
 2018-03-02 17:55:02 +05:00
Ahsan Ulhaq
3c450ce7d9 Update min length of financial assisstance 
LEARNER-2945
 2018-03-02 15:39:04 +05:00
Anthony Mangano
3e7df8688f Add config module for xsslint 2018-03-01 16:52:42 -05:00
Jeremy Bowman
3ae67af296 PLAT-1989 Upgrade django-openid-auth for Django 1.11 fix 2018-03-01 16:23:59 -05:00
Sofiya Semenova
a20b9f88c8 Merge pull request #17578 from edx/sofiya/course-outline-styling 
Course outline styling
 2018-03-01 15:30:39 -05:00
Tyler Hallada
c3ecc8b4bb Merge pull request #17562 from edx/thallada/EDUCATOR-2419 
EDUCATOR-2419 No upgrade deadline for professional courses
 2018-03-01 13:22:41 -05:00
Sofiya Semenova
8266c640d5 Course outline styling 2018-03-01 12:07:18 -05:00