Commit Graph

264 Commits

Author SHA1 Message Date
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
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
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
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
Alexander Kryklia
25407ef3e7 BLD-642: Allow multiple transcripts with video. 2014-02-24 21:57:08 +02: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
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
f6731342de Make Studio load XBlock fragment js and css on the client-side
[LMS-1421][LMS-1517]
2014-02-04 15:38:13 -05:00
David Baumgold
096088cc75 fix test failures: clear loc_mapper cache 2014-01-29 15:11:03 -05:00
daniel cebrian
7e2652b5a8 annotation tools
First set of fixes from the pull request

This does not include some of the testing files. The textannotation and
videoannotation test files are not ready. waiting for an answer on the
issue.

Deleted token line in api.py and added test for token generator

Added notes_spec.coffee

remove spec file

fixed minor error with the test

fixes some quality errors

fixed unit test

fixed unit test

added advanced module

Added notes_spec.coffee

remove spec file

Quality and  Testing Coverage

1. in test_textannotation.py I already check for line 75 as it states
in the diff in line 43, same with test_videoanntotation
2. Like you said, exceptions cannot be checked for
firebase_token_generator.py. The version of python that is active on
the edx server is 2.7 or higher, but the code is there for correctness.
Error checking works the same way.
3. I added a test for student/views/.py within tests and deleted the
unused secret assignment.
4. test_token_generator.py is now its own file

Added Secret Token data input

fixed token generator

Annotation Tools in Place

The purpose of this pull request is to install two major modules: (1) a
module to annotate text and (2) a module to annotate video. In either
case an instructor can declare them in advanced settings under
advanced_modules and input content (HTML in text, mp4 or YouTube videos
for video). Students will be able to highlight portions and add their
comments as well as reply to each other. There needs to be a storage
server set up per course as well as a secret token to talk with said
storage.

Changes:
1. Added test to check for the creation of a token in tests.py (along
with the rest of the tests for student/view.py)
2. Removed items in cms pertaining to annotation as this will only be
possible in the lms
3. Added more comments to firebase_token_generator.py, the test files,
students/views.py
4. Added some internationalization stuff to textannotation.html and
videoannotation.html. I need some help with doing it in javascript, but
the html is covered.

incorporated lib for traslate

fixed quality errors

fixed my notes with catch token

Text and Video Annotation Modules - First Iteration

The following code-change is the first iteration of the modules for
text and video annotation.

Installing Modules:
1. Under “Advanced Settings”, add “textannotation” and
“videoannotation” to the list of advanced_modules.
2. Add link to an external storage for annotations under
“annotation_storage_url”
3. Add the secret token for talking with said storage under
“annotation_token_secret”

Using Modules
1. When creating  new unit, you can find Text and Video annotation
modules under “Advanced” component
2. Make sure you have either Text or Video in one unit, but not both.
3. Annotations are only allowed on Live/Public version and not Studio.

Added missing templates and fixed more of the quality errors

Fixed annotator not existing issue in cmd and tried to find the get_html() from the annotation module class to the descriptor

Added a space after # in comments

Fixed issue with an empty Module and token links

Added licenses and fixed vis naming scheme and location.
2014-01-27 13:47:58 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Calen Pennington
46109bb3e8 Use XBlock xml serialization and deserialization
XModules continue to use their own interface for xml, but provide an
adaptor that makes the the XBlock interface available.

[LMS-179]
2014-01-14 13:28:47 -05:00
Andy Armstrong
93675304da Add sorting to Studio's Files & Uploads page
Added sorting to the new pagination logic for STUD-995.
2014-01-08 10:35:40 -05:00
Andy Armstrong
f9c45586a4 Add pagination to Studio's Files and Uploads page
These changes implement STUD-813. The commit consists of the
following logical changes:
 - a REST API has been implemented for a course's assets
 - the page itself now fetches the assets client-side
 - the Backbone.Paginator library is used to support pagination
 - the AssetCollection has been refactored to extend
   Backbone.Paginator.requestPager so that it can be paged
 - an abstract PagingView class has been added to generalize
   the communication with a paging REST API
 - the AssetsView has been reimplemented to extend PagingView
 - two new child views have been added:
   - PagingHeader: the paging controls above the list of assets
   - PagingFooter: the paging controls below the assets
