Commit Graph

37497 Commits

Author SHA1 Message Date
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
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
Nimisha Asthagiri
59b8bb54e3 Fix Dashboard safe template. 2016-04-11 12:23:22 -04:00
Nimisha Asthagiri
8e591f6323 Fix Safe template issues (again) 2016-04-11 12:23:11 -04:00
Clinton Blackburn
d6ba8839bf Stripping auth querystring from S3 URLs
We use S3 for a number of uploads. Boto, by default, includes a auth querystring on the returned URLs. Since these uploads are public, there is no need for this querystring. Additionally, the long length URLs cause problems when API consumers need to store the URLs. This commit resolves this problem by removing the auth querystring.

- Updated to latest versions of boto and django-storages-redux packages
- Added AWS_QUERYSTRING_AUTH setting to remove the querystring values

ECOM-4081
2016-04-11 12:20:37 -04:00
Douglas Hall
69db1e7432 Merge pull request #12113 from edx/douglashall/upgrade_xblock_lti_consumer
Upgraded xblock-lti-consumer to 1.0.5
2016-04-11 12:12:12 -04:00
Douglas Hall
2d3a034695 Upgraded xblock-lti-consumer to 1.0.5 2016-04-11 12:04:05 -04:00
Bill DeRusha
f51f7eab07 Merge pull request #12111 from edx/bderusha/revert-wiki-mako-changes
Revert "Safe Templatize: wiki templates"
2016-04-11 11:57:28 -04:00
Bill DeRusha
f4208e7c58 Revert "Safe Templatize: wiki templates"
This reverts commit e6edba18b4.
2016-04-11 11:53:52 -04:00
Brian Beggs
17d8fdb531 Merge pull request #12110 from edx/bbeggs/ccx-fix-MA-2258
Fix sequence navigation issues for CCX courses
2016-04-11 11:52:22 -04:00
Nimisha Asthagiri
7d43e3994c Fix sequence navigation issues for CCX courses
MA-2258
2016-04-11 11:46:12 -04:00
Andy Armstrong
fd3a87a2cf Merge pull request #12102 from edx/andya/pattern-library-test-page-take-2
Introduce Pattern Library test pages (take two)
2016-04-11 10:28:25 -04:00
Vedran Karačić
4f8bf7a838 Merge pull request #11978 from edx/vkaracic/mobile-header
Lower padding on header for 320 breakpoint.
2016-04-11 16:22:42 +02:00
Vedran Karacic
733f7375f6 Lower padding on header for 320 breakpoint 2016-04-11 13:20:40 +00:00
Ben Patterson
bf66cb767d Merge pull request #12103 from edx/benp/assetindex-flaky
FEDX-88. Marking bok-choy test as flaky.
2016-04-11 07:32:16 -04:00