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

45309 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Anthony Mangano
d815f5c6f5 Merge pull request #17448 from edx/refactor-xss-linter 
Refactor XSS Linter into smaller files
 2018-03-01 11:40:58 -05:00
edX Transifex Bot
481275c29d Update translations 2018-03-01 11:12:58 -05:00
Anthony Mangano
07ca440226 Refactor XSS linter into smaller files 2018-03-01 09:46:16 -05:00
Uzair Rasheed
50574ea914 Merge pull request #17591 from edx/LEARNER-4233/change-main-tags 
Replace main tag with div to compliance HTML5 standard
 2018-03-01 18:49:18 +05:00
Ayub khan
22b1d7375b Merge pull request #17590 from edx/update-translations 
updated-translations
 2018-03-01 17:59:03 +05:00
Tasawer Nawaz
1d41e14574 Merge pull request #17525 from edx/tasawer/learner-4068/make-oauth-authorization-page-responsive 
Fix css issues on oauth authorization page to make it responsive
 2018-03-01 17:58:15 +05:00
uzairr
1fff89b839 Replace main tag with div to compliance HTML5 standard 
Course outline page uses two main tags that violates modern
HTML5 standard that recommends only single main tag on a webpage.
To make it compliance with modern standard the enclosing main tag
is replaced with div which will improve accessibility.

LEARNER-4233
 2018-03-01 17:37:04 +05:00
ayub-khan
ea07b7de62 updated-translations 2018-03-01 16:46:29 +05:00
Noraiz Anwar
735158ac8c Merge pull request #17570 from edx/noraiz/EDUCATOR-2314-release 
update edx-proctoring package
 2018-03-01 11:47:33 +05:00
Jeremy Bowman
2bb4e51eba Merge pull request #17561 from edx/jmbowman/PLAT-1976 
PLAT-1976 Add waffle switch to block auth_user write attempts
 2018-02-28 17:16:56 -05:00
John Eskew
a7c09be6f0 Merge pull request #17369 from mitodl/pdpinch/less-escaping-of-errors 
Reduce escaping on sandbox errors returned to learners
 2018-02-28 17:13:25 -05:00
Ned Batchelder
0725e77674 Merge pull request #17372 from mitodl/pdpinch/catch-mismated-parens 
Add mismatched parenthesis detection to formula parsing
 2018-02-28 16:16:11 -05:00
noraiz-anwar
0e3af804ec update edx-proctoring package 2018-03-01 01:42:45 +05:00
Jeremy Bowman
b3ac2b1b06 PLAT-1976 Add waffle switch to block auth_user write attempts 2018-02-28 13:13:06 -05:00
Albert (AJ) St. Aubin
312f5a4489 Merge pull request #17577 from edx/aj/LEARNER-4228_bug 
Return expected Dict when Discovery API fails or returns nothing
 2018-02-28 13:11:03 -05:00
Diana Huang
d1a8813eb2 Merge pull request #17551 from edx/diana/remove-duplicate-check 
LEARNER-4100: Assume the cookie is set and don't try to get it again.
 2018-02-28 12:57:43 -05:00
Calen Pennington
49790d2dd3 Merge pull request #17576 from edx/revert-17565-re-add-asset-index-changes 
Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…"
 2018-02-28 12:09:18 -05:00
Farhanah Sheets
d088e584e1 Merge pull request #17546 from edx/mroytman/bok-choy-sfe-assets 
Bok Choy tests for studio-frontend assets page
 2018-02-28 12:03:09 -05:00
Albert St. Aubin
5d32a5c824 Return expected Dict when Discovery API fails or returns nothing 2018-02-28 11:15:14 -05:00
Diana Huang
fe11412a29 Assume the cookie is set and don't try to get it again. 2018-02-28 11:06:48 -05:00
Calen Pennington
c45de5c32b Revert "Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…" 2018-02-28 11:06:39 -05:00
Michael Roytman
90bcd273a0 add ConfigurationModelFixture for Studio Frontend Assets Page and add Bok Choy tests for Studio Frontend Assets Page 2018-02-28 10:48:27 -05:00
Alex Dusenbery
8bcdcc522e EDUCATOR-1290 | Make sure we have a key with a course id in it before library content logging call. 2018-02-28 09:49:25 -05:00
David Ormsbee
f5a4ad20aa Merge pull request #17451 from mitodl/fix_outline_aq_course_structure_api 
Fixed edX block structure api to load override data
 2018-02-28 09:39:09 -05:00
Peter Pinch
ed90c80cca catch mismatched parens 2018-02-27 23:20:57 -05:00
Calen Pennington
7f6c101284 Merge pull request #17565 from edx/re-add-asset-index-changes 
Revert "Revert "Merge pull request #17325 from cpennington/switch-ass…
 2018-02-27 21:28:02 -05:00
Tyler Hallada
8fb26258e4 Add a regression test 2018-02-27 16:25:41 -05:00
Calen Pennington
b1c9ad175d Revert "Revert "Merge pull request #17325 from cpennington/switch-asset-index-factory-to-webpack"" 
This reverts commit 67177ac72d.

The original PR cause a breakage on production due to webpack building two different
copies of the asset_index.js bundle. However, it is unclear whether that was a
transitory issue or not. This commit restores the original PR to validate whether
the problem is reproducible.
 2018-02-27 16:18:27 -05:00
Dennis Jen
6da648899f Merge pull request #17530 from edx/dsjen/assets-search-waffle 
Added waffle switch for files & uploads search UI
 2018-02-27 14:56:10 -05:00
Tyler Hallada
c5cbbdf72e No dynamic_upgrade_deadline in prof. courses 2018-02-27 14:30:04 -05:00
Sofiya Semenova
8acd6d5eec Merge pull request #17554 from edx/sofiya/2095-3 
Check that a user enrollment exists in the course outline
 2018-02-27 13:10:20 -05:00