Commit Graph

9419 Commits

Author SHA1 Message Date
Sarina Canelake
fbd9cc1310 Merge pull request #5386 from open-craft/fix-anonymous-ids-unicode
Fix UnicodeError with anonymous student IDs
2014-09-25 16:43:18 -04:00
Andy Armstrong
0ed3a95d3a Merge branch 'release'
Conflicts:
	AUTHORS
	common/static/js/vendor/ova/OpenSeaDragonAnnotation.js
	common/test/acceptance/pages/lms/dashboard.py
2014-09-25 16:25:45 -04:00
Jesse Zoldak
77178e9fd0 Merge pull request #5378 from edx/zoldak/look-into-languagetest
Add explanation and small optimizations to LanguageTest
2014-09-25 12:17:14 -04:00
Julia Hansbrough
c5ae921dea Merge pull request #5328 from edx/flowerhack/auto-login
Automatically log in users who access third party login after trying to register for a course
2014-09-25 10:40:33 -04:00
Will Daly
afa39a862e Merge pull request #5383 from edx/will/account-and-profile-rebase
Add Django apps for student account and profile
2014-09-25 09:34:10 -04:00
Will Daly
7f8c6bb058 Add Django apps for student account and profile.
Add Python APIs for account/profile information to user_api
Updating profile page to have social linking

Authors: Renzo Lucioni, Alasdair Swan, Stephen Sanchez, Will Daly
2014-09-25 08:36:22 -04:00
Anton Stupak
85af48a31c Merge pull request #5276 from edx/anton/forums-topic
Change the topic of a previously posted post.
2014-09-25 10:58:09 +03:00
Braden MacDonald
8e32672228 Fix UnicodeError with anonymous student IDs 2014-09-24 20:17:47 -07:00
John Eskew
fcf57a8e0d Merge pull request #5370 from edx/jeskew/wrap_studio_views_in_bulk_ops
Wrap studio views in bulk operations to minimize mongo calls.
2014-09-24 20:41:33 -04:00
Julia Hansbrough
6b061ad23b Response to CR 2014-09-24 21:20:49 +00:00
John Eskew
2f06073306 Pass _get_course_module() depth param down into modulestore get_course() instead of hard-coded zero. 2014-09-24 16:23:30 -04:00
Sarina Canelake
752570832c Merge pull request #5381 from edx/sarina/annotations-fix
Image Annotation Tool: Fixes _isOpenSeaDragon function
2014-09-24 14:27:17 -04:00
Andy Armstrong
74fb8e93ed Merge pull request #5382 from edx/revert-5380-revert-5359-cdodge/add-microsite-tag-to-zendesk
Revert "Revert "add an additional tag so we can route zendesk tickets be...
2014-09-24 14:21:41 -04:00
polesye
00c7e60e07 TNL-171: Change topic of a previously posted post. 2014-09-24 20:28:14 +03:00
Julia Hansbrough
5d5ff8d9c1 Docs 2014-09-24 17:24:42 +00:00
Julia Hansbrough
3fbbe57cef Add auto-registration to third party login flow 2014-09-24 17:24:42 +00:00
Julia Hansbrough
5b3c69bc87 Tests fixed 2014-09-24 17:24:42 +00:00
Julia Hansbrough
4d77b0552f Move server-side validation to enroll method 2014-09-24 17:23:25 +00:00
chrisndodge
c928252b5a Revert "Revert "add an additional tag so we can route zendesk tickets better for..." 2014-09-24 13:19:51 -04:00
lduarte1991
d3fffde3a0 Image Annotation Tool: Fixes _isOpenSeaDragon function 2014-09-24 13:12:31 -04:00
Sarina Canelake
3cdfdae8bb Merge pull request #5305 from lduarte1991/lduarte-harvardx-pr28
Fixes check for Image Annotation Tool to include ID from image server and fix scrolling bug
2014-09-24 13:10:50 -04:00
Paul Medlock-Walton
b797c6bd09 username and email request for lti module
allow username and email can be passed to a lti third party app
ask user permission when lti button is clicked
allow course editor to customize text on lti launch button
2014-09-24 20:05:42 +03:00
chrisndodge
21933bfbd7 Revert "add an additional tag so we can route zendesk tickets better for white l..." 2014-09-24 12:46:05 -04:00
Jesse Zoldak
6d5e65c0bd Add explanation and small optimizations to languagetest 2014-09-24 12:36:52 -04:00
lduarte1991
29cddbca2c Annotation Tools: Non-critical highlights == undefined fixes
i.e. they should be fixed but don’t cause the whole thing to break.

 - PR fixes

 - Reverted Fix
2014-09-24 11:21:53 -04:00
zubair-arbi
c7418a306c Merge pull request #5240 from edx/zub/bugfix/tnl-324-downloadvideoexportimport
Don't set 'download_video' field on importing video from xml until expli...
2014-09-24 18:12:10 +05:00
chrisndodge
7b88863b4d Merge pull request #5359 from edx/cdodge/add-microsite-tag-to-zendesk
add an additional tag so we can route zendesk tickets better for white l...
2014-09-24 08:52:43 -04:00
Waqas Khalid
298ad30a22 Merge pull request #5142 from mlkwaqas/waqas/tnl150-stop-comment--on-closed-thread
Don't allow commenting while the thread is closed
2014-09-24 17:51:17 +05:00
Waqas Khalid
fcf46546c3 Don't allow commenting while the thread is closed
When someone closes thread there is still option to add
comment which cause error when submitted. User shouldn't
be able to comment while the thread is closed.

