Commit Graph

7051 Commits

Author SHA1 Message Date
Carlos Andrés Rocha
4a0e5f66d6 Fix link in jobs page 2012-10-25 10:06:47 -04:00
Chris Dodge
fec6c42adc implement importing of course info sections as modules in the course 2012-10-24 20:55:04 -04:00
Carlos Andrés Rocha
e4daad4327 Update Job Page with new positions 2012-10-24 20:30:54 -04:00
David Ormsbee
ab676d9d6d Merge pull request #952 from MITx/vik/add_instrumentation
Vik/add instrumentation
2012-10-24 12:23:31 -07:00
Vik Paruchuri
dba04ab6d8 added docstrings 2012-10-24 15:14:06 -04:00
Vik Paruchuri
a75acffe01 made requested changes to statsd names, score bucket 2012-10-24 15:11:41 -04:00
Calen Pennington
2802302162 Make LMS access depend on which course run the access is occurring in, so that permissions can be based on the course run, rather than the whole course 2012-10-24 11:51:25 -04:00
Vik Paruchuri
952b3468cf pep8 in views, remove instance state check 2012-10-23 19:07:06 -04:00
Vik Paruchuri
7dec1b3c3f bugfix 2012-10-23 19:00:26 -04:00
Vik Paruchuri
57a78637f2 pep8 fixes and score bucketing 2012-10-23 18:58:11 -04:00
David Ormsbee
8ce20b5e0f Merge pull request #957 from MITx/fix/rocha/increase-upload-file-limit
Increase the limit of files that can be uploaded by a student
2012-10-23 15:16:15 -07:00
Vik Paruchuri
64b117a7c2 changed metric names, added into render page 2012-10-23 18:14:16 -04:00
Carlos Andrés Rocha
76ffbfc4a1 Increase the limit of files that can be uploaded by a student 2012-10-23 17:26:00 -04:00
Carlos Andrés Rocha
3e2cf18772 Add some extra console commands for handling user permissions 2012-10-23 16:11:07 -04:00
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
Calen Pennington
dab77e7d79 Switch to using staff group names that are only specified by org/course, rather than the full course_id 2012-10-23 13:40:50 -04:00
Calen Pennington
cac8e3453c Remove more remnants of askbot 2012-10-23 13:40:50 -04:00
Calen Pennington
ef1ba6d9f7 Remove leftover merge garbage 2012-10-23 13:40:34 -04:00
Calen Pennington
b52ed48221 Merge remote-tracking branch 'origin/master' into feature/cale/cms-master
Conflicts:
	common/lib/capa/capa/responsetypes.py
	common/lib/xmodule/xmodule/js/src/html/display.coffee
	lms/envs/common.py
2012-10-23 13:38:11 -04:00
Victor Shnayder
f50519ae48 Merge pull request #906 from MITx/victor/test-speedup
Victor/test speedup
2012-10-22 10:45:23 -07:00
Carlos Andrés Rocha
3784c3ce18 Add fix for users with multiple licenses 2012-10-22 10:27:17 -04:00
Carlos Andrés Rocha
f890c1dccb Use test database in licenses test instead of 6.002x 2012-10-19 17:55:55 -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
Carlos Andrés Rocha
2f7733ede0 Add Cengage book press release 2012-10-18 14:45:42 -04:00
David Ormsbee
ea8b9577ce Email wording changes based on Sarina's review 2012-10-18 14:28:15 -04:00
David Ormsbee
491f10d1bf Merge branch 'master' into feature/dave/email_bugfixes 2012-10-18 12:23:09 -04:00
David Ormsbee
dbfa7bf03a Change email change success notice to say email instead of name 2012-10-18 12:20:52 -04:00
Chris Dodge
554f179957 tie in 'forgot password' workflow in CAS LMS 2012-10-16 16:18:21 -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
e7c62b0fc6 Add migrations to license django application 2012-10-16 11:57:38 -04: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
Carlos Andrés Rocha
1efb9711c3 Removed obsolete information from site faq 2012-10-15 14:51:16 -04:00
Carlos Andrés Rocha
b121e620f8 Make small corrections to UT pages and announcement 2012-10-15 11:54:23 -04: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
Chris Dodge
a47b2be8df set position=0 when position=None. Discuss with Dave O. 2012-10-14 21:31:45 -04:00
Chris Dodge
4ac1a74117 when calling jump_to when location=<id-of-sequential> then Position is being computed as None. The redirect then yields a 404. Force Position to be 0 when Position=None 2012-10-14 21:29:00 -04:00