Commit Graph

3993 Commits

Author SHA1 Message Date
David Baumgold
bbec626651 first pass on a migrate_to_split Django command 2014-01-29 15:11:03 -05:00
David Baumgold
b25b3e1bef Move doc_url function out of edxmako middleware 2014-01-29 14:52:43 -05:00
Will Daly
eb55ed1930 Disable transcript test 2014-01-28 14:00:54 -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
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
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
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
chrisndodge
88391c7ec6 Merge pull request #2278 from edx/cdodge/session-inactivity-timeout
add middleware to be able to expire inactive sessions after N seconds
2014-01-24 08:25:24 -08: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
marcotuts
d8eaa881c3 Merge pull request #2276 from edx/studio/duplicate/visuals
Updates Studio's visual styling of action buttons on components and static pages
2014-01-24 07:34:03 -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
marco
68891e5a99 updated static pages tests to reflect html element change in component.html 2014-01-23 12:35:58 -05:00
polesye
645007f910 BLD-364: Merge "video sources" and "download video" fields. 2014-01-23 11:27:28 +02: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
Anton Stupak
2ef095d9b5 Merge pull request #2149 from edx/anton/video-download-transcript
Allows students to download the transcript of the video without timecodes
2014-01-22 12:03:41 -08:00
cahrens
3eb0018629 Make ordinal in duplication statement friendlier. 2014-01-22 14:11:23 -05:00
Andy Armstrong
89c2f4dd28 Implement a course outline REST API
STUD-1192
2014-01-22 12:00:26 -05:00
polesye
4a36fa892b BLD-368: Turn "download transcript" into a dropdown. 2014-01-22 18:25:03 +02:00
Calen Pennington
4d4288f418 Merge pull request #2249 from cpennington/non-ascii-course-images
Fix non-ascii course image names
2014-01-22 07:50:13 -08:00
cahrens
b5726a6889 Front-end work for duplicating components on the unit page.
STUD-1186
2014-01-22 10:43:51 -05:00
Valera Rozuvan
33031b76f4 Enable correct total time display in VCR for YouTube videos.
Before this, the VCR showed total time as 00:00:00 for YouTube
videos just after page loaded. The correct total time is shown only
after the user clicks Play button.

BLD-529.
2014-01-22 16:38:24 +02: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
Will Daly
8aa208e80d Disabled latex acceptance test 2014-01-21 15:01:36 -05:00
zubair-arbi
7bdcc84857 Merge pull request #2214 from zubair-arbi/zub/story/std1183-staticpagestest
enable tests depending on assert is_css_present(css_selector)
2014-01-21 06:50:27 -08:00
Don Mitchell
003ad76c64 Merge pull request #2209 from edx/db/lms_date_agnostic
Detached categories don't access control on date
2014-01-19 08:46:28 -08:00
Don Mitchell
d999d0af1b Detached categories don't access control on date 2014-01-17 17:53:14 -05:00
Carson Gee
207f3c585c Merge pull request #2196 from carsongee/cg/forum_roles_on_import_command
Adding missing forum permissions seeding routine to xml_import
2014-01-17 13:27:19 -08:00
Carson Gee
1e809a4210 Adding missing forum permissions seeding routine to xml_import
Currently if a course is only imported from the command line the
forum permissions are not seeded, this adds that functionality
Switched to doing seeding outside of xmodule library
Switched to using course_items
Switching to simpler test class
2014-01-17 15:17:48 -05:00
zubiar-arbi
dc570859da enable tests depending on assert is_css_present(css_selector)
STUD-1183
2014-01-17 21:11:17 +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
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
Ned Batchelder
1932c126b8 Rename DbModel to KvsFieldData. 2014-01-14 13:09:36 -05:00
Will Daly
7adb48c0f0 Disabled static pages and course team test seen to fail in master 2014-01-13 14:14:52 -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