Stephen Sanchez
|
ea11fd0751
|
Merge pull request #3684 from edx/ora2/release-2014-05-12T12.57
Release for May 12, 2014
|
2014-05-12 12:35:12 -04:00 |
|
Stephen Sanchez
|
3e13962930
|
Release for May 12, 2014
|
2014-05-12 11:39:55 -04:00 |
|
Anton Stupak
|
d37006c657
|
Merge pull request #3681 from edx/anton/fix-video-tests
Video: Fix acceptance tests.
|
2014-05-12 17:07:08 +03:00 |
|
polesye
|
2d64a2773f
|
Fix acceptance tests.
|
2014-05-12 16:22:05 +03:00 |
|
Anton Stupak
|
839887246c
|
Merge pull request #3643 from edx/anton/fix-video-in-ff
Anton/fix video in ff
|
2014-05-12 10:24:47 +03:00 |
|
David Ormsbee
|
77c7ebd704
|
Merge pull request #2768 from carsongee/cg/ssl-next-url
Modified ssl certificate authentication to handle next redirection
|
2014-05-11 20:12:12 -04:00 |
|
Sarina Canelake
|
b7003a1d76
|
Merge pull request #3672 from edx/sarina/fix-unicode
Remove unicode character inserted into video_xfields
|
2014-05-09 16:57:12 -04:00 |
|
ichuang
|
34c28cf42d
|
Merge pull request #3068 from edx/fix/ichuang/capa-customresponse-anonid
allow capa problems access to anonymous_student_id
|
2014-05-09 16:21:36 -04:00 |
|
David Baumgold
|
c0a5171c75
|
Merge pull request #3466 from lduarte1991/lduarte-harvardx
Reconnecting Token Generator for Annotation Tool
|
2014-05-09 16:14:42 -04:00 |
|
Sarina Canelake
|
22d17a21ec
|
Remove unicode character inserted into video_xfields
|
2014-05-09 15:25:56 -04:00 |
|
Andy Armstrong
|
a454502b63
|
Merge pull request #3666 from edx/andya/fix-translation-string
Improve the translatability of Studio's paging header
|
2014-05-09 15:16:11 -04:00 |
|
Carson Gee
|
74578cd720
|
Merge pull request #3493 from carsongee/cg/sysdash_git_info
Adding additonal path to search for git information on sysadmin dashboard
|
2014-05-09 15:14:10 -04:00 |
|
Sarina Canelake
|
193a816395
|
Merge pull request #3609 from edx/sarina/i18n-cleanup
Clarify strings for i18n
|
2014-05-09 15:00:36 -04:00 |
|
Dave St.Germain
|
eab8445eb1
|
Merge pull request #3156 from edx/dcs/LMS-1740
Fixes LMS-1740 by activating the zooming diagram with the spacebar.
|
2014-05-09 14:28:24 -04:00 |
|
Carson Gee
|
cbf525f6cf
|
Fix infinite redirect loop on logout caused by django caching
|
2014-05-09 14:22:11 -04:00 |
|
Carson Gee
|
5452de20d8
|
Modified ssl certificate authentication to handle next redirection
Makes small changes in lms and cms both so that user's go to the
original page they intended to if they weren't already logged in
|
2014-05-09 14:22:10 -04:00 |
|
Ned Batchelder
|
4ea3945d78
|
Merge pull request #3667 from edx/ned/more-links-in-pr-guidelines
Add more links in the PR guidelines.
|
2014-05-09 14:01:41 -04:00 |
|
Ned Batchelder
|
c7543dd33d
|
Add more links in the PR guidelines.
|
2014-05-09 13:53:16 -04:00 |
|
Andy Armstrong
|
e75f273329
|
Apply Sarina's code review suggestions
|
2014-05-09 13:39:17 -04:00 |
|
Carson Gee
|
379745e3a4
|
Merge pull request #2686 from edx/feature/ichuang/add-reset-links-to-staff-debug
add problem reset link to staff debug page
|
2014-05-09 13:29:29 -04:00 |
|
srpearce
|
d756b4a96d
|
Merge pull request #3617 from edx/sylvia/docs/DOC-359
Sylvia/docs/doc 359
|
2014-05-09 13:26:39 -04:00 |
|
Sylvia Pearce
|
28a2efeace
|
Add VitalSource information
|
2014-05-09 13:25:38 -04:00 |
|
srpearce
|
fa0e958b43
|
Merge pull request #3650 from edx/sylvia/docs/DOC-206
Sylvia/docs/doc 206
|
2014-05-09 12:38:05 -04:00 |
|
Sylvia Pearce
|
c1ef41fe6a
|
Update Video component UI text
|
2014-05-09 12:37:28 -04:00 |
|
Andy Armstrong
|
6d08a0b47b
|
Improve the translatability of the paging header
|
2014-05-09 12:07:49 -04:00 |
|
Mark Hoeber
|
dbb87e2609
|
Merge pull request #3663 from edx/markhoeber/documentation/doc-309
Note about course staff and discussion admin roles
|
2014-05-09 12:05:33 -04:00 |
|
Mark Hoeber
|
3a185b2656
|
Note about course staff and discussion admin roles
doc-309
|
2014-05-09 11:36:32 -04:00 |
|
Carson Gee
|
7c1e6d83e4
|
Fix message handling to be more internationalizable
|
2014-05-09 11:21:39 -04:00 |
|
Greg Price
|
8f90dd835d
|
Merge pull request #3653 from edx/gprice/discussion-link-command
Add command to get discussion_link for a course
|
2014-05-09 10:34:45 -04:00 |
|
Sarina Canelake
|
81a8bc39f6
|
Clarify strings for i18n
|
2014-05-09 10:23:46 -04:00 |
|
srpearce
|
f4d97ca55d
|
Merge pull request #3652 from edx/sylvia/docs/DOC-390
Fixed typos in example code for drag and drop problems
|
2014-05-09 09:51:30 -04:00 |
|
muhammad-ammar
|
50a99de6e1
|
Merge pull request #3634 from edx/ammar/bok-choy-video-tests-batch6
Bok-Choy Video Tests Batch6
|
2014-05-09 18:31:04 +05:00 |
|
Adam
|
efcd13e836
|
Merge pull request #3511 from edx/adam/wiki-hide-fix-firefox
fix wiki hide button not working in firefox (STUD-1581)
|
2014-05-09 07:04:03 -05:00 |
|
polesye
|
47ec168ea4
|
BLD-1057: Fix Video player in FF.
|
2014-05-09 15:00:18 +03:00 |
|
Waheed Ahmed
|
31f3ef0ab3
|
Merge pull request #3632 from edx/waheed/lms2617-verify-mode-none
Redirected to dashboard if course mode is none.
|
2014-05-09 16:37:54 +05:00 |
|
Waheed Ahmed
|
40a03ebb79
|
Redirected to dashboard if course mode is none.
LMS-2617
|
2014-05-09 15:34:26 +05:00 |
|
Muhammad Ammar
|
aa0e8041af
|
Bok-Choy Video Tests Batch6
|
2014-05-09 07:22:03 +00:00 |
|
Carson Gee
|
b3ec4d1b6b
|
Switching to new dashboard API and adding rescore to actions list
|
2014-05-08 19:03:14 -04:00 |
|
Greg Price
|
5e849bfb76
|
Add command to get discussion_link for a course
This will be used to detect courses that are linking to Stack Exchange
sites so we can handle them specially when generating data dumps.
|
2014-05-08 17:40:13 -04:00 |
|
Sylvia Pearce
|
91534bf0f0
|
Fixed typos in example code for drag and drop problems
|
2014-05-08 17:00:59 -04:00 |
|
Mark Hoeber
|
2d132e10eb
|
Merge pull request #3649 from edx/markhoeber/documentation/doc-344
Added warnings about file size
|
2014-05-08 15:54:53 -04:00 |
|
Mark Hoeber
|
95e1ee6e7b
|
Added warnings about file size
doc-344
|
2014-05-08 15:54:07 -04:00 |
|
David Baumgold
|
43b4a6b40e
|
Merge pull request #3646 from edx/db/mysql-python-upgrade
Upgrade mysql-python to 1.2.5
|
2014-05-08 14:36:55 -04:00 |
|
Jason Bau
|
78950bb501
|
Merge pull request #3566 from edx/jbau/django-1.4.12
Bump django 1.4 minor version to 1.4.12 to pick up patches
|
2014-05-08 11:06:38 -07:00 |
|
David Baumgold
|
175180d022
|
Upgrade mysql-python to 1.2.5
|
2014-05-08 13:19:01 -04:00 |
|
Carson Gee
|
c23a05b50d
|
Merge pull request #3213 from carsongee/cg/video_transcript_static
Add static fallback method for video transcripts
|
2014-05-08 11:51:04 -04:00 |
|
lduarte1991
|
edeebe7bea
|
Fixes from @singingwolfboy in PR #3466
|
2014-05-08 11:37:49 -04:00 |
|
David Baumgold
|
e1e87e1a15
|
Merge pull request #3570 from edx/db/pr-table-for-release
Make release table by PR, instead of by commit
|
2014-05-08 10:42:36 -04:00 |
|
Feanil Patel
|
1a9b505572
|
Merge pull request #3622 from edx/feanil/fix_enrollment_bug
Field name is 'username' not 'user'
|
2014-05-08 09:44:12 -04:00 |
|
muhammad-ammar
|
e3f3841bf8
|
Merge pull request #3518 from edx/ammar/bok-choy-video-tests-batch4
Bok-Choy video tests batch4
|
2014-05-08 18:23:19 +05:00 |
|