Commit Graph

3118 Commits

Author SHA1 Message Date
asadiqbal
7ae40dced8 asadiqbal08/WL-388: ModuleI18nService for Descriptor System
mattdrayer: Default to XBlock class if no unmixed class
2016-04-06 11:53:14 -04:00
Régis Behmo
e850ef2db2 Fix broken French i18n in CMS tests
French ugettext method was being monkey-patched with a "XYZ " prefix in
all tests. This introduces a context manager to guarantee that the
function reverts to its original state after the unit test has ended
(successfuly or not).
2016-04-04 18:28:26 +02:00
J. Cliff Dyer
05218f954b Merge remote-tracking branch 'origin/release' into merge-release-into-master 2016-03-31 20:15:22 +00:00
sanfordstudent
f730936d76 Merge pull request #11937 from edx/sstudent/MA-2164-followup
followup to MA-2164, cleaning up unused steps
2016-03-30 13:30:55 -04:00
J. Cliff Dyer
88fef8b2a4 Use renamed edx_oauth2_provider throughout.
MA-1998 Install and configure django_oauth_toolkit to coexist with
existing oauth libraries.
2016-03-30 14:21:17 +00:00
Sanford Student
a8c77f8d78 followup to MA-2164, cleaning up unused steps 2016-03-29 13:46:52 -04:00
Calen Pennington
37813d1820 Merge pull request #11958 from cpennington/cale/xss
Make (some) Mako templates HTML escaped by default
2016-03-29 11:03:31 -04:00
Calen Pennington
b81a15d57f XSS escape cms/templates/course_outline.html 2016-03-29 08:51:22 -04:00
Brian Beggs
1dff9d45f3 Merge pull request #11787 from mitocw/enhancement/aq/add_master_course_staff_in_ccx_fix_migration_issue
Adds staff and instructor users of the master course to CCX
2016-03-28 18:49:46 -04:00
Renzo Lucioni
3cbc03202c Hide chrome and default_tab from advanced settings
It doesn't make sense to list these LMS block attributes in course-level advanced settings. Doing so is confusing to course teams.
2016-03-28 10:30:46 -04:00
Amir Qayyum Khan
795ead82b5 Added master course staff and admins to ccx and fixed same issues related to ccx 2016-03-26 03:18:39 +05:00
Muddasser
a0b63d39f9 Merge pull request #11828 from edx/muddasser/cms/textbooks
Partially covered in bokchoy at lms/test_lms.py:PDFTextBooksTabTest
2016-03-25 22:45:38 +05:00
Usman Khalid
78016db313 Merge pull request #11932 from edx/release
Merge release to master
2016-03-24 16:58:12 +05: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
Muddasser
cfdaae9d36 Removed commented out and single textbook test scenario 2016-03-22 17:06:59 +05: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
cb0bb1f40f Removed duplicate lettuce test from component.feature 2016-03-17 16:37:32 +05: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
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
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
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
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
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
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
fd4164de1d Merge pull request #11737 from edx/release
Release ⇒ master
2016-03-03 14:51:29 -05: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
John Eskew
80ac3fcca2 Remove the concept of having more than one course export format tagged. 2016-03-01 12:59:59 -05:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl
AC-328 adding UXPL classnames to headings
2016-03-01 07:23:07 -05:00
Renzo Lucioni
447eb4c2a7 Speed up course listing tests
This test was creating 500 courses in about 2.5 minutes. Creating 10 courses instead allows the test to execute in 7 seconds.
2016-02-29 17:04:52 -05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
Mushtaq Ali
3dc73c655b Display studio name properly on empty course page. 2016-02-29 17:11:55 +05:00
John Eskew
e3ddb02cc7 Merge pull request #11586 from edx/jeskew/remove_all_request_dot_request
Remove all request.REQUEST usages.
2016-02-25 08:23:12 -05:00
Michael Katz
fd065c9e8c Merge pull request #11643 from edx/release
Release 2016-02-24
2016-02-24 11:16:16 -05:00
Toby Lawrence
acf6c1d609 Merge pull request #11523 from edx/perf/speed-up-slow-user-role-ops
Don't blow away the role cache when updating.
2016-02-23 06:55:00 -05:00
Michael Katz
bf5d2034a1 Revert "Added staff role on ccx to staff of master course and added a data migration for existing ccx courses."
This reverts commit 91bf48fc8c.
2016-02-22 15:33:01 -05:00
John Eskew
df261cd5d6 Remove all request.REQUEST usages - replace with request.GET and/or
request.POST to eliminate Django deprecation messages.
2016-02-22 09:54:26 -05:00
Nimisha Asthagiri
4bbe9a2021 Merge pull request #11326 from edx/mobile/remove-dead-code
Mobile API: remove unused endpoints
2016-02-19 15:14:13 -05:00
Mushtaq Ali
689bb73b84 Merge pull request #11551 from edx/mushtaq/fix-tnl4006
Studio homepage escaping
2016-02-18 22:52:01 +05:00
Nimisha Asthagiri
fa8ca11d8c Remove unused Mobile Social Facebook endpoint 2016-02-18 12:12:04 -05:00