Commit Graph

2727 Commits

Author SHA1 Message Date
Greg Price
eafd12d8de Add "Imported" state to Studio video upload page
Imported VAL videos get the value "imported" for their status. We
considered not including imported videos on the upload page but have
instead decided to include them, so it is necessary to have a display
string for the imported status value.
2015-04-01 12:25:07 -04:00
Greg Price
c860f790c2 Merge pull request #7508 from edx/gprice/export-import-val
Include VAL data in video module export/import
2015-03-31 20:28:31 -04:00
Greg Price
cfcb304885 Include VAL data in video module export/import
This is required so that an a video module exported by one Open edX
deployment and imported by another will work correctly if it contains an
edx_video_id but does not populate other URL fields.

JIRA: MA-110
2015-03-31 19:35:06 -04:00
Calen Pennington
8f133f6696 Merge pull request #6035 from edx/jeskew/xmodule_to_xblock_vertical
Convert Vertical XModule to pure Vertical XBlock.
2015-03-31 11:10:22 -04:00
Calen Pennington
1f17538d42 Clean up tests in preparation for switching Vertical from an XModule to an XBlock 2015-03-30 16:37:53 -04:00
Adam
dad4b673e2 Merge pull request #7505 from edx/release
Release
2015-03-27 16:46:33 -04:00
Clinton Blackburn
9a8ecc65a7 Removed invalid kwarg 2015-03-27 10:37:04 -04:00
John Eskew
34adb256a6 Add datadog counters everywhere a "VS[compat]" comment exists.
Conflicts:
	common/lib/xmodule/xmodule/xml_module.py
2015-03-26 16:18:15 -04:00
Christopher Lee
4423510807 Merge pull request #7480 from edx/clee/MA-169_MA-77
Clee/ma 169 ma 77
2015-03-26 13:31:49 -04:00
Adam
c2dcbd70d1 Merge pull request #7492 from edx/release
Release
2015-03-26 12:56:41 -04:00
christopher lee
e8dfac091b MA-77 Auto VAL clone course
MA-77 Automatically adds the course id to the videos in VAL
when a course is rerun.
2015-03-26 12:36:43 -04:00
Adam Palay
43abe399f1 default discussion modules' discussion_id field to xblock's UNIQUE_FIELD (TNL-1771) 2015-03-26 08:49:21 -04:00
Matt Drayer
8107f803f5 Merge branch 'release' 2015-03-25 13:38:43 -04:00
Eugeny Kolpakov
dadc78aabd Merge pull request #7336 from open-craft/eugeny/course-team-to-backbone
Unified Course Team and Library Users page. Converted both to Backbone.
2015-03-24 17:06:38 +03:00
E. Kolpakov
9a56b800ee Unified Course Team and Library Users page. Converted both to Backbone.
Converted lettuce Course Team page tests to bok choy
2015-03-24 12:09:19 +03:00
Greg Price
0f0ee6a394 Merge pull request #7455 from edx/aleffert/video_web_only
Add web-only setting to video module
2015-03-23 15:38:18 -04:00
Greg Price
438ce5f7a4 Add web-only setting to video module
This is needed for courses that license video content where the license
allows only for viewing on the web, not on mobile apps.

