Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
44,462 Commits 1 Branch 0 Tags
95e76dcafe945b62dc7bbaebde1a32434002464a
Commit Graph

44462 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Omar Khan
6fc4b38ea0 Disallow free verified course modes 
The verification workflow assumes that all verified courses will have a
price. Free verified course modes cause a 404 when the user attempts to
enroll or upgrade.
 2016-04-12 18:06:16 -07:00
Renzo Lucioni
173154d1ca Merge pull request #12087 from edx/rc/2016-04-12 
Release Candidate rc/2016-04-12
 2016-04-12 19:55:56 -04:00
Robert Raposa
a2c686cf6f Merge pull request #12122 from edx/robrap/linter-mako 
TNL-4324: Add check for strings that should be wrapped with HTML()
 2016-04-12 17:43:15 -04:00
Robert Raposa
70a64aee2b Fix code review comment 2016-04-12 16:34:00 -04:00
Matt Drayer
12661764c3 Merge pull request #12128 from edx/mattdrayer/revert-11319 
Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFind…
 2016-04-12 16:31:05 -04:00
Matt Drayer
40c5c47791 Revert "Remove ThemingAware storage mixins and ComprehensiveThemeFinder." 
This reverts commit 266f593d2d.
 2016-04-12 16:22:34 -04:00
Peter Fogg
56ca0e90f2 Merge pull request #12085 from edx/peter-fogg/improve-api-request-ui 
API request page improvements.
 2016-04-12 15:58:49 -04:00
John Eskew
bee0c52b36 Remove another XML course test. 2016-04-12 15:52:50 -04:00
Robert Raposa
b5a674d941 Fix parsing defect 2016-04-12 15:20:24 -04:00
Christina Roberts
5b52f3a8a8 Merge pull request #11636 from eduNEXT/Bound3R/rtl_support_static-pages 
rtl support static pages
 2016-04-12 14:58:18 -04:00
Ned Batchelder
537dd040c8 Merge pull request #12117 from edx/ned/fix-mako-encoding 
Fix encoding of Django-called Mako files to be safe
 2016-04-12 14:21:12 -04:00
Peter Fogg
0da55b0f0e Add the real terms of service to our API request page, and improve UI. 
ECOM-4024
 2016-04-12 14:05:31 -04:00
Bound3R
4ddcf31ad8 change css properties for mixins bi-aap in about template 
remove unnecessary parentheses

change css properties for mixins bi-aap in login/register page

change css properties for mixins bi-app in about course page

change css properties for mixins bi-app in the dashboard

change css properties for mixins bi-app in help template

change css properties for mixins bi-app in the home page

change css properties for mixins bi-app in jobs, press and media pages

remove the extra spaces
 2016-04-12 12:59:53 -05:00
John Eskew
37822ee99f Add XML_COURSE_DIRS back in. 2016-04-12 13:42:32 -04:00
Robert Raposa
f9ab191c33 Fix mako-wrap-html 
- Make mako-wrap-html fire when '<' found anywhere in unwrapped string
- Fix typo
- Fix quality errors
- Fix defect found when Python string broken over lines
 2016-04-12 13:06:11 -04:00
mrey
05bcbe6a2b Merge branch 'master' of github.com:edx/edx-platform 2016-04-12 18:06:07 +02:00
John Eskew
e892b552ba Remove non-existent import. 2016-04-12 11:54:23 -04:00
John Eskew
d1d449ee1d Remove comments that refer to XML courses. 2016-04-12 11:54:23 -04:00
John Eskew
dce920fa70 Fix PEP8 error 2016-04-12 11:53:51 -04:00
John Eskew
8a9845c26e Remove ModuleStoreEnum.Type.xml 2016-04-12 11:53:51 -04:00
John Eskew
91c94977d5 Unify usage of a single test mixed modulestore called: 
TEST_DATA_MIXED_MODULESTORE
Remove these test mixed modulestores:
TEST_DATA_MIXED_TOY_MODULESTORE
TEST_DATA_MIXED_CLOSED_MODULESTORE
TEST_DATA_MIXED_GRADED_MODULESTORE
 2016-04-12 11:53:51 -04:00
