Commit Graph

1201 Commits

Author SHA1 Message Date
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
751669cbe7 /create_account: use proper HTTP status codes
Use status code 400 when there is a validation error in creating an account.
2014-01-30 15:23:57 -05:00
chrisndodge
1b7e144beb Merge pull request #2331 from edx/chrisndodge/lock-accounts-after-failed-attempts
Ability to lock out accounts for N seconds after M failed login attempts
2014-01-30 07:34:06 -08:00
David Baumgold
08fb49506a Merge pull request #2302 from edx/db/django-command-migrate-to-split
Django command for migrating courses to split-mongo (and deleting)
2014-01-30 06:51:27 -08:00
Oleg Marshev
13c19c98e2 Add role parameter to LTI. BLD-583. 2014-01-30 14:37:33 +02:00
Chris Dodge
8c60f2935a Add optional feature to lock out accounts after N failed login attempts. Lockouts will last M seconds.
add DB migration and fix earlier mistakes in student migration history

add tests and fix bugs that came out of those unit tests

remove unused import

pep8/pylint

address some PR feedback

fix tests

fix broken test

try to mock time

use freeze-gun to overload the system time to simulate the future
2014-01-29 16:54:28 -05:00
David Baumgold
096088cc75 fix test failures: clear loc_mapper cache 2014-01-29 15:11:03 -05:00
Adam
52d8faf0cb Merge pull request #2187 from edx/adam/i18n-not-graded-2
Internationalize "Not Graded" on front end (STUD-989)
2014-01-27 12:23:07 -08:00
Adam Palay
e07c80e1e8 Internationalize "Not Graded" on front end (STUD-989)
change code-side "Not Graded" to "notgraded"
2014-01-27 14:16:34 -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
Chris Dodge
fcefada2d7 add middleware to be able to expire inactive sessions after N seconds
configure middleware

add test for session inactive timeouts

add Studio inactive session timeout test

change login method used

add create_test_account to test

make sure the expected redirect URL is right

fix indenting problem

fix doc string since we moved from minutes to seconds

use utility methods rather than calling another test to set up and activate an account

clean up code violations

respond to PR feedback

use optional params to make code cleaner

pylint fix on test files
2014-01-24 10:36:21 -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
Christina Roberts
4544d277e3 Merge pull request #2205 from edx/christina/duplicate
Front-end work for duplicating components on the unit page.
2014-01-22 12:25:18 -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
Calen Pennington
a6035698d5 Correctly compute course image location when using mongo modulestore
[LMS-2073]
[STUD-1197]
2014-01-22 07:17:40 -05:00
Calen Pennington
923c2ff46e Add failing tests for course image names
Tests LMS-2073 (non-ascii course image names) and STUD-1197 (spaces in
course image names)
2014-01-22 07:16:30 -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
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
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
cahrens
38c516e9e9 Fix bug about draft verticals reordering.
STUD-714
2014-01-13 09:25:16 -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
a07896dacc Set definition_locator on in-memory xblocks 2014-01-09 12:39:39 -05:00
Don Mitchell
bccae306db Merge pull request #2111 from edx/dhm/drop_contentstore
During testing: drop contentstore when cleaning up modulestore
2014-01-08 11:37:42 -08:00
Don Mitchell
81a5b36363 During testing: drop contentstore when cleaning up modulestore 2014-01-08 12:05:32 -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
David Baumgold
5d63cd0eb0 Merge pull request #2094 from edx/db/change-section-start-date
Set default section start date to Jan 1, 2030
2014-01-07 13:10:29 -08:00
David Baumgold
ce4b130113 Set default section start date to Jan 1, 2030
STUD-1072
2014-01-07 15:46:15 -05:00
Andy Armstrong
100ace64db Fix pagination test failures
Updated the pagination tests to no longer use the toy course, but to instead explicitly upload the assets it needs.

 Added a new AssetsTestCase base class to own shared helper methods.
2014-01-07 13:12:39 -05:00
Andy Armstrong
430cfd7563 Merge pull request #2096 from edx/andya/pagination-fix
Fix STUD-1129: handle out-of-range page numbers
2014-01-07 06:55:22 -08:00
zubair-arbi
f71688ce42 Merge pull request #2075 from zubair-arbi/zub/bugfix/std878-wrongcontenttype
Assign valid content_type to static resource (import_static_content)
2014-01-06 23:35:44 -08:00
Andy Armstrong
089c2a0302 Fix STUD-1129: handle out-of-range page numbers 2014-01-06 18:00:32 -05:00
zubiar-arbi
b998a161d2 Assign valid content_type to static resource (import_static_content)
STUD-878
2014-01-06 14:05:09 +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
Don Mitchell
a46e112a04 Improve test coverage
and fix found errors.
2013-12-20 10:44:01 -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
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
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
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