Commit Graph

2681 Commits

Author SHA1 Message Date
David Ormsbee
459c5e322f Merge pull request #1024 from MITx/feature/dave/pearson_setup
Simple Pearson Testing
2012-11-07 16:29:29 -08:00
Carlos Andrés Rocha
25d482099e Merge pull request #955 from MITx/louis/srt_downloads
Add support for subtitle download link
2012-11-07 15:31:02 -08:00
David Ormsbee
ab0e7cf4ae Change AUTH_TOKENS index reference to a get so it doesn't explode the whole app if I did Puppet incorrectly. 2012-11-07 17:36:50 -05:00
David Ormsbee
4b02b2af2a Rearrange how we handle the auth tokens for our fake Pearson preliminary testing 2012-11-07 17:20:49 -05:00
David Ormsbee
528fcd7f4e Create a config option for enabling a Pearson login in a totally hacky manner. 2012-11-07 14:08:55 -05:00
David Ormsbee
92f2fbf0f8 Ugly, ugly hack needed so that Pearson can test something today, to be replaced by a real implementation later this week or early next. 2012-11-07 13:55:08 -05:00
David Ormsbee
53c5170dbc Simple PEP8 issues. 2012-11-06 18:14:57 -05:00
Calen Pennington
6212507b55 Merge pull request #1008 from MITx/ie8patch
merge to master
2012-11-06 06:18:01 -08:00
Don Mitchell
7f4bb63dff Final ie8 fixes hopefully. Now renders correctly for staff. Moved the
debug fns from per problem to part of courseware w/ context info passed
as parms. Known issues: ie8 complains that getlog is not defined if you
click on QA and does not show the debug info popup.
2012-11-05 13:55:09 -05:00
Carlos Andrés Rocha
31d3144532 Remove openings from job page 2012-11-05 10:23:58 -05:00
David Ormsbee
d1aa0a254e Use one of our test courses when testing course permissions for the discussion client, because we now have course policy level overrides. 2012-11-02 17:21:00 -04:00
Don Mitchell
afabb4ab16 Don't call fn before defined. [ie8 is only browser which seems to care.] 2012-11-02 14:25:25 -04:00
Carlos Andrés Rocha
32498f3468 Remove learning designer and producer openings from job page 2012-11-01 13:21:40 -04:00
David Ormsbee
8a453e99ca Implement basic ability to close off a forum for a given course such that Students can no longer post or edit, but can still view. 2012-11-01 04:37:16 -04:00
Victor Shnayder
e4c49f3a1e Merge pull request #1001 from MITx/feature/victor/inputtypes-refactor
Feature/victor/inputtypes refactor
2012-10-31 15:18:28 -07:00
David Ormsbee
5223e9d3ca Merge pull request #995 from MITx/features/rocha/google-analytics-for-course-pages
Add google analytics to course info pages
2012-10-30 13:48:36 -07:00
Carlos Andrés Rocha
8ec2c34ea5 Add google analytics to course info pages 2012-10-30 16:05:06 -04:00
Carlos Andrés Rocha
376dcb7982 Correct job description item 2012-10-30 15:44:28 -04:00
Victor Shnayder
a155265409 minor whitespace + comment fixes 2012-10-29 23:44:38 -04:00
Carlos Andrés Rocha
2db84a757e Update to learning designer job description 2012-10-25 12:43:57 -04:00
Carlos Andrés Rocha
4a0e5f66d6 Fix link in jobs page 2012-10-25 10:06:47 -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
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
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
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