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
Chris Dodge
34c442a1dc
removed unneeded trace log. Also don't need StudentModuleCache in 'about' section rendering
2012-10-30 16:04:51 -04:00
Chris Dodge
f0b4371c90
addressed Cale's feedback
2012-10-30 16:01:28 -04:00
Calen Pennington
6221baf3e5
Use TEST_ROOT log directory when running jasmine tests
2012-10-30 15:58:59 -04:00
Chris Dodge
ba9a03410b
remove unneeded debugging traces
2012-10-30 15:56:02 -04:00
Calen Pennington
cd9fbaeb02
Add timeout so that jasmine tests eventually fail if the server doesn't start
2012-10-30 15:51:21 -04:00
Carlos Andrés Rocha
376dcb7982
Correct job description item
2012-10-30 15:44:28 -04:00
Chris Dodge
ee1098c032
remove unused line
2012-10-30 15:37:40 -04:00
Chris Dodge
743f2b56dd
make course about view methods render the about content as a module, so we get all the url rewriting goodness. Also, since we're now handling the url re-writing via the module get_html pipelines, we can remove the link rewriting inside the xmodules itself - which is good because there's a wierd bug in lxml.html rewriting
2012-10-30 15:12:13 -04:00
Chris Dodge
f4822c23de
lots of tweeks to better support importing of existing courseware
2012-10-30 11:52:31 -04:00
Calen Pennington
e8be6b3111
Get jasmine tests running on cms
2012-10-30 11:33:21 -04:00
Calen Pennington
6d5a1264b9
Move jasmine tests to their own environment
2012-10-30 10:58:38 -04:00
Calen Pennington
684b98505d
Make rake commands to run jasmine tests in browser and via phantomjs
2012-10-30 10:41:02 -04:00
Victor Shnayder
a155265409
minor whitespace + comment fixes
2012-10-29 23:44:38 -04:00
Calen Pennington
e422716045
Add changelogs for the CMS and LMS
2012-10-29 09:07:49 -04:00
Chris Dodge
206b1e26d3
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
2012-10-26 10:02:45 -04:00
Chris Dodge
ba15735214
implement static tabs. rejigger .tar.gz import to do the re-namespacing as a post-processing step as we need to retain the original url_name during the import. Also, migrate the presentation tier to use module_render.py::get_module() to better unify HTML'ifying stuff
2012-10-25 14:27:26 -04:00
Carlos Andrés Rocha
2db84a757e
Update to learning designer job description
2012-10-25 12:43:57 -04:00
Calen Pennington
f19ec64659
Point Studio forgot password at corresponding lms forgot password. There is no place for a reset password link in Studio at the moment
2012-10-25 10:47:41 -04:00
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
