Commit Graph

3102 Commits

Author SHA1 Message Date
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
Mushtaq Ali
7a9991e95c Studio homepage escaping 2016-02-18 21:10:21 +05:00
Peter Pinch
dcb04cb092 Merge pull request #10877 from mitocw/enhancement/aq/add_master_course_staff_in_ccx
Added staff and instructor roles on ccx to all the staff and instructors of the master course plus fixed view as student masquerade and display name of ccx on coach dashboard
2016-02-18 11:09:37 -05:00
Mushtaq Ali
b94204a8a4 Merge pull request #11452 from edx/mushtaq/ECOM-3615-fix-self-paced-scheduled-content
Fix self paced course content visiblity
2016-02-17 18:59:41 +05:00
Mushtaq Ali
5485d0c236 make is_course_self_paced default to False 2016-02-17 15:54:54 +05:00
Amir Qayyum Khan
91bf48fc8c Added staff role on ccx to staff of master course and added a data migration for existing ccx courses. 2016-02-17 15:54:28 +05:00
Mushtaq Ali
d3fc2625d0 Code refactor pass store_type in course create method 2016-02-17 12:53:12 +05:00
Robert Raposa
6cc8bbffb6 Merge pull request #11059 from edx/robrap/TNL-3425
Properly escape Studio base.html
2016-02-16 16:19:45 -05:00
Robert Raposa
b69c6d62bf Make base.html Mako template safe by default
Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
2016-02-16 13:19:24 -05:00
Toby Lawrence
af102a6919 Remove duplicate test setup. 2016-02-16 11:30:46 -05:00
Toby Lawrence
fe545e058f Quality fixes. 2016-02-16 10:12:29 -05:00
Toby Lawrence
e2cbb547b1 Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible. 2016-02-16 09:39:00 -05:00
Mushtaq Ali
3559bd1e69 Refactor test to check support for both modulestore and is_self_paced method improvement 2016-02-15 18:18:46 +05:00
Toby Lawrence
dacdbae1a5 Fix up some broken tests.
We added the ability here to check if a role has a user in with the ability to refresh the role cache before checking.  Since some tests will make inline requests, which in turn put a user into a new role, we have to refresh afterwards otherwise we won't see that new role in place.  Since we don't want to automatically refresh ever, we just added a way to request it, since we know in this test that we're doing something, effectively, out-of-band, which necessitates it.
2016-02-12 14:17:51 -05:00
Mushtaq Ali
df0b983ea3 Improve is_self_paced method 2016-02-12 17:31:00 +05:00
Mushtaq Ali
f9c3759571 Fix self-paced course displaying "published, not yet released" issue in Studio ECOM-3615 2016-02-11 17:42:17 +05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00