John Eskew
9cfe31a2f3 Remove unused xml_source_dirs from mixed modulestore config. 2016-04-12 11:53:50 -04:00
John Eskew
47fdc841c0 Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
415ef3616f Remove XML-backed course-specific test. 2016-04-12 11:53:50 -04:00
John Eskew
3fb437e533 Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
74eb70aa12 Fix toy course textbook test - use Mongo-backed test course. 2016-04-12 11:53:50 -04:00
John Eskew
20533de145 Skip test with static tabs - seems broken. 2016-04-12 11:53:50 -04:00
John Eskew
99ded6c7ee Import test course instead of using XML-backed course. 2016-04-12 11:53:50 -04:00
John Eskew
4221ca6f2a Use ToyCourseFactory instead of the XMLModuleStore-backed toy course. 2016-04-12 11:53:50 -04:00
John Eskew
9cc1d4f91d Remove include_xml option. 2016-04-12 11:53:00 -04:00
John Eskew
c4535afb3f Remove more XML modulestore test code. 2016-04-12 11:49:32 -04:00
John Eskew
f9a85c4471 Remove XML modulestore code - discovery work 2016-04-12 11:49:32 -04:00
Matt Drayer
9a362d9033 Merge pull request #12116 from edx/mattdrayer/rc2016-04-12/revert-theming 
Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"
 2016-04-12 10:55:04 -04:00
Robert Raposa
46c113ce60 Add check for strings that should be wrapped with HTML() 
Also include the following:
- new rule for strings that should be wrapped with HTML()
- allow expressions to use "| n, unicode"
- refactor string parsing into separate class
- switch end_index to be the index following the expression
 2016-04-12 10:48:33 -04:00
Diana Huang
16ac76d00b Merge pull request #12121 from edx/diana/revert-final-check 
Revert "Make it impossible to click "final check" without selecting a…
 2016-04-12 10:15:18 -04:00
Toby Lawrence
c26c52e6ba Merge pull request #12120 from edx/revert/contentserver-instrumentation 
Revert "[PERF-274] Add NewRelic instrumentation to contentserver."
 2016-04-12 10:12:41 -04:00
Diana Huang
fa61c04894 Revert "Make it impossible to click "final check" without selecting a choice" 
This reverts commit 4c83a2f0de.
 2016-04-12 10:11:15 -04:00
Toby Lawrence
95fde6d527 Revert "[PERF-274] Add NewRelic instrumentation to contentserver." 
This reverts commit 09586d8a37.
 2016-04-12 10:05:18 -04:00
Peter Fogg
7864ec1c2c Merge pull request #12109 from edx/peter-fogg/course-home-a11y-test 
Add a11y test for the course home page.
 2016-04-12 10:04:28 -04:00
Matt Drayer
392ee7d258 Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit a796b56314.

Conflicts:
	lms/envs/common.py
	openedx/core/djangoapps/theming/models.py
	pavelib/assets.py
	pavelib/paver_tests/test_assets.py
 2016-04-12 08:22:14 -04:00
Christina Roberts
bb06e57115 Merge pull request #12099 from edx/christina/fix-default-cohort 
Allow the "Default Group" to be renamed (automatic cohorting)
 2016-04-12 08:03:03 -04:00
Robert Raposa
ff2e6dc1fa Merge pull request #12082 from edx/robrap/linter-mako 
TNL-4324: Enhance linter for HTML() and Text()
 2016-04-11 16:11:43 -04:00
Simon Chen
498ab88794 Merge pull request #12044 from edx/schen/ECOM-3198 
ECOM-3198 Add banner image to the program listing program cards
 2016-04-11 16:00:03 -04:00
Christine Lytwynec
a14718bb92 Add pa11ycrawler command 2016-04-11 15:47:26 -04:00
Clinton Blackburn
8f25c81a85 Added AWS_S3_CUSTOM_DOMAIN 
This setting is necessary to avoid django-storages applying a security token to S3 URLs.

ECOM-4081
 2016-04-11 15:34:29 -04:00
Simon Chen
149412d2c3 ECOM-3198 Add banner image to the program listing program cards 2016-04-11 14:58:33 -04:00
Peter Fogg
beb3c19722 Add a11y test for the course home page. 2016-04-11 14:28:06 -04:00
Ned Batchelder
4f9f87c192 Fix encoding of Django-called Mako files to be safe 
The old code set the output-encoding to None, which means, I want
Unicode strings as output.  This made Mako pass markupsafe objects to
"unicode()", which applied all the escaping.  Then the result would be
given to Django, would would html-escape it again, resulting in
over-escaping.

By setting the output-encoding to utf8, we use filters.encode.utf8
instead, which is aware of Markupsafe, which avoids the over-escaping.
 2016-04-11 14:00:15 -04:00
Robert Raposa
96fe8afbde Enhance linter for HTML() and Text() 
- Add capability to run linter on file or directory
- Add rule for HTML() requiring Text()
- Add rule for HTML() and Text() being closed before format()
- Add rule for Text() unnecessary without HTML()
- Enhance expression parsing
- Add real arg parser for script
- Clean up unit tests
 2016-04-11 13:56:35 -04:00
Nimisha Asthagiri
e343fbe99c Merge pull request #12115 from edx/naa/fix-dashboard-xss 
Fix dashboard safe template issues
 2016-04-11 13:08:34 -04:00