TNL-150
2014-09-24 15:28:34 +05:00
Waheed Ahmed
ca1da6c8ed Fixed transcript not follow with video on seek.
TNL-235
2014-09-24 13:08:50 +05:00
David Baumgold
9542b0a885 Revert "Puts course listings in a sane order"
This reverts commit 1955aade36675289bdbc01554b6f74242754a746.
2014-09-23 18:45:59 -04:00
Andy Armstrong
fe6668a550 Merge branch 'release'
Conflicts:
	common/lib/xmodule/xmodule/video_module/video_module.py
	requirements/edx/github.txt
2014-09-23 15:53:10 -04:00
Chris Dodge
e08040aa75 add an additional tag so we can route zendesk tickets better for white label sites
add tests

fix

use org
2014-09-23 15:39:21 -04:00
Usman Khalid
ed84c1b27a Merge pull request #5246 from edx/usman/plat104-static-content-server
Improvements to byte range handling in StaticContentServer.
2014-09-24 00:15:46 +05:00
Usman Khalid
44f952daf5 Merge pull request #5293 from edx/usman/tnl388-invalid-xml-in-code-response
If matlab grader sent unparsable response, show error message.
2014-09-24 00:14:34 +05:00
Adam
96ac506f6f Merge pull request #5296 from edx/adam/hide-very-long-answers
keep large answers from appearing (TNL-441)
2014-09-23 14:01:03 -04:00
lduarte1991
b7313d6d2e Annotation Tools: Pylint Fix left over from previous PR 2014-09-23 13:03:48 -04:00
lduarte1991
5634096825 Image Annotation Tool: Fixes _isOpenSeaDragon function 2014-09-23 13:03:48 -04:00
Usman Khalid
5af162ebdf Refactored ContentServer tests to use ddt.
PLAT-104
2014-09-23 21:36:46 +05:00
Usman Khalid
7e29a5a65c Added tests for parse_range_header() in contentserver.
PLAT-104
2014-09-23 21:36:45 +05:00
Usman Khalid
ec508f591c StaticContentServer middleware conforms closer to spec for byte range requests.
This commit makes the following changes:
1. If there are syntactic errors in the Range header, it is ignored and
the full content is returned. This conforms to the spec.
2. In case of multiple ranges in the header, the full content is returned.
This behavior differs from the spec which says that a multipart response
should be returned.

PLAT-104
2014-09-23 21:36:45 +05:00
David Ormsbee
4f5d8b30de Basic Mobile API (v0.5) and Video Abstraction Layer integration.
Note that the features in this release are opt-in, and course and video
behavior will remain the same unless a course explicitly opts in.

Major pieces of functionality with this commit:

Allows the listing of a user's enrollments, course videos, and updates. In
order to make a course available for mobile use, course staff must explicitly
set the Course Advanced Setting "Mobile Course Available" to true. Course staff
will always see their own courses through the Mobile API regardless of this
setting, but students will only be allowed to see a course through the Mobile
API if this setting is set to "true". By default, a Course will *not* be
available for mobile use.

This is a Django app for video resource management. It is completely optional,
and is intended to allow video and operations teams to create new encodings of
videos (e.g. low res for mobile) and change CDNs without having to edit course
data directly. Course teams can now use a "EdX Video ID" setting for Videos,
which will leverage VAL. Video units that do not fill in an "EdX Video ID" will
behave exactly as they always have.

* The Mobile API is enabled with the ENABLE_MOBILE_REST_API feature flag.
* VAL is enabled with the ENABLE_VIDEO_ABSTRACTION_LAYER_API feature flag.
* VAL and the Mobile API both require ENABLE_OAUTH2_PROVIDER).
* The Mobile API is a read-only API, but VAL requires database migrations.
* Applications that make use of either the Mobile API or VAL must be registered
  with the OAuth2 provider app in Django Admin.
2014-09-23 12:31:46 -04:00
David Baumgold
9f6454411e Update tests for changed text 2014-09-23 12:02:31 -04:00
David Baumgold
c0a25da964 Skip invalid test when in CMS 2014-09-23 12:02:31 -04:00
Piotr Mitros
19356ffd4b Puts course listings in a sane order 2014-09-23 12:02:30 -04:00
Jason Bau
83c54d4e6e Merge pull request #5048 from Stanford-Online/jbau/edx/custom-response-fractional-grades
capa custom response support for decimal grades
2014-09-23 06:49:13 -07:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
Jason Bau
637f55414f capa custom response support for decimal grades 2014-09-22 13:27:46 -07:00
Usman Khalid
ea032c58ca If matlab grader sent unparsable response, show error message
instead of trying to render the response.

TNL-388
2014-09-22 16:38:05 +05:00
Usman Khalid
87d135a40c Added tests for unparsable matlab grader response.
TNL-388
2014-09-22 16:38:05 +05:00