JIRA: MA-307
2015-03-23 14:45:17 -04:00
Ned Batchelder
a84735057d Move common/lib/*.py to openedx/core/lib
This makes these files importable, and puts them into the new best guess
as to where files should live.
2015-03-23 12:40:24 -04:00
Usman Khalid
6fb48eb159 Merge pull request #6706 from edx/ammar/tnl-181
Allow Instructor To Rename Cohorts And Set Cohort Assignment Method.
2015-03-23 19:49:03 +05:00
Usman Khalid
e07f45b5dd Removed cohort_config from advanced settings page.
TNL-1258
2015-03-23 09:58:25 +05:00
Dino Cikatic
2117d168a4 SOL-217 Adding basic analytics events logging for courseware search and index 2015-03-19 21:52:23 +00:00
Ned Batchelder
6ac1b82bb2 Merge pull request #7356 from edx/ned/fix-or-remove-teardown
Fix or remove tearDown methods that don't use super.
2015-03-18 17:36:17 -04:00
Jonathan Piacenti
568acb56b0 Library setting for show/hide children previews + client-side code to toggle it. 2015-03-18 08:59:58 -05:00
Ned Batchelder
81d17c516e Fix or remove tearDown methods that don't use super.
Update edx-lint to the version that checks if tearDown uses super.

Convert a number of tearDown methods into addCleanup.

Remove some unneeded tearDown methods: no need to call patch.stopall if
none of them were started with patch.start.
2015-03-17 15:14:52 -04:00
Calen Pennington
de23d6defe Clear cached children when binding an XModuleDescriptor/XBlock to a particular user 2015-03-17 10:55:06 -04:00
Ned Batchelder
7d799e34f3 Remove unused imports 2015-03-17 07:10:31 -04:00
Ned Batchelder
6e8d075dd7 Merge pull request #7355 from edx/ned/fix-capitalization
Simple capitalization fix
2015-03-16 14:45:36 -04:00
Jesse Zoldak
26afdf768c Revert "To support UNICODE xblock.location" 2015-03-16 10:15:41 -04:00
Sarina Canelake
dadc47c22a Merge pull request #6167 from fmyzjs/patch-5
To support UNICODE xblock.location
2015-03-16 09:05:10 -04:00
Ned Batchelder
a8da7946b3 Simple capitalization fix 2015-03-14 19:43:43 -04:00
stv
181eed241f Silence unrelated warnings 2015-03-14 13:35:18 -07:00
stv
b9ed4b6561 Fix Pylint: E1305(too-many-format-args) 2015-03-13 20:20:04 -07:00
stv
6c06f8ce5d Fix Pylint: C1001(old-style-class) 2015-03-13 20:20:04 -07:00
Jesse Zoldak
63bf151074 Merge pull request #7339 from edx/zoldak/TNL-1679
Disable flaky lettuce test TNL-1679
2015-03-13 15:22:49 -04:00
Nimisha Asthagiri
e77bcab571 MA-345 Mobile Enrollment API: add course' Facebook URL 2015-03-13 11:13:33 -04:00
Jesse Zoldak
7565825714 Disable flaky lettuce test TNL-1679 2015-03-13 11:04:12 -04:00
Kelketek
a7e1f9caf3 Merge pull request #7301 from open-craft/course-import-page-fix
Replace broken logic in import template with working logic in view.
2015-03-12 18:15:32 -05:00
Jonathan Piacenti
8c920b469c Replace broken logic in import template with working logic in view. 2015-03-12 20:13:47 +00:00
Matt Drayer
cd05391335 Cleaned up milestones API references 2015-03-12 15:58:21 -04:00
Nimisha Asthagiri
8e5563d467 Do not show video_upload_pipeline advanced setting if the feature is disabled. 2015-03-11 17:58:32 -04:00
Greg Price
f0322b9662 Merge branch 'release' 2015-03-11 11:14:48 -04:00
Kelketek
1bd3652af3 Merge pull request #6846 from open-craft/content_libraries/import-export
Content Libraries Import/Export
2015-03-11 09:27:45 -05:00
Mark Hoeber
86930b9d27 Merge pull request #7135 from edx/markhoeber-studio-template-updates
Studio template updates
2015-03-11 09:16:40 -04:00
Mark Hoeber
12e3cc9d62 Update IFrame, Zooming Image, and Full Screen Image Templates 2015-03-10 20:58:01 -04:00
Jonathan Piacenti
8ad4d081fb Added library import and export via .tar.gz'd XML files. 2015-03-10 21:29:29 +00:00
asadiqbal
5a7ac441e5 Entrance Exam authoring and messaging updates
Multi-commit history:
- hide drag functionality for entrance exam section.
- hide entrance exam subsection elements e.g. delete, drag, name etc.
- show unit/verticals expanded in case of entrance exam
- modify code in order to allow user to update entrance exam score from UI.
- write down unit tests.
- write down Jasmine tests.
- add bok-choy test
- updated bok-choy test
- internationalize string
- repositioned sequential block creatori
- SOL-221 (entrance exam message)
- SOL-199 LMS Part (show entrance exam content) and hide the course navigation bar.
- redirect the view in case of entrance exam.
- update code structure as per suggestions
- write down unit tests
- fix pep8
- instead of hiding the exam requirement message, now also showing the exam the completion message (success state).
- write down unit test to show exam completion message.
- Update code as per review suggestions
- update doc string
- addressed review suggestions
- change sequential message text
- css adjustments
- added new css class for entrance exam score in studio
- added Jasmine test for remaning coverage
- sequential message should appear under the context of entrance exam subsection.
- updated text in CMS and LMS as per suggestions.
- added unit text to insure sequential message should not be present in other chapters rather then entrance exam.
- skip setter if empty prerequisite course list
- exclude logic from xblock_info.js that is specifically related to entrance exam.
- added js tests and updated code as per suggestions
- added tests
- addressed several PR issues
- Several small fixes (style, refactoring)
- Fixed score update issue
- added some more unit tests.
- code suggested changes.
- addressed PR feedback
2015-03-10 09:24:43 -04:00
zubair-arbi
61890e7a5e return proper 404 for assets of some invalid course from split modulestore
PLAT-456
2015-03-10 15:00:14 +05:00
Alison Hodges
3d7ee895d7 Fixes DOC-1731: label change and time frame info 2015-03-06 17:08:24 -05:00
David Baumgold
dca05a6095 Merge branch 'release' 2015-03-06 08:54:22 -05:00
Xavier Antoviaque
7338cc1286 Merge pull request #7148 from open-craft/library-selector
Show a select box when editing a library content block (SOL-123)
2015-03-06 09:16:02 +01:00