Commit Graph

454 Commits

Author SHA1 Message Date
jsa
72c3c87c84 in Studio, render compact placeholders for inline discussions.
JIRA: FOR-429
2014-04-10 15:44:30 -04:00
Andy Armstrong
a3e26e6824 Implement next round of code reviews 2014-04-09 12:15:38 -04:00
Andy Armstrong
a6aae729b7 Address the next round of review comments. 2014-04-09 10:32:13 -04:00
Andy Armstrong
dce075a852 Changes based upon code review comments 2014-04-09 10:32:12 -04:00
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
Ned Batchelder
732bf3f307 Fix hash_resource to avoid encode errors. 2014-04-02 20:13:50 -04:00
Alexander Kryklia
dfa7c27e77 Add multiple transcripts editor.
Fix donwload subs for non youtube videos and non-en language - continue.
Add acceptance tests.
Add detetion of assets on request.
Updated docstring.
Add fixes and acceptance tests.
Fix acceptance tests.
Update docsrtings and cleanup code, resful for language_id.
Specify exception type in POST.
Fix url in upload module.
Improve exception handling.
Remove 'en' and catching in editable_metadata.
Move descriptor.get_context test to lms tests.
Add query parameter to translation dispatch.
Response to format parameter of translatin GET request.
Fix Acceprance test: Metadata Editor.
move handlers to proper scores.
Split video player into smaller files.
Add ugettext and fix typoes.
Add changelog.
Support for downloading non-ascii filenames.
Change event binding.
Add content-language to download requests.
Reractor POST handler to not update self.transcripts.
2014-03-31 18:49:56 +03:00
zubiar-arbi
2b389a2dfa raise ItemNotFoundError if course not found in modulestore (course_listing)
STUD-1455
2014-03-31 14:12:38 +05:00
Nimisha Asthagiri
1bd6792a08 Support for "View Live" on Pages page.
Settings for ENABLE_STUDENT_NOTES and ENABLE_TEXTBOOK in CMS.
Do not display empty collection tabs.
Updated Changelog.
2014-03-28 05:41:32 -04:00
Nimisha Asthagiri
d865e9096e Add the ability to reorder Pages and hide the Wiki page. 2014-03-28 05:39:03 -04:00
Carlos Andrés Rocha
ba8faeadb4 Merge branch 'release' 2014-03-27 14:11:57 -04:00
Carson Gee
2c03c63990 Properly get lazily translated exception message 2014-03-26 21:46:22 -04:00
Piotr Mitros
5f9ef9a402 Concept added to Studio advanced components 2014-03-26 16:37:45 -04:00
Will Daly
ba00a442d7 Merge pull request #3037 from edx/will/tim-installation-rebase
Install new ORA (edx-tim)
2014-03-25 10:59:05 -04:00
Will Daly
440d9ddb89 Install edx-ora2
Support for displaying submissions API scores in Progress page.
2014-03-25 09:42:55 -04:00
Alexander Kryklia
de15848e9b Merge pull request #2622 from edx/alex/fix_duplicate_code_in_transcripts_ajax
Remove duplicate code in transcripts_ajax.
2014-03-25 10:36:21 +02:00
zubair-arbi
22205c35c8 Merge pull request #2985 from edx/zub/story/deletecoursefromlocmapper
remove course location from loc_mapper on delete
2014-03-25 12:44:04 +05:00
Valera Rozuvan
1c8eed853e Moved all YouTube related URLs to a separate namespace.
All YouTube urls are defined on backend side.
2014-03-24 18:40:28 +02:00
Alexander Kryklia
c9e9f6e6d5 Remove duplicate code in transcripts_ajax. 2014-03-24 17:23:30 +02:00
zubiar-arbi
9d04a9270b remove course location from loc_mapper on delete 2014-03-24 19:26:19 +05:00
Nimisha Asthagiri
e86b4a12dc Changes for viewing built-in tabs in studio
Changed "Status Page" -> "Page".

UX:
    support for displaying built-in tabs
    restored drag and drop on Studio Pages
    additional styling for fixed state on Studio Pages
    add a new page action added to bottom of Studio Pages

Dev
    changes for viewing tabs in studio,
    refactored the tab code,
    decoupled the code from django layer.
    is_hideable flag on tabs
    get_discussion method is needed to continue to support
external_discussion links for now since used by 6.00x course.
    override the __eq__ operator to support comparing with
dict-type tabs.

Test
    moved test code to common,
    added acceptance test for built-in pages
    added additional unit tests for tabs.
    changed test_split_modulestore test to support serializing objects
that are fields in a Course.

Env:
    updated environment configuration settings so they are
    consistent for both cms and lms.
2014-03-21 13:58:01 -04:00
zubiar-arbi
00bf5e4fce use unicode strings for slug and regex
STUD-1433
2014-03-21 15:48:29 +05:00
Jay Zoldak
c5a7911b87 Fix pylint disable pragmas that were pep8 violations 2014-03-20 10:18:40 -04:00
Adam
76566be21b Merge pull request #2939 from edx/zub/story/disableunicodecourseids
Enable/disable unicodes in course id's
2014-03-17 12:04:51 -04:00
zubiar-arbi
714da6ab23 Enable/disable unicodes in course id's 2014-03-17 20:24:59 +05:00
Don Mitchell
e13d167045 Merge pull request #2918 from edx/dhm/meld_pretty_factory
Dhm/meld pretty factory
2014-03-17 09:44:19 -04:00
Christina Roberts
cbbf38b40a Merge pull request #2838 from edx/andya/container-publishing
Support publishing of nested xblocks
2014-03-13 12:34:22 -04:00
cahrens
1453a86122 Minor code cleanup. 2014-03-13 11:57:30 -04:00
Andy Armstrong
58483c0649 Fix split_test xblock so that it can render in Studio
This change addresses STUD-1403 where split_test modules could not render in Studio.
It changes Studio to pass a new parameter 'runtime-type' of 'studio' when rendering
 an xblock. In split_test, this will then cause all of the children to be rendered,
 rather than just the one that matches the conditional.
2014-03-12 17:21:04 -04:00
Frances Botsford
089a1db677 adjusted Studio container publishing status message 2014-03-12 16:56:54 -04:00
cahrens
dd22bf49a3 Update tests and minor cleanup. 2014-03-12 16:13:07 -04:00
Andy Armstrong
3bb4be7d95 Add publishing sidebar to container page 2014-03-12 19:33:52 +00:00
Andy Armstrong
ad27107343 Support making drafts of nested xblocks 2014-03-12 19:33:52 +00:00
Don Mitchell
542b146f2f Split: add schema version and drop pretty_id (was placeholder looking for purpose)
STUD-1359
2014-03-12 11:30:44 -04:00
Usman Khalid
8f3cfa5a5f When creating a course in studio set a unique wiki_slug for it.
Currently wiki_slug is set to course number. However, since multiple
courses can have the same number this may lead to clashes. So wiki_slug
will be set to org.course.name. To maintain the active wiki_slugs for
xml courses this cannot be changed in the CourseDescriptor.

LMS-2136
2014-03-10 16:13:18 +05:00
Andy Armstrong
2c9585ea5d Merge pull request #2811 from edx/andya/container-unit-tests
Add more tests for the container page
2014-03-07 11:31:41 -05:00
Carson Gee
b0af8ff421 Merge pull request #2702 from carsongee/cg/cas_fixes
Correct misaligned django-cas integration
2014-03-06 16:17:13 -05:00
zubiar-arbi
c17cb38cd9 add location of handouts in loc_mapper
STUD-1248
2014-03-06 15:53:45 +05:00
Andy Armstrong
bc12869a00 Add more tests for the container page 2014-03-05 17:41:10 -05:00
Don Mitchell
b44780812c Merge pull request #2738 from edx/dbarch/mixed_ms_router
Dbarch/mixed ms router
2014-03-05 17:17:07 -05:00
Don Mitchell
e915a32aed xblock save only affects draft
Fix test which caused error
2014-03-05 14:40:36 -05:00
Don Mitchell
f371c4f5ae Pass user id to update_item 2014-03-05 14:40:34 -05:00
Don Mitchell
ca0dd8390f Mixed no longer translates 2014-03-05 14:40:33 -05:00
Don Mitchell
432249e9cf making mixed ms capable of front ending all modulestores for most operations including CRUD
STUD-600
2014-03-05 14:32:56 -05:00
cahrens
653df428f1 Improve code clarity. 2014-03-05 12:59:09 -05:00
cahrens
0dbabc7ad8 Support xblocks with children on the container page.
STUD-1363
2014-03-04 17:11:01 -05:00
Carson Gee
4099fc9af0 Correct misaligned django-cas integration 2014-03-04 09:35:08 -05:00
Chris Dodge
aa43689a93 This PR addresses the open feedback on the Microsites feature 2014-02-28 16:27:12 -05:00
Andy Armstrong
fcc0231d4d Add new container page that can display nested xblocks
This is the changes for STUD-1244, which introduces the ability for Studio to display
arbitrarily nested xblocks. In this change, a new container page is introduced which can
display nested xblocks. In particular, the xblock type of 'vertical' is special cased
to be shown inline as a collapsible section. The unit page is mostly unchanged, except
that container xblock's are shown as a link to their container page, rather than being
shown inline.
2014-02-27 14:53:05 -05:00
Will Daly
fbd2e3a0bc Merge pull request #2724 from edx/will/studio-xblock-save
Native XBlock Studio Save UI
2014-02-27 10:50:51 -05:00