Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,886 Commits 1 Branch 0 Tags
6d5e65c0bddd7ecf0f2f118d8ea025ca4e8cbc89
Commit Graph

25886 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
6d5e65c0bd Add explanation and small optimizations to languagetest 2014-09-24 12:36:52 -04:00
Waqas Khalid
f94c677a79 Merge pull request #5279 from mlkwaqas/waqas/tnl404-new-post-hidden-breadcrumb 
New post should show category/subcategory breadcrumb when created.
 2014-09-24 19:20:46 +05:00
Waqas Khalid
2c3cef75bc New post should show category/subcategory breadcrumb when created. 
When the new post is created under the subcategory and it appear
after the creation, it doesn't have the link of category/subcategory
after thread body. When we reload the page the link appears. Link
should appear after creation.

TNL-404
 2014-09-24 18:19:51 +05: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
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
aa5781c14c Merge pull request #5294 from edx/waheed/tnl235-fix-video-transcript-not-follow 
Fixed transcript not follow with video on seek.
 2014-09-24 14:16:15 +05:00
Waheed Ahmed
ca1da6c8ed Fixed transcript not follow with video on seek. 
TNL-235
 2014-09-24 13:08:50 +05:00
Clinton Blackburn
7e1b44663b Merge pull request #5352 from edx/insights-name-fix 
Properly Setting ANALYTICS_DASHBOARD_NAME for AWS
 2014-09-23 17:45:17 -04:00
Clinton Blackburn
3e9a5ecfd5 Properly Setting ANALYTICS_DASHBOARD_NAME for AWS 2014-09-23 16:21:31 -04:00
Sarina Canelake
4551244265 Merge pull request #5348 from edx/sarina/09232014-translations-update 
Update translations (autogenerated message)
 2014-09-23 15:59:47 -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
Sarina Canelake
701d709b65 Update translations (autogenerated message) 2014-09-23 15:41:41 -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
chrisndodge
c79a68486e Merge pull request #5306 from edx/cdodge/fix-delete-item-with-coupon 
be sure to constrain the select to the course_id that is being delete
 2014-09-23 13:46:14 -04:00
Jim Abramson
ad002f526b Merge pull request #5323 from edx/jsa/tnl444 
fix 404s when students access group-less threads in cohorted topics
 2014-09-23 13:10:17 -04:00
David Baumgold
15b8aa4b6c Merge pull request #3747 from edx/pmitros/sane-course-listing-order 
Puts course listings in a sane order
 2014-09-23 13:09:09 -04:00
frances botsford
4e1aa77b99 Merge pull request #5303 from edx/diana/update-prof-ed-flow 
Change some text when in professional ed flow
 2014-09-23 12:44:58 -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
Brian Talbot
1b25be655c revising markup and styling for listing header on LMS course dashboard 2014-09-23 12:02:30 -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
clytwynec
1e6084b960 Merge pull request #5331 from edx/clytwynec/disable_flaky_video_times_test 
disabling test_video_start_time_and_end_time
 2014-09-23 09:23:26 -04:00
Christine Lytwynec
2887121390 disabling test_video_start_time_and_end_time 2014-09-23 09:15:58 -04:00
Chris Dodge
60de9ba20a be sure to constrain the select to the course_id that is being delete 
wip
 2014-09-22 21:46:11 -04:00
Carlos Andrés Rocha
874c338175 Merge pull request #5316 from rocha/use-default-locale-in-openid-claim 
Use default locale to OpenID profile claims.
 2014-09-22 17:36:26 -04:00
Carlos Andrés Rocha
c35f4bf794 Merge pull request #5314 from rocha/configurable-oauth-enforce-secure 
Allow SSL enforcement for OAuth2 provider to be configurable
 2014-09-22 17:35:43 -04:00
Jason Bau
637f55414f capa custom response support for decimal grades 2014-09-22 13:27:46 -07:00
Frances Botsford
ef1ef98653 adjusting ID verified status to be just verified status 2014-09-22 16:10:23 -04:00
jsa
e00d3330fe fix 404s when students access group-less threads in cohorted topics 
TNL-444
 2014-09-22 15:22:10 -04:00
Carlos Andrés Rocha
5500cc6816 Use default locale to OpenID profile claims. 
If the user has not selected a default locale, then return the default one.
 2014-09-22 15:19:40 -04:00
Carlos Andrés Rocha
e04c6c2a48 Merge pull request #5315 from rocha/fix-fullname-in-oauth2-handler 
Return OpenID Connect user name from user profile.
 2014-09-22 15:14:15 -04:00
Mark Hoeber
c9357985a2 Merge pull request #5318 from edx/markhoeber-doc936 
Content experiments update
 2014-09-22 13:51:17 -04:00
Adam
ef525f288f Merge pull request #5295 from edx/adam/add-simple-help-modal-test 
add simple help-modal-test
 2014-09-22 13:17:47 -04:00
Mark Hoeber
7889585c48 Content experiments update 
comments from Anant
 2014-09-22 13:06:00 -04:00
Carlos Andrés Rocha
19f95f0053 Return OpenID Connect user name from user profile. 2014-09-22 11:34:10 -04:00
Carlos Andrés Rocha
37d604a90f Allow SSL enforcement for OAuth2 provider to be configurable 2014-09-22 10:47:20 -04:00
Adam Palay
5fa38cb59e add simple help-modal-test 2014-09-22 09:34:32 -04: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
Waheed Ahmed
03d9a6fd29 Merge pull request #5277 from edx/waheed/tnl413-fix-course-id-kwarg-on-merge-wiki 
Fixed wiki merge url regex.
 2014-09-22 16:22:53 +05:00
Waheed Ahmed
3e64faeaa3 Fixed wiki merge url regex. 
TNL-413
 2014-09-22 15:41:19 +05:00
Waheed Ahmed
f827c538fc Merge pull request #4460 from edx/waheed/lms6617-disable-student-view-if-course-is-not-released 
Disabled student view if course is not yet released for students.
 2014-09-22 13:25:58 +05:00