Commit Graph

350 Commits

Author SHA1 Message Date
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
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Christina Roberts
cd7f1d92a1 Merge pull request #2299 from lduarte1991/master
Text and Video Annotation Modules - First Iteration
2014-01-27 11:18:32 -08: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
Giulio Gratta
78c85ea3b2 Merge pull request #2308 from edx/giulio/fix-error-msg-typo
Fixed all instances of "occured" typo
2014-01-27 10:46:13 -08:00
polesye
b8eba4192c BLD-699: Fix i18n. 2014-01-27 07:49:22 +02:00
Giulio Gratta
0429ba7da3 Fixed all instances of "occured" typo 2014-01-24 16:13:26 -08:00
Sarina Canelake
623c985d38 Merge pull request #2286 from edx/sarina/i19-xmodules
i18n xmodule/course_module.py
2014-01-24 03:31:47 -08:00
Sarina Canelake
f88c108527 i18n xmodule/course_module.py
LMS-1747
2014-01-23 15:05:05 -05:00
Andy Armstrong
de548fbf6c Merge pull request #2216 from edx/andya/move-service
Implement a course outline REST API
2014-01-22 13:10:10 -08:00
Andy Armstrong
89c2f4dd28 Implement a course outline REST API
STUD-1192
2014-01-22 12:00:26 -05:00
cahrens
b5726a6889 Front-end work for duplicating components on the unit page.
STUD-1186
2014-01-22 10:43:51 -05:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Christina Roberts
a3d22097b9 Merge pull request #2182 from edx/christina/duplicate
Support duplicating an existing xblock to a supplied parent location.
2014-01-16 11:04:39 -08:00
Don Mitchell
3885e6cf78 Merge branch 'release'
Conflicts:
	lms/templates/help_modal.html
	lms/templates/index.html
2014-01-16 12:51:22 -05:00
cahrens
81fecf3e6c Duplicate children so as to not create a DAG. 2014-01-16 11:24:35 -05:00
cahrens
0d8d7cb393 Support duplicating an existing xblock to a supplied parent location.
STUD-1190
2014-01-15 14:36:40 -05:00
Don Mitchell
ad3140a6e6 Cleaned up modules to reflect centralizing auth 2014-01-14 17:04:44 -05:00
Don Mitchell
3ebac80778 Replace authz fns with roles.py ones
STUD-1006
2014-01-14 17:04:44 -05:00
Chris Dodge
a3211a7405 Introduction of the Microsite feature which allows for limited multi-tenant branding on a subdomain basis, e.g. foo.edx.org and bar.edx.org
fix errorenous logic when running a microsite that could reside in a hosting environment with a marketing site in front of it

pep8/pylint fixes

address PR feedback, remove underscore from test hostname

more pep8/pylint cleanup. Skip test_microsites test, it works on localdev, not on Jenkins. Need to talk with QA team

manually add Ned's single-to-double quote fix

change aws.py runtimes so that the microsite_dir that is read from configuration is changed to a python path

Conflicts:
	lms/templates/help_modal.html
2014-01-14 14:36:01 -05:00
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -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
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
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -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
Gabe Mulley
b9096b1bb5 prevent failure when module does not have a data field 2014-01-03 10:49:00 -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
Christina Roberts
3c0df16b0c Merge pull request #2004 from edx/christina/fix-thumbnail-warning
Properly format errors/warnings.
2013-12-20 10:11:12 -08:00
cahrens
65756bbf94 Properly format errors/warnings.
STUD-1063
2013-12-19 16:52:20 -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
Don Mitchell
3cf75198c5 Merge pull request #1954 from edx/dhm/loc_mapper_memoize
loc mapper memoize
2013-12-16 10:34:12 -08:00
David Baumgold
3d2ad59c51 Merge pull request #1907 from edx/db/whitespace-fixes
whitespace-only changes
2013-12-13 11:40:54 -08:00
Don Mitchell
3bd76f98e9 Use mongo indices for all queries
STUD-1039
2013-12-13 14:34:34 -05:00
Christina Roberts
17b5c2126c Merge pull request #1910 from edx/christina/locations
Create explicit Locations.
2013-12-13 09:18:21 -08:00
cahrens
ec55d8c1a9 Create explicit Locations.
STUD-1030
2013-12-11 10:03:34 -05:00
David Baumgold
28f22393bf whitespace-only changes 2013-12-10 11:45:49 -05:00
Calen Pennington
137c54b2c7 Add debug logging of exceptions that happen during rending of studio_view or student_view in Studio 2013-12-09 16:27:49 -05:00
David Baumgold
d8103d4377 course.save() is no longer necessary 2013-12-05 13:21:55 -05:00
David Baumgold
c93198235e Pass PDF textbooks to template separately 2013-12-05 13:19:00 -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
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
69899e24df Merge pull request #1823 from edx/db/mitxmako-edxmako
mitxmako => edxmako
2013-12-03 11:36:50 -08:00
David Baumgold
8eff442752 mitxmako => edxmako 2013-12-03 14:15:09 -05:00
Don Mitchell
9dc68b03a0 Improve auth handling of Locators
Ensure user admin screen gets the union of all possibly matching group names.
Smarter default group naming.
STUD-1003
2013-12-02 15:28:22 -05:00
Ned Batchelder
c8a7b259ff Resolve conflicts merging master to rc/2013-11-21 2013-11-27 11:55:44 -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