Commit Graph

6724 Commits

Author SHA1 Message Date
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
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
Kelketek
04cadf79bd Merge pull request #11697 from open-craft/agaylard/TNL-3429-D
TNL-3429: implement display_name_with_default for studio text sanitation
2016-03-04 17:54:11 -06:00
M. Rehan
11c0094f07 Merge pull request #11679 from edx/code-jail-configs-cms-demo
TNL-4140 – Configure code jail for Studio
2016-03-05 02:00:50 +05:00
Douglas Hall
56ecc6646d Merge pull request #11607 from CredoReference/invalid-display-courseware-through-lti-iframe
Invalid display courseware through the LTI iframe in IE 10+
2016-03-04 15:29:42 -05:00
Jesse Zoldak
01e6fa81af Merge pull request #11654 from edx/zoldak/TE-1201
Convert tests for adding advanced problem components from lettuce to bok-choy
2016-03-04 15:14:25 -05:00
Jonathan Piacenti
f1c1c7c146 Fix escaping issue in studio xblock wrapper for display name. 2016-03-04 13:38:20 -06:00
Andrew Gaylard
2fe0bf5a98 Fix TNL-3429. 2016-03-04 13:38:20 -06:00
Robert Raposa
674f8eab8e Merge pull request #11638 from edx/robrap/markup
Use markup HTML helper with Text
2016-03-04 12:32:00 -05:00
John Eskew
d398f50786 Merge pull request #11490 from edx/jeskew/PLAT_736_fix_content_lib_export_import
Fix content library export with empty problems.
2016-03-04 11:03:27 -05:00
John Eskew
561950aafc Merge pull request #11717 from edx/jeskew/django_upgrade_1_8_10
Going head with the bump to Django version 1.8.10 - hopefully, 1.8.11 will show up soon and we'll be able to remove this monkeypatch.
2016-03-04 10:57:20 -05:00
Robert Raposa
8e1e4a4715 Use markup HTML helper with Text
TNL-4160
2016-03-04 10:44:41 -05:00
John Eskew
80fc91bf1a - Add test content library XML.
- Ensure that only a course import is saved to the draft branch and then
published. A content library has only a single 'library' branch.
- Add a fields parameter to the create_library call so the call has the
correct number of parameters.
- Add tests which import content libraries using different test methods
and with different branch settings.
- Add test which imports a content library and then exports it.
- Use XBlock module version that supports XML-serialized String of None.
- Add re-import of content library and equality comparison to test.
- Allow get_items to be called on LibraryLocators.
2016-03-04 09:53:27 -05:00
Ned Batchelder
b785690619 Merge pull request #11739 from edx/ned/update-translations
Update translations (autogenerated message)
2016-03-03 22:07:25 -05:00
John Eskew
ccb07f1c49 Monkey patch django.utils.http.is_safe_url for Django 1.8.10. 2016-03-03 16:53:42 -05:00
Kevin Falcone
3195a5c3fb Merge pull request #11722 from edx/jibsheet/remove-hardcoded-ATOMIC_REQUESTS
This should not be needed, we specify ATOMIC_REQUESTS on each DB
2016-03-03 16:05:31 -05:00
Ned Batchelder
fd4164de1d Merge pull request #11737 from edx/release
Release ⇒ master
2016-03-03 14:51:29 -05:00
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00:00
Dmitry Viskov
ca82f143b0 When using in-frame LTI navigation in IE 10 & 11, problems are not rendering properly.
The problems render properly in IE 10 & 11 when using edX directly, or when opening LTI in a new tab.
This is reproducible in Canvas and D2L
2016-03-03 12:27:21 +03:00
Jesse Zoldak
ec33db5a11 Remove more lettuce tests that are covered already in bok choy tests 2016-03-02 16:18:07 -05:00
David Ormsbee
19d9920b9f Revert "Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops"
This reverts commit acf6c1d609, reversing
changes made to c59db6e5fc.
2016-03-02 13:15:17 -05:00
Jesse Zoldak
2c8148c7bc Convert tests for adding advanced problem components from lettuce to bok-choy
TE-1201
2016-03-02 11:08:59 -05:00
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include:
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
2016-03-02 03:37:13 +03:00
Renzo Lucioni
d481768571 Merge pull request #11691 from edx/jeskew/shared_modulestore_test_case_conversion
WIP: Lots of Python unittest speedups
2016-03-01 16:50:27 -05:00
Kevin Falcone
a561367515 This should not be needed, we specify ATOMIC_REQUESTS on each DB
There is one DB where we do not want it specified since transactions
on the CSMHE table when we aren't atomic across databases isn't a win.
2016-03-01 14:00:13 -05:00
Kevin Falcone
327cdafccf Merge pull request #11715 from edx/jibsheet/aws_migrate-ignore-read-replica
Don't hardcode student_module_history
2016-03-01 13:12:54 -05:00
John Eskew
80ac3fcca2 Remove the concept of having more than one course export format tagged. 2016-03-01 12:59:59 -05:00