2014-01-05 23:35:12 -05:00
Don Mitchell
3f420e3d63 loc_mapper memoize all translations
STUD-1048
2013-12-16 11:43:28 -05:00
cahrens
ec55d8c1a9 Create explicit Locations.
STUD-1030
2013-12-11 10:03:34 -05:00
Don Mitchell
b5691cd4d1 Upgrade pymongo usage from deprecated connection to client
LMS-1551
2013-12-06 10:47:06 -05:00
David Baumgold
0d3490374e Refactor textbooks to use locator URLs
STUD-945
2013-12-05 13:13:28 -05:00
David Baumgold
d1f3e3a6b5 Merge pull request #1827 from edx/db/remove-mitx-from-features
settings.MITX_FEATURES => settings.FEATURES
2013-12-04 07:13:19 -08:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
cahrens
5fdfc60957 Change video transcripts to use locators instead of locations.
Part of STUD-870
2013-11-26 16:52:56 -05:00
Don Mitchell
7f91ce40ae Restful api for course advanced settings
STUD-948
2013-11-26 10:17:52 -05:00
cahrens
b5d72a38d3 Updates from code review. Includes backing out the
"as_published" changes I previously put in, as now we
are not adding @draft to locations converted from locators.
2013-11-25 13:55:33 -05:00
cahrens
50128cfb5c Convert edit_subsection, edit_unit, and publishing to RESTful URLs.
STUD-844
2013-11-25 13:55:33 -05:00
Don Mitchell
17864353a5 Restful course settings
STUD-946
STUD-947
2013-11-22 10:55:35 -05:00
Christina Roberts
3f44ff2f4b Merge pull request #1675 from edx/christina/tab-new
Convert tabs to use RESTful API
2013-11-21 07:39:31 -08:00
cahrens
1b2be30c45 Convert tabs to RESTful URL.
STUD-850
2013-11-21 10:19:43 -05:00
cahrens
d1c19cb563 Minor cleanup around public RESTful URLs.
STUD-849
2013-11-20 14:20:59 -05:00
cahrens
f01b36b5d4 Test for i4x on returned pages.
STUD-941
2013-11-20 12:48:24 -05:00
cahrens
e7c06e3ab1 Change preview view method to use RESTful URL.
STUD-848
2013-11-19 16:56:24 -05:00
cahrens
a170c6f4e7 Change save_item and create_item to RESTful URL.
Part of STUD-847.
2013-11-14 11:03:31 -05:00
Don Mitchell
99e7daf796 RESTful refactoring for course_info updates and handouts.
html page and update access use 2 different urls
GET update can get an individual update
STUD-944
2013-11-13 13:16:41 -05:00
cahrens
16766a5ee9 Change delete_item to RESTful URL.
Part of STUD-847.
2013-11-06 13:49:24 -05:00
cahrens
763ff9c818 Make export URL restful.
STUD-846
2013-10-30 15:24:42 -04:00
Don Mitchell
f41816637e RESTful refactoring of /course access continued
Move index access into the url
Move course creation into the url
Add helper methods for testing to serialize json data and set accept header.
2013-10-30 13:28:22 -04:00
Don Mitchell
80c83f0b88 Merge pull request #1508 from edx/dhm/expect_json
Change expect_json to put parsed json in new attr
2013-10-29 14:02:32 -07:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
cahrens
a9d1d4eefc Convert import to new URL pattern. 2013-10-29 15:33:22 -04:00
cahrens
39a8d07e47 Update URLs for assets. 2013-10-24 16:00:56 -04:00
cahrens
355ebd62e3 Convert course team management to new URL scheme.
Move RESTful URLs into our "done" section.
2013-10-24 14:01:24 -04:00
Christina Roberts
286ae9e73d Merge pull request #1470 from edx/christina/cleanup-course-index
Get rid of course_index shim.
2013-10-24 09:22:36 -07:00
cahrens
12488db015 Get rid of course_index shim. 2013-10-24 11:35:02 -04:00
Don Mitchell
3a6a9ee009 tighten case-insensitive test to require full string match 2013-10-24 11:24:37 -04:00
Don Mitchell
277f327690 Require course ids to be case-insensitively unique 2013-10-23 15:47:07 -04:00
Don Mitchell
8fe99a6be2 Revert "Revert "Merge pull request #1240 from edx/dhm/config_separation""
This reverts commit a517dc2085.
2013-10-18 09:22:30 -04:00
Carlos Andrés Rocha
15852cd816 Modify export_to_xml to take an optional contentstore and work with xml courses 2013-10-15 10:48:59 -04:00
John Jarvis
a517dc2085 Revert "Merge pull request #1240 from edx/dhm/config_separation"
This reverts commit ec01253e30, reversing
changes made to ae8c9710e5.
2013-10-10 13:14:08 -04:00
Christina Roberts
94ed3c6abb Merge pull request #1275 from edx/christina/delete-static-tabs
Delete unused static-pages.html.
2013-10-10 08:28:24 -07:00