Louis Sobel
b1cfee4592
Add support for subtitle download link
...
Add a download link to the video player. The link is defined
in the content xml using the following structure:
<video youtube="youtubestring">
<track kind="subtitle" src="subtitle_link" />
</video>
2012-10-23 14:50:17 -04:00
Victor Shnayder
be947770c0
Merge pull request #917 from MITx/victor/make-problemset-sequential
...
Make problemset render as a sequential, not a vertical.
2012-10-23 10:30:52 -07:00
Victor Shnayder
f50519ae48
Merge pull request #906 from MITx/victor/test-speedup
...
Victor/test speedup
2012-10-22 10:45:23 -07:00
David Ormsbee
9a4e21c010
Merge pull request #943 from MITx/feature/rocha/dashboard-software-licenses
...
Add fix for users with multiple licenses
2012-10-22 07:29:24 -07:00
Carlos Andrés Rocha
3784c3ce18
Add fix for users with multiple licenses
2012-10-22 10:27:17 -04:00
bridger
853051bcc0
Merge pull request #941 from MITx/feature/rocha/dashboard-software-licenses
...
Use test database in licenses test instead of 6.002x
2012-10-19 15:42:00 -07:00
Carlos Andrés Rocha
f890c1dccb
Use test database in licenses test instead of 6.002x
2012-10-19 17:55:55 -04:00
Victor Shnayder
cda5e1a40e
Merge pull request #937 from MITx/victor/hotfix/unicode-in-code
...
Catch unicode errors in contextualize_text and deal with them.
2012-10-18 18:11:29 -07:00
Victor Shnayder
1806699f26
typos
2012-10-18 20:25:52 -04:00
Victor Shnayder
5177e8c656
Catch unicode errors in contextualize_text and deal with them.
2012-10-18 20:23:49 -04:00
David Ormsbee
2e03a4846c
Merge pull request #935 from MITx/feature/rocha/cengage-press-release
...
Add Cengage book press release
2012-10-18 11:55:02 -07:00
David Ormsbee
bb3046bdc7
Merge pull request #897 from MITx/feature/dave/email_bugfixes
...
Login/Profile changes
2012-10-18 11:54:35 -07:00
Carlos Andrés Rocha
2f7733ede0
Add Cengage book press release
2012-10-18 14:45:42 -04:00
David Ormsbee
9fbdeeb6c6
Send email change notice email to both old and new email addresses.
2012-10-18 14:36:52 -04:00
David Ormsbee
ea8b9577ce
Email wording changes based on Sarina's review
2012-10-18 14:28:15 -04:00
David Ormsbee
0dee2e9233
resend the same activation link instead of a new one when someone who is not active tries to log in
2012-10-18 13:33:14 -04:00
David Ormsbee
491f10d1bf
Merge branch 'master' into feature/dave/email_bugfixes
2012-10-18 12:23:09 -04:00
David Ormsbee
3385e06304
As per code review, added note that accept_name_change is no longer being used.
2012-10-18 12:22:44 -04:00
David Ormsbee
dbfa7bf03a
Change email change success notice to say email instead of name
2012-10-18 12:20:52 -04:00
Carlos Andrés Rocha
4cadbcc556
Merge pull request #920 from MITx/feature/rocha/ut-press-release
...
Removed obsolete information from site faq
2012-10-16 10:03:05 -07:00
Carlos Andrés Rocha
b479c85310
Change order of X Universities in the front page
2012-10-16 13:02:13 -04:00
Carlos Andrés Rocha
02a960e44c
Merge pull request #923 from MITx/feature/rocha/dashboard-software-licenses
...
Add migrations to license django application
2012-10-16 09:05:23 -07:00
Carlos Andrés Rocha
e7c62b0fc6
Add migrations to license django application
2012-10-16 11:57:38 -04:00
Victor Shnayder
f8f2e63ed4
Merge pull request #922 from MITx/feature/rocha/dashboard-software-licenses
...
Retrieve and assign course software licenses
2012-10-16 08:38:05 -07:00
arjun810
ca7476223a
Merge pull request #921 from MITx/kimth/fix-cr-show-answer
...
Fix CR showanswer template
2012-10-15 21:50:27 -07:00
Carlos Andrés Rocha
a8cedf8ab9
Update lms/djangoapps/licenses/views.py
...
Remove annoying print statements
2012-10-15 21:04:10 -03:00
Carlos Andrés Rocha
e9ec63e4b6
Add ajax endpoint to retrieve and assign course software licenses
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
3808ff85a8
Added django command to generate random serial numbers.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
9cf8c02dc6
Added import_serial_numbers command test.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
516c41f342
Added html view of serial numbers. Refactored code.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
b2de8199b7
Added licenses view helper functions.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
ed88708d71
Renamed models and commands for importing serial numbers.
2012-10-15 18:46:31 -04:00
Carlos Andrés Rocha
24d5c9162c
Created Django App with commands to import software license numbers per class.
2012-10-15 18:46:31 -04:00
kimth
57f49353d8
Fix CR showanswer template
2012-10-15 22:09:19 +00:00
Carlos Andrés Rocha
1efb9711c3
Removed obsolete information from site faq
2012-10-15 14:51:16 -04:00
Victor Shnayder
38bd83858b
Make problemset render as a sequential, not a vertical.
...
- Piotr requested this. Hopefully it doesn't break anything, but we should run it by the content fellows before merging.
2012-10-15 12:52:21 -04:00
Carlos Andrés Rocha
b269215951
Merge pull request #915 from MITx/feature/rocha/ut-press-release
...
Make small corrections to UT pages and announcement
2012-10-15 09:38:47 -07:00
Carlos Andrés Rocha
c23f44b6d4
Merge pull request #902 from MITx/hotfix/rocha/openid-sreg-return-only-username
...
Return only username on OpenID provider requests.
2012-10-15 09:29:20 -07:00
Carlos Andrés Rocha
f495f219cf
Update common/djangoapps/external_auth/views.py
...
Corrected comments on OpenID temporal fix
2012-10-15 13:28:54 -03:00
John Hess
a88a857723
Adjusted to return email address
...
Per update from CS50 team, their client will break if not given addresses.
2012-10-15 12:55:39 -03:00
Carlos Andrés Rocha
b121e620f8
Make small corrections to UT pages and announcement
2012-10-15 11:54:23 -04:00
jarv
0988810882
Merge pull request #907 from MITx/feature/rocha/ut-press-release
...
UT press release and related updates
2012-10-15 08:17:45 -07:00
Carlos Andrés Rocha
b13412d3b2
Make corrections of UT announcement
2012-10-15 11:12:35 -04:00
Carlos Andrés Rocha
40dd6fa105
Add missing text to FAQ
2012-10-15 07:16:13 -04:00
Carlos Andrés Rocha
516daa4710
Converted FAQ template to unix line endings
2012-10-15 06:58:39 -04:00
Carlos Andrés Rocha
c5a148639d
Add announcement of UT joining edx and related changes
2012-10-15 06:57:50 -04:00
Victor Shnayder
4bf9323eed
More test speedups:
...
- Add tasks to test lib without coverage
- Add a coverage flag to test.py (set to True, for manual tweaking for now)
2012-10-15 02:23:00 -04:00
Victor Shnayder
3f3df3fdb4
remove no-longer-used test dbs
2012-10-15 01:48:46 -04:00
Victor Shnayder
bc96203807
Use a faster hashing algorithm for testing
...
http://slacy.com/blog/2012/04/make-your-tests-faster-in-django-1-4/
rake fasttest_lms goes from 48 to 26 seconds.
2012-10-15 01:34:45 -04:00
Carlos Andrés Rocha
0f16e8a358
Return only username on OpenID provider requests.
...
Temporarily return username also as the email and fullname fields of
the response using OpenID's simple registration extension.
2012-10-14 19:45:22 -04:00
