Commit Graph

6749 Commits

Author SHA1 Message Date
Andy Armstrong
6dd09a89cf Fix issues with Underscore in the asset pipeline
FEDX-121

The previous approach for handling NPM assets was
to symlink them into the static directory. This appeared
to cause trouble with the asset pipeline where the files
in question were not installed and then old versions were
picked up instead.

This change instead copies NPM libraries to a new
static directory so that the pipeline can consume them
as with any other file. This new directory is added to
.gitignore so that the files don't get accidentally
checked in.
2016-03-25 10:02:38 -04:00
Akiva Leffert
91c0517b7a Merge pull request #11918 from edx/aleffert/remove-unit-coffee
Remove unused empty file
2016-03-24 17:01:10 -04:00
Ned Batchelder
026ac6636f Update translations (autogenerated message) 2016-03-24 18:04:37 +00:00
Daniel Friedman
a0654f93a2 Merge pull request #11890 from edx/dan-f/make-cms-500-safe
Make CMS 500 template safe by default
2016-03-24 11:24:12 -04:00
Daniel Friedman
32f6bc0791 Merge pull request #11887 from edx/dan-f/make-cms-404-safe
Make CMS 404 template safe by default
2016-03-24 11:23:13 -04:00
Daniel Friedman
c210d918b2 Make CMS 404 template safe by default 2016-03-24 10:31:42 -04:00
Daniel Friedman
0fd137c271 Make CMS 500 template safe by default 2016-03-24 09:51:55 -04:00
Usman Khalid
78016db313 Merge pull request #11932 from edx/release
Merge release to master
2016-03-24 16:58:12 +05:00
Renzo Lucioni
40ef82d513 Merge pull request #11911 from edx/renzo/safe-templates
Secure templates used to inject Segment and Optimizely
2016-03-23 17:15:11 -04:00
Akiva Leffert
2876076677 Remove unused empty file 2016-03-23 16:05:08 -04:00
Daniel Friedman
56b1196246 Fix accidental extra escaping 2016-03-23 14:46:35 -04:00
Renzo Lucioni
a104d82e70 Secure templates used to inject Segment and Optimizely 2016-03-23 14:40:24 -04:00
Daniel Friedman
679cdc3775 Merge pull request #11893 from edx/dan-f/make-cms-activation_invalid-safe
Make CMS activation_invalid template safe by default
2016-03-23 13:55:51 -04:00
Daniel Friedman
0b6faee467 Merge pull request #11891 from edx/dan-f/make-cms-activation_complete-safe
Make CMS activation_complete template safe by default
2016-03-23 13:55:11 -04:00
Jesse Zoldak
1b1f39527b Merge pull request #11902 from edx/zoldak/html-escape-mako-without-variables
Add h filter page directive to cms mako templates without variables
2016-03-23 13:30:46 -04:00
M. Rehan
8459b5be77 Merge pull request #10705 from edx/mrehan/SUST-22
Implement 'from_string_or_404' in utils
2016-03-23 21:26:39 +05:00
Jesse Zoldak
6f0d1157f1 Add h filter page directive to cms mako templates without variables
The files to change were found with:
`ack --literal --type=html --match '${' --files-without-matches cms/templates`
2016-03-23 12:05:12 -04:00
Daniel Friedman
48e2299e47 Make CMS activation_invalid template safe by default 2016-03-23 11:21:50 -04:00
Daniel Friedman
ea347c7a9b Make CMS activation_complete template safe by default 2016-03-23 11:11:08 -04:00
Muhammad Rehan
771a7d06ca Implement 'from_string_or_404' util and its example usage. 2016-03-23 20:10:32 +05:00
Ehtesham
5ad2eb300c [TNL-4073][TNL-4273] Make sure that domain defined for preview exists in
HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS,
2016-03-23 18:52:32 +05:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform
UITK-75
2016-03-22 15:31:27 -04:00
cahrens
358ed2559a Fix improper escaping. 2016-03-21 16:01:04 -04:00
Renzo Lucioni
a5b10ca0fe Merge pull request #11805 from edx/renzo/self-paced-modulestore-wrapper
Override field data within the XBlock runtime
2016-03-21 12:14:22 -04:00
sanfordstudent
a86734fe70 Merge pull request #11851 from edx/sstudent/MA-2164-cleanup
MA-2164 cleaning up old lettuce
2016-03-21 07:49:26 -04:00
Renzo Lucioni
cd9986b662 Override field data within the XBlock runtime
Resolves an issue preventing students in self-paced courses from seeing all available discussion modules. ECOM-3733.
2016-03-18 17:15:00 -04:00
Andy Armstrong
76b8e2e897 Merge pull request #11631 from edx/fedx/upgrade-libraries
Upgrade Underscore.js and Underscore.string.js
2016-03-18 16:32:16 -04:00
Sanford Student
da828cdf75 MA-2164 cleaning up old lettuce 2016-03-18 14:42:23 -04:00
Muddasser
c9f8682a27 Merge pull request #11832 from edx/muddasser/lettuce/cms/course_export
Covered in bokchoy at studio/test_import_export.py:TestCourseBadExport
2016-03-18 12:18:30 +05:00
Muddasser
ba4e9ee3a9 Merge pull request #11833 from edx/muddasser/lettuce/cms/courses
Partially covered in bokchoy at studio/test_studio_course_create.py:CreateCourseTest
2016-03-18 12:18:18 +05:00
Muddasser
f3a0c58a23 Merge pull request #11836 from edx/muddasser/lettuce/cms/component.feature
Partially covered in bokchoy at studio/test_studio_container.py:EditContainerTest and studio/test_studio_container.py:DisplayNameTest
2016-03-18 12:18:03 +05:00
Muddasser
cb0bb1f40f Removed duplicate lettuce test from component.feature 2016-03-17 16:37:32 +05:00
Ned Batchelder
6883f21542 Update translations (autogenerated message) 2016-03-17 10:54:37 +00:00
Muddasser
832381146e Removed duplicate luttuce test from courses.feature 2016-03-17 15:48:49 +05:00
Muddasser
079742d695 Removed duplicate lettuce test from course-export.feature 2016-03-17 15:27:14 +05:00
cahrens
dd2a203677 Upgrade underscore to newest version.
FEDX-24
2016-03-16 17:08:27 -04:00
Andy Armstrong
7ead068a4e Merge pull request #11813 from edx/andya/upgrade-requirejs
Upgrade RequireJS
2016-03-16 14:24:27 -04:00
Andy Armstrong
06daf79b94 Upgrade RequireJS
FEDX-105
2016-03-16 12:42:00 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming"
This reverts commit 954dae584a.
2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
2016-03-14 13:42:53 -04:00
Matt Drayer
3ed3fea2fb mattdrayer/xblock-translations: Add I18N/L10N support to XBlocks via the runtime
* mattdrayer:  Latest proto code
* mattdrayer:  Add translation.py
* asadiqbal08: Xblock translation ugettext update, remove translation.py
* mattdrayer:  Additional I18N work -- starting to see some translations!
* asadiqbal08: Trying to make xBlock message catalog files path dynamic
* mattdrayer:  Remove unnecessary modifications
* mattdrayer:  Cleaned up implementation
* mattdrayer:  Moved import statement
* asadiqbal08: update as suggested
* asadiqbal08: xblock its own domain
* asadiqbal08: translation: secure none object
* asadiqbal08: pylint
* asadiqbal08: get locale from xblock
* asadiqbal08: update
* mattdrayer:  Determine XBlock locale path within runtime service
* mattdrayer:  Determine module location via the runtime
* mattdrayer:  Remove ModuleI18nService reference
* asadiqbal08: override the service in studio
* asadiqbal08: remove import
* asadiqbal08: update the Modulei18nService
* asadiqbal08: update the Modulei18nService
* mattdrayer:  Remove redundant __class__ reference
* asadiqbal08: update the docstring
* asadiqbal08: tests
* mattdrayer:  Remove specific ugettext override from ModuleI18nService
* mattdrayer:  Move service operation to base class
* mattdrayer:  Address quality violations
* asadiqbal08: Investigating the test failure issue on jenkins and solved
* asadiqbal08: First utilizing the parent class method
* mattdrayer:  Use recommended callable approach
* asadiqbal08: remove unused code
* asadiqbal08: Updated the test to use cms preview module system runtime in order to get i18n service.
* asadiqbal08: Pylint quality
* asadiqbal08: update the service call to check xblock declarations
* asadiqbal08: update doc string
* asadiqbal08: i18n callable test in studio
* asadiqbal08: test lms runtime for modulei18n service
* asadiqbal08: add doc strings
* asadiqbal08: Rename locale and domain to Flask-Babel convention
2016-03-11 09:55:15 -05:00
Ned Batchelder
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00:00
John Eskew
2c78813380 Merge pull request #11768 from edx/jeskew/upgrade_to_django_1_8_11
Upgrade to Django 1.8.11.
2016-03-10 11:31:51 -05:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
2016-03-10 10:32:22 -05:00
erm0l0v
4142438372 add CourseTalk widget
Move tests to one test class
2016-03-09 13:32:07 +03:00
John Eskew
812aa6381e Upgrade to Django 1.8.11. Remove monkey patch required for v1.8.10. 2016-03-08 11:41:33 -05:00
Toby Lawrence
5a20f0b589 Merge branch 'master' into PERF-272 2016-03-08 08:53:36 -05:00
Toby Lawrence
1a3464152f Switch to header_control in contentserver. 2016-03-07 18:51:14 -05:00
Chris Rodriguez
08937ce5a8 Lessening specificity for headings 2016-03-07 13:07:56 -05:00
Chris Rodriguez
fed1d4b455 Removing importants from heading styles 2016-03-07 10:48:56 -05:00