Commit Graph

180 Commits

Author SHA1 Message Date
Andy Armstrong
7770d9d427 Implement editing from the Studio container page.
STUD-1306
2014-04-09 10:32:11 -04:00
Piotr Mitros
5f9ef9a402 Concept added to Studio advanced components 2014-03-26 16:37:45 -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
cahrens
1453a86122 Minor code cleanup. 2014-03-13 11:57:30 -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
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
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
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
Calen Pennington
9126777ed7 Add test of local_resource_url in AcidBlock 2014-02-25 14:01:37 -05:00
Ned Batchelder
229f3522fa Move date_utils to common/djangoapps/util 2014-02-18 17:35:56 -05:00
Jay Zoldak
bc30addfb9 Unicode changes to support QRF
fixing unit tests

fixing merge error

fixing xqueue submission issue with unicode url (trial 0.1)

fixing fotmats as commented upon

removing yaml file language selection

Unicode changes to support QRF

removed unnecessary pass in modulestore/init.py

fixing merge error

fixing fotmats as commented upon

removing yaml file language selection

fixing pep8 violations

- fixing pylint violations

pylint violation

fixing line spaces and formats

ignore pylint E1101

remove empty line

fixing pylint violations

 pep8 violations

bulk mail unicode/decode

fix migration error

fix pep8 just to push again

more unicode/decode
Final changes to comments and error messages.
2014-01-30 16:20:36 -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
417fe21d05 Enable pure XBlocks, but behind a feature flag
[LMS-226]
[LMS-2013]
2014-01-10 11:40:03 -05:00
Don Mitchell
f5f24fcc12 Merge pull request #2022 from edx/dhm/locator_course_id
Change course_id to package_id
2013-12-23 11:15:48 -08:00
Don Mitchell
b7368ef69a Change course_id to package_id
on new Locators to make it clear that they have a different syntax
than Location.course_id altho they represent the same info.
2013-12-20 16:16:50 -05:00
Calen Pennington
aa57481ecc Add handler_url usable by descriptors
[LMS-1614]
2013-12-20 14:05:53 -05:00
Don Mitchell
b776590226 Rename BlockUsageLocator's block_id field from usage_id
usage_id implies self-sufficiency. The block_id is relative to its structure.
2013-12-17 12:15:32 -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
Christina Roberts
2682a14d43 Merge pull request #1790 from edx/christina/transcripts
Change video transcripts to use locators instead of locations.
2013-12-04 06:41:44 -08:00
David Baumgold
f3f4af8087 settings.MITX_FEATURES => settings.FEATURES 2013-12-03 15:34:55 -05:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -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
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
7ab31f5478 Merge pull request #1710 from edx/dhm/restful_settings
Restful course settings
2013-11-22 08:23:12 -08:00
Don Mitchell
17864353a5 Restful course settings
STUD-946
STUD-947
2013-11-22 10:55:35 -05:00
Александр
3bbc7430f2 BLD-530: Fix 500 error in transcripts. 2013-11-22 10:06:03 +02: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
Alexander Kryklia
b5bf4b7500 Enable latex problems via key in course.settings.
BLD-426
2013-11-04 12:13:23 +02:00
Don Mitchell
45453fae61 Change expect_json to put parsed json in new attr 2013-10-29 16:13:58 -04:00
Ned Batchelder
25a027475d Rename contentstore/views/requests to helpers
This has caused confusion, since this file gets imported when trying to
import the requests library.  And besides, how was this file about
requests in the first place?  Helpers is a much better name.
2013-10-15 15:53:48 -04:00
Valera Rozuvan
d02ef8bc12 Add Learning Tools Interoperability (LTI) blade.
LTI blade allows to include LTI components to courses.
Python integration, Jasmine and acceptance tests are included.
2013-09-09 23:54:49 +03:00
Alexander Kryklia
719ec8f9d8 Revert "Merge pull request #804 from edx/valera/lti_module"
This reverts commit 2894b21c32, reversing
changes made to 34d0fe1554.
2013-09-09 22:51:57 +03:00
Alexander Kryklia
7b637d49d6 Add comma in last item of list. 2013-09-09 19:16:15 +03:00
Valera Rozuvan
417ddcaaa1 LTI module with tests 2013-09-09 19:13:20 +03:00
Calen Pennington
38de05c76c Include mixins in advanced component class loading and preview modules 2013-09-06 13:37:03 -04:00
Don Mitchell
b81e5504db Fix pylint and typos 2013-09-06 12:19:51 -04:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
Julian Arni
80619da429 Review fixes 2013-08-15 10:24:38 -04:00