Commit Graph

14265 Commits

Author SHA1 Message Date
Gabe Mulley
36269bd5a8 Integrate event-tracking in to the LMS
Support incremental conversion of events from the old API to the new, in order to ensure the new system is working, enrollment events have been modified to make use of the new API.
2014-05-01 14:04:35 -04:00
David Ormsbee
09bc765c6e Add admin.py for instructor_task.
This is primarily so that we can manually fail zombie instructor
tasks that are clogging up the queue for a course.
2014-05-01 09:50:07 -04:00
e0d
2bfb1b4a56 Merge branch 'release' 2014-04-30 14:42:27 -04:00
Jay Zoldak
5d371581f6 Disable unreliable test 2014-04-30 13:02:22 -04:00
Dave St.Germain
5811fdc84e Merge pull request #3506 from edx/dcs/LMS-2562
Set the page in the correct place.
2014-04-30 11:30:09 -04:00
Joe Blaylock
c5834eb6a2 Certs: pass course name on queue
Stanford had a problem a few times that certificate requests had
different values for the course display name and the course name printed
on the certificate and verification pages because of human error. This
passes the course display name on the queue to the certificate requests,
so that at least one place where the course name is reproduced (the
certificate agent's settings.py) can be eliminated.
2014-04-29 15:35:00 -07:00
Jason Bau
f8c062b6ce lti 2.0 result service rest endpoint 2014-04-29 12:01:12 -07:00
Dave St.Germain
14f2f67c78 Set the page in the correct place. 2014-04-28 17:01:03 -04:00
Adam Palay
8ad4cdb366 factor out google analytics ids (LMS-2555) 2014-04-28 16:47:17 -04:00
Adam
23ee963c4c Merge pull request #3476 from edx/usman/lms2556-wiki-urls
Fixed transform_url function in WikiAccessMiddleware.
2014-04-28 12:38:07 -04:00
Usman Khalid
f591b1db28 Fixed transform_url function in WikiAccessMiddleware.
In the current implementation if the path prefix contains the
wiki_path value it gets deleted. For example if the prefix is
'/courses/edx/math101/2014' and wiki_path is '101/' the final
prefix becomes '/courses/edx/math2014'.

LMS-2556
2014-04-28 20:33:01 +05:00
Muhammad Ammar
6f064e2b27 Configure youtube stub for bok-choy 2014-04-25 20:01:09 +00:00
David Baumgold
0a022e13ba Merge pull request #3371 from carsongee/cg/pdf_textbook_urls
Switch PDF Textbooks to use portable URLs
2014-04-25 13:46:28 -04:00
Usman Khalid
9d3ea699e6 Merge pull request #3455 from edx/usman/lms1466-email-formatting
Wraps long lines in bulk email messages.
2014-04-25 20:23:32 +05:00
Usman Khalid
8fd14bfca7 Wraps long lines in bulk email messages.
RFC 2822 states that line lengths in emails must be less than 998.
Some MTA's add newlines to messages if any line exceeds a certain
limit (the exact limit varies). Sendmail goes so far as to add
'!\n' after the 990th character in a line. To ensure that bulk
mail messages look consistent long lines are wrapped to a
conservative length.

LMS-1466
2014-04-25 18:25:20 +05:00
Jay Zoldak
490d2fef8f Disable flaky video test 2014-04-25 09:12:02 -04:00
Carson Gee
c4ea338035 Additional logic to handle more course_image URL edge cases
This changes logic to allow more missed use cases of course_image to
work properly.  The cases are:

. XML courses with the course_image attribute set
. Mongo courses that are imported without a contentstore
. Mongo courses that have course_image set but don't have a content store

It also exports default images_static_course.jpg to
images/static_course.jpg to handle a use case where a course author
uploaded an image to the default location in studio without using the
studio interface for adding course images, they then export the course, and then
import it without a contentstore
2014-04-24 16:54:40 -04:00
lduarte1991
5ae1ca9685 Reconnecting Token Generator for Annotation Tool 2014-04-24 16:14:05 -04:00
Greg Price
909903eb9c Merge pull request #3391 from edx/gprice/user-profile-pagination
Add pagination to forum user profile
2014-04-24 13:34:53 -04:00
Christine Lytwynec
ea3c48cf02 Removed trailing periods in two scenario names 2014-04-24 12:00:51 -04:00
Greg Price
0e59038c72 Add pagination to forum user profile page 2014-04-23 16:49:50 -04:00
Muhammad Ammar
1bbfbedb1f Bok-Choy video tests batch2 2014-04-23 14:37:26 -04:00
Valera Rozuvan
450dfe17b0 TESTS: Add tests for fix of end-time in the video player.
BLD-662
2014-04-23 18:44:10 +03:00
Waqas
442db0b4aa User doesn't exist in verify student banner toggle off view
LMS-2510
2014-04-23 15:36:56 +05:00
polesye
127bf7ed3f BLD-1000: Download handout. 2014-04-22 21:44:36 +03:00
Sarina Canelake
a52540c8ee Merge pull request #3397 from edx/sarina/lms-2551
Wording for batch beta email add with autoenroll (LMS-2551)
2014-04-22 09:34:08 -04:00
David Baumgold
c854ec5c3b Merge pull request #3366 from IONISx/missing-translations
Missing translations
2014-04-18 13:41:04 -04:00
Sarina Canelake
d408f174e3 Wording for batch beta email add with autoenroll (LMS-2551) 2014-04-18 10:13:19 -04:00
Sarina Canelake
1622216b58 Merge pull request #3084 from edx/sarina/improve-bulk-beta-add
Improve the batch beta tester add feature
2014-04-16 14:07:51 -04:00
Jim Abramson
8e0caa8935 Merge pull request #3355 from edx/jsa/user-profile-tests
django_comment_client/forum: add test coverage for user_profile view
2014-04-16 13:38:47 -04:00
Carson Gee
6136ed2e13 Switch PDF Textbooks to use portable URLs 2014-04-16 13:05:25 -04:00
jsa
0738b6c327 django_comment_client/forum: add test coverage for user_profile view
JIRA: FOR-496
2014-04-16 11:51:33 -04:00
Sarina Canelake
bddae213f6 Accept usernames in Batch Enrollment widget
Respond to pull request comments
2014-04-16 10:46:54 -04:00
Will Daly
84f63cd79e Merge pull request #3283 from edx/will/ora2-delete-student-state
Reset submission API scores in beta and legacy instructor dash
2014-04-16 10:17:41 -04:00
Will Daly
0b40354c12 Reset submission API scores in beta and legacy instructor dash 2014-04-16 09:25:53 -04:00
Sarina Canelake
ede21224a8 Add "Auto Enroll" option for bulk beta add 2014-04-16 09:20:23 -04:00
Sarina Canelake
4f38b69eba Allow batch beta enrollment by username 2014-04-16 09:20:23 -04:00
William Desloge
01e01555be Fix missing call to translate in shoppingcart model 2014-04-16 12:08:45 +02:00
Jay Zoldak
3fc19a35b0 Serve video HTML5 sources locally for acceptance tests 2014-04-15 10:40:53 -04:00
Dave St.Germain
ca14fba08b Merge pull request #3243 from edx/dcs/pdfbook-logging
Added analytics event logging to PDF book viewer
2014-04-14 17:56:26 -04:00
Dave St.Germain
1cf2696289 Added analytics event logging to PDF book viewer 2014-04-14 17:55:53 -04:00
Dave St.Germain
0a19c96a08 updated pdf viewer 2014-04-14 14:28:06 -04:00
Chris Dodge
27d7c19c40 Merge branch 'release'
Conflicts:
	cms/templates/widgets/source-edit.html
2014-04-14 14:17:03 -04:00
David Adams
28bf623490 Merge pull request #3240 from edx/dcadams/enhanced_metric_reporting
This makes the metrics tab "bars" clickable.
2014-04-14 09:42:33 -07:00
jmclaus
f05c0aa8f9 HD control is hidden initially. On first play of video, when
player.getAvailableQualityLevels returns a non-empty array, it will eventually display, if HD qualities are available (highres, hd1080, hd720). [BLD-937]
2014-04-14 10:26:30 -04:00
Valera Rozuvan
615ce23930 Update acceptance tests to use real duration of YouTube video. 2014-04-14 10:37:56 +03:00
Sarina Canelake
338a242e22 Fix course urls in enrollment emails (LMS-2217) 2014-04-11 18:43:43 -04:00
David Adams
0f37ee6924 This makes the metrics tab "bars" clickable.
Clicking on any of the bars displays a list of students for that
  particular action (either opened the subsection or attempted the
  problem).
  Students are listed for the sub-sections.
  Students, grade and percent are listed for the problems.
  The on-screen list displays only the first 250 students with
  an overflow message if there are more students than that.
  The csv download lists all students.
2014-04-11 13:56:49 -07:00
Anton Stupak
24b631f702 Merge pull request #3231 from edx/anton/refactor-speed-control
Video: Refactor speed control.
2014-04-11 19:38:04 +03:00
Greg Price
f233fcff4b Merge pull request #3307 from edx/gprice/deleted-thread-404
Return 404 instead of 500 for missing forum thread
2014-04-10 15:27:21 -04:00