Commit Graph

575 Commits

Author SHA1 Message Date
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
Jay Zoldak
4c21270f2e Merge branch 'release' 2014-02-20 16:29:06 -05:00
Jay Zoldak
3f4571ddd9 Disable course listing perf test 2014-02-20 14:43:11 -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
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
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
Christina Roberts
0c74d6ac54 Merge pull request #2562 from edx/christina/lms-mixed
Clean up of modulestore references (primarily LMS).
2014-02-13 20:05:31 -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
Chris Dodge
6e3fb86255 Fix bug where video files with periods in them would end up producing an incorrect transcript file 2014-02-13 08:58:48 -05:00
Christina Roberts
b0b8257eee Merge pull request #2543 from edx/christina/reference_bug
Rewrite Reference and ReferenceList fields on import
2014-02-12 16:07:37 -05:00
Ali Reza Sharafat
85058ec460 Course short descriptions -- couple of more asserts and pep8 fixes 2014-02-12 20:24:26 +00:00
cahrens
894c40b89d Change Reference and ReferenceList instances on import to new namespace.
STUD-149
2014-02-12 15:22:12 -05:00
cahrens
09d90b16af Clean up of modulestore references (primarly LMS).
STUD-1151
2014-02-11 14:29:22 -05:00
Christina Roberts
4f696586b3 Merge pull request #2466 from edx/christina/move-tests
Move tests related to views files into views/tests.
2014-02-10 17:06:10 -05:00
David Baumgold
a143309a22 Add unit tests to handle duplicate user registration attempts 2014-02-10 16:05:34 -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
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
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