Commit Graph

1858 Commits

Author SHA1 Message Date
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
Will Daly
5f09953125 Hide save/cancel buttons for native XBlocks in Studio
Add Studio client-side runtime notifications for saving/cancelling XBlock edits.
2014-02-26 16:17:02 -05:00
Dave St.Germain
ce596919b4 Merge pull request #2734 from edx/dcs/a11y-course-update-delist
Tweaks course update html to avoid using list tags inappropriately.
LMS-1724
2014-02-26 14:01:07 -05:00
Dave St.Germain
da275eae11 Tweaks course update html to avoid using list tags inappropriately.
LMS-1724
2014-02-26 13:28:00 -05:00
Giulio Gratta
51632a9f0a Merge pull request #2579 from edx/giulio/studio-file-urls
Internal/External Studio file URLs
2014-02-26 09:32:59 -08:00
zubair-arbi
2cb3cc3621 Merge pull request #2238 from zubair-arbi/zub/bugfix/std154-courseinfohtml
update course info module to save content without modifying
2014-02-26 21:34:10 +05:00
cahrens
8db7b0ce21 Add test for external_url being passed to assets page. 2014-02-26 09:26:50 -05:00
zubair-arbi
7ee08eae52 Merge pull request #2688 from edx/zub/bugfix/std1294-importexportcruft
Empty course temp folder after exporting course (export_handler)
2014-02-26 17:53:44 +05:00
zubiar-arbi
619c144c11 Empty course temp folder after exporting course (export_handler)
STUD-1294
2014-02-26 15:52:48 +05:00
zubiar-arbi
cf47b6b670 assign default forum role 'Student' to user on course recreate with same name STUD-1140
STUD-1140
2014-02-26 15:40:44 +05:00
zubiar-arbi
cfa6b14575 update course info module to save content in new 'items' field + update import/export to handle content field other than 'data' or 'metadata'
STUD-154
2014-02-26 13:11:59 +05:00
Calen Pennington
a2137cec35 Merge pull request #2603 from cpennington/xblock-acid-resources-test
Add tests of local_resource_url
2014-02-25 16:46:10 -05:00
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02:00
Giulio Gratta
3ffb6715e5 Internal/External Studio file URLs
- Changed link URL of file name to use public/LMS url
- Added toggle link to display all public URLs for instructor convenience
2014-02-24 11:54:09 -08:00
Ned Batchelder
6bb0eee3c6 Make the i18n service available everywhere.
To get all dates localized, we need all runtimes to have the i18n
service, and since runtimes are made by the modulestores, we need to
pass it to them.

Soon (fingers crossed), modulestores won't be involved in making
runtimes, and many of these changes will go away.
2014-02-24 10:06:13 -05:00
zubiar-arbi
6b3c5e7d60 get updates_location from course_location directly + update tests
STUD-1248
2014-02-24 12:56:09 +05:00
zubiar-arbi
62a32cda21 add course updates location to loc_mapper on accessing course_info_update_handler
STUD-1248
2014-02-24 12:56:09 +05:00
Calen Pennington
dbc99ef8ad Implement children for pure XBlocks in edx-platform
This requires fixing the javascript api implementation, and adding
an implementation of get_block to the ModuleSystem api.

However, the implementation is incomplete, due to mismatches between
the expectations of XModule and XBlock.

Also adds tests using the Acid block to make sure that the javascript
and python apis for children are working correctly.
2014-02-21 15:01:20 -05:00
Calen Pennington
3093efc889 Make bok-choy correctly publish units with children 2014-02-21 15:00:32 -05:00
David Baumgold
1bf5d7120c Merge pull request #2662 from edx/db/textbook-id-unicode
Call unicode() instead of str() for textbook IDs
2014-02-20 17:18:23 -05:00
Jay Zoldak
4c21270f2e Merge branch 'release' 2014-02-20 16:29:06 -05:00
David Baumgold
33f56e1bba Call unicode() instead of str() for textbook IDs
STUD-1327
2014-02-20 14:58:17 -05:00
zubiar-arbi
6892bc73b2 get courses by reversing django groups for non global users (studio dashboard)
STUD-1133
2014-02-20 20:23:12 +05:00
zubiar-arbi
88690dab1d resolve conflict on rebase 2014-02-20 20:21:52 +05:00
Calen Pennington
1eec47a604 Fix STUD-1316
This bug affected unpublishing content (and would trigger an error
message in studio). The fix was to uncouple the rendering of the studio_view
of an xblock with the student_view, so that content that wasn't in
draft mode already wouldn't be modified by early rendering of the
studio_view.

[STUD-1316]
2014-02-19 14:58:41 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Carson Gee
989a97963c Merge pull request #718 from edx/feature/ichuang/push-to-lms
Let a Studio user export course to git (and via git, to elsewhere, eg LMS)
2014-02-13 20:22:31 -05:00
Julia Hansbrough
5131818153 Merge pull request #2597 from edx/release
Release
2014-02-13 15:17:38 -05:00
Calen Pennington
3a7b265c8a Add trailing commas to multiline lists, to prevent string concatenation bugs 2014-02-13 13:12:42 -05:00
Carson Gee
5e0f781674 Major refactor and rename of feature
All forward facing wording changed to Export to Git
Export to git functions removed from management command and put in common file
Additional error checking and documentation improvements
Nitpicks and other minor fixes
2014-02-13 12:53:47 -05:00
Carson Gee
f02c074db9 Push To LMS updates
Added tests
Converted scripts to django commands
Removed advanced module requirement
Generalized to platform
Switched to subprocess for shell commands
Beefed up resiliency and error checking.
Refactored since #1910 removed get_location_and_verify_access
Added settings to aws for export directory and reworked test setup and teardown
Several review based fixes
Added line to Changelog
Changed URL handler to be accepting and moved git bare repo inside of test_root/data
Added exception logging to help trace issues
Added output in exception logging
Made the branch to commit to explicit instead of implicit
Skipping git identity test on condition of global configuration set
2014-02-13 10:21:18 -05:00
ichuang
e524f5be35 add push_to_lms to Studio; uses MITX_FEATURES['ENABLE_PUSH_TO_LMS'] 2014-02-13 10:01:28 -05:00
Julia Hansbrough
d6c0ce161e Merge branch 'release' 2014-02-12 21:24:19 +00:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
Calen Pennington
4403eb7209 Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally) 2014-02-12 11:11:01 -05:00
cahrens
fc1e8fae2e Remove unused imports. 2014-02-10 16:08:59 -05:00
cahrens
c2aa0bf629 pep8 cleanup 2014-02-10 16:03:06 -05:00
cahrens
5dfe9d7052 Remove unused methods. 2014-02-10 16:03:06 -05:00
cahrens
f9c1c0b38b Move tests related to views files into views/tests. 2014-02-10 16:03:06 -05:00
Don Mitchell
16f0d12a1f Merge pull request #2356 from edx/dhm/mixed_ms_wrapper
MixedModulestore wraps most getters, update_item, delete_item
2014-02-10 16:01:50 -05:00
Andy Armstrong
651d1afbf8 Add the ability to view templates in a browser in development mode
This adds a simple mechanism to view any template file directly in a browser. The intention is that we can use this to build up reference HTML files which illustrate common UX patterns. We can then view the resulting pages without having to have a working implementation.

In development mode, the URL is /template followed by the path to the template file. For example, you can view the 404 page at:

    /template/404.html

You can also supply string parameters to the template by specifying them as query parameters in the URL.

e.g.  /template/my_template?name=Foo
2014-02-07 14:56:35 -05:00
Don Mitchell
1de9d55844 Review-driven changes (to-be-squashed) 2014-02-05 16:34:24 -05:00
cahrens
c2199279e7 Changes to preview to support xblocks using Locators intead of Locatins.
STUD-967
2014-02-05 12:16:20 -05:00
Don Mitchell
b8ea7f3c43 update_item and other refactorings continued 2014-02-05 10:24:24 -05:00
Don Mitchell
c601b75675 MixedModulestore wraps most getters, update_item, delete_item
with code to translate between addressing schemes based on app
and persistence layer addressing scheme specification.

STUD-1206
2014-02-05 09:34:30 -05:00
Calen Pennington
6d67d0c677 Merge pull request #1949 from cpennington/xblock-studio-js-and-css
Enable XBlock js and css in Studio
2014-02-05 08:19:45 -05:00