Commit Graph

1274 Commits

Author SHA1 Message Date
Don Mitchell
14be0b6c7a Cache course location translations 2014-01-28 10:34:31 -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
Don Mitchell
98eecf1369 Merge pull request #2244 from edx/dhm/role_package_id
Create mapping for previously unmapped locations in order to get
2014-01-22 14:01:42 -08:00
Don Mitchell
9d6ed66e24 Add loc mapper fn from locn to CourseLocator 2014-01-22 11:49:03 -05:00
Valera Rozuvan
b6e5db02ee Addressing comments for PR 2176.
BLD-529.
2014-01-22 16:39:00 +02: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
David Ormsbee
42e0ec403e Merge pull request #2251 from edx/release
Merging Release 2014-01-21
2014-01-21 12:41:05 -08:00
Don Mitchell
32e0021260 Create mapping for previously unmapped locations in order to get
course_id

STUD-1212
2014-01-21 13:10:07 -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
Chris Dodge
c9718380ea catch additional FEATURE['ENABLE_MKTG_SITE'] checks and make sure MicrositeConfigurations will override the global setting
one more faulty login regarding ENABLE_MKTG_SITE=true situations
2014-01-16 17:04:17 -05:00
David Ormsbee
a18bce81f2 Basic cleanup of code to determine whether a user has a LinkedIn account. 2014-01-16 17:03:15 -05:00
David Baumgold
7928535b7b Add function to generate documentation links
STUD-1090
2014-01-16 14:11:15 -05: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
Will Daly
ca180834dc Merge pull request #2128 from edx/will/bok-choy-fixtures-rebase
Bok-choy fixtures, Studio tests, and (some) ORA tests
2014-01-15 12:18:47 -08:00
jsa
dfa4a03daa i18n: externalize strings in discussion forums templates and python code.
JIRA: FOR-398, FOR-399
2014-01-15 14:26:22 -05:00
Don Mitchell
7e02951571 Merge pull request #2064 from edx/dhm/auth_consolidate
Replace authz with roles.py and reconcile their behaviors
2014-01-15 07:21:03 -08:00
Will Daly
4afd5ea49f Refactored bok-choy directory structure
Added fixtures for course and xblock creation
Added bok-choy Studio tests
Added bok-choy tests for ora self- and ai- assessment
Refactored auto-auth; added staff and course-enrollment options
Removed extra javascript properties from page objects
2014-01-15 09:37:32 -05:00
Julia Hansbrough
f3f0e8a514 Merge pull request #1888 from edx/flowerhack/feature/certificate-revenue-reporting
Verified Certificate Reports
2014-01-15 06:18:17 -08:00
Julia Hansbrough
ea0ae11171 Response to CR 1-14 2014-01-15 00:27:14 +00: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
Don Mitchell
858e354a6d Moved roles.py to common student 2014-01-14 17:04:43 -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
Feanil Patel
a86086b771 Merge pull request #2041 from edx/feanil/transfer_students
Add a command to transfer students from one course to another.
2014-01-13 08:30:51 -08:00
Julia Hansbrough
f2b0394211 CR response 2014-01-13 15:57:14 +00:00
Feanil Patel
16d6d23fbc Save state before unenrolling student from old course. 2014-01-10 14:16:04 -05:00
Feanil Patel
1be33651b0 CertificateItems should be updated for all course students.
Not just students that are currently active.  Students may have enrolled with verified certs, paid, gotten
a refund, and un-enrolled from the original course.  This function should now capture that.
2014-01-10 13:18:39 -05:00
Will Daly
4a3cffbb3f Merge pull request #2131 from edx/db/fix-theme-name-issues
Fix theme issues in Sass preprocessing
2014-01-10 08:03:23 -08:00
David Baumgold
85453f703e Fix theme issues in Sass preprocessing 2014-01-10 10:40:09 -05:00
Feanil Patel
7d9b6a55dd Add a command to transfer students from one course to another.
Move only active students and also update cert item for verified students.
2014-01-08 16:39:24 -05:00
Brian Wilson
21a4520b8c Remove output of management command options and args from tracking logs. 2014-01-06 12:53:56 -05:00
Brian Wilson
1aefe2f5bf Define TrackedCommand for use as base class for tracking management commands. Use in create_user command. 2014-01-06 12:43:04 -05:00
Julia Hansbrough
95affba643 More response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
99e8596fea Response to CR 2014-01-06 15:53:28 +00:00
Julia Hansbrough
edd0b5436e Response to CR 2014-01-06 15:53:28 +00:00
Brian Wilson
7e31c95c45 Modify server_track to handle being called without a request. 2014-01-05 22:58:10 -05:00
Calen Pennington
a0b8577ac3 Merge pull request #1988 from cpennington/annotation-module-acceptance-tests
Add acceptance tests of Annotatable module
2013-12-20 11:00:41 -08:00
Calen Pennington
77942cecef Don't create more factory subclasses, just absorb the classes directly 2013-12-20 12:32:14 -05:00
e0d
86e3391b41 fixing merge conflict from release 2013-12-19 16:34:25 -05:00
Will Daly
1081786c6f Merge pull request #1965 from edx/will/fake-server-refactor
Stub Server Port Conflicts and Refactor
2013-12-19 06:55:24 -08:00
Will Daly
0fd03cfb02 Moved stub servers to terrain
Refactored stub services for style and DRY

Added unit tests for stub implementations

Updated acceptance tests that depend on stubs.

Updated Studio acceptance tests to use YouTube stub server; fixed failing tests in devstack.
2013-12-19 09:12:41 -05:00
Julia Hansbrough
0d91e61e60 Added flag for lms-specific functionality
Studio doesn't do email changes, thus has no email reset template; thus, we must disable password/email-reset related tests when running with studio settings
2013-12-18 14:18:12 -05:00
Julia Hansbrough
f351b05031 Fixing email link injection bug
Several templates used a variable set by the user (the request host header).  This led to a vulnerability where an attacker could inject their domain name into these templates (i.e., activation emails).  This patch fixes this vulnerability.

LMS-532
2013-12-18 13:38:36 -05:00
Calen Pennington
1d0ce64b10 Update to the latest version of lettuce 2013-12-17 13:18:22 -05:00
Oleg Marshev
cc2e4bfeae Fix lis_outcome_service_url sending. 2013-12-17 18:53:21 +02:00
Alexander Kryklia
946c615047 Merge pull request #1859 from edx/oleg/fix_outcome_url_sending
Make LTI module not send grade_back_url if has_score=False
2013-12-17 08:14:42 -08:00
Oleg Marshev
59d18134b2 Fix lis_outcome_service_url sending. 2013-12-17 17:33:02 +02:00
Carson Gee
cbb6e5e686 Changed default user to be anonymous in both has_access and student.views.index
Replaced existing test_none_user_index_access_with_startdate_fails
test with new test now that the tested function has changed and
was causing the original test to fail.
2013-12-15 09:56:37 -05:00
Diana Huang
6952aec870 Merge pull request #1941 from edx/diana/openid-fullname
Return the full name of the student as part of the OpenId response.
2013-12-13 07:32:34 -08:00