Victor Shnayder
|
11fc6e4c51
|
put back file upload config--needed for new discussion forums
|
2012-10-30 21:36:15 -04:00 |
|
Victor Shnayder
|
8c27e3a249
|
Revert overly aggressive killing.
(don't worry--askbot is still dead)
|
2012-10-30 20:49:10 -04:00 |
|
Vik Paruchuri
|
7fc54dc717
|
fix docstring
|
2012-10-30 20:38:33 -04:00 |
|
Vik Paruchuri
|
5586139594
|
bugfix to self assessment
|
2012-10-30 20:36:45 -04:00 |
|
Vik Paruchuri
|
62d1f1fe3e
|
update gitignore for pycharm
|
2012-10-30 20:14:55 -04:00 |
|
Vik Paruchuri
|
188e1c68d7
|
add self assessment module
|
2012-10-30 20:13:35 -04:00 |
|
Victor Shnayder
|
01f5f59235
|
Merge pull request #998 from MITx/feature/rocha/hd-video-player
Add HD control to video player
|
2012-10-30 17:00:03 -07:00 |
|
Victor Shnayder
|
9281f3c140
|
add migration to remove askbot columns
|
2012-10-30 19:54:15 -04:00 |
|
Carlos Andrés Rocha
|
e5b11a9c57
|
Add HD control to video player
|
2012-10-30 19:21:17 -04:00 |
|
Victor Shnayder
|
793354a0dc
|
remove (almost) all references to askbot.
|
2012-10-30 18:23:07 -04:00 |
|
Calen Pennington
|
827f7d5aa3
|
Merge pull request #988 from MITx/feature/cale/changelogs
Add changelogs for the CMS and LMS
|
2012-10-30 13:48:57 -07:00 |
|
Calen Pennington
|
d4a6b589f1
|
Add comment about the target of change log entries
|
2012-10-30 16:48:47 -04: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 |
|
Calen Pennington
|
0674d4e74b
|
Only allow django-admin to run in reload mode when browsing jasmine tests, and only kill the whole process group in that case (so as to know kill jenkins)
|
2012-10-30 16:16:09 -04: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 |
|
David Ormsbee
|
9206341817
|
Merge pull request #969 from MITx/content/rocha/job-page-update
Update Job Page with new positions
|
2012-10-30 12:58:03 -07: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 |
|
Carlos Andrés Rocha
|
f82f4f531d
|
Merge pull request #991 from MITx/feature/dave/open_date
Allow optional advertised_start metadata in Course
|
2012-10-30 12:10:23 -07:00 |
|
Chris Dodge
|
ded19f761a
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-30 15:10:06 -04:00 |
|
Tom Giannattasio
|
d68945de33
|
started adding settings page
|
2012-10-30 15:04:21 -04:00 |
|
Calen Pennington
|
e6ff0b52d0
|
Merge pull request #994 from MITx/apenney/requirements
Add MySQL-python to the requirements.
|
2012-10-30 11:37:47 -07:00 |
|
Ashley Penney
|
ab57c7d759
|
Add MySQL-python to the requirements.
|
2012-10-30 14:32:50 -04:00 |
|
Calen Pennington
|
b8dcf0c40c
|
Merge pull request #993 from MITx/bug/cas/tom/long-class-names
added handling for long class names in the header
|
2012-10-30 09:59:36 -07:00 |
|
Tom Giannattasio
|
ceb17ad411
|
added handling for long class names in the header
|
2012-10-30 12:57:47 -04:00 |
|
chrisndodge
|
4c16781808
|
Merge pull request #992 from MITx/bug/cas/tom/user-not-found
moved error message into form area; tweaked cancel behavior
|
2012-10-30 08:57:47 -07:00 |
|
Chris Dodge
|
97614d8901
|
Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/import-course-info
|
2012-10-30 11:52:38 -04:00 |
|
Chris Dodge
|
f4822c23de
|
lots of tweeks to better support importing of existing courseware
|
2012-10-30 11:52:31 -04:00 |
|
Tom Giannattasio
|
d63f82ae57
|
moved error message into form area; tweaked cancel behavior
|
2012-10-30 11:39:08 -04:00 |
|
Calen Pennington
|
e8be6b3111
|
Get jasmine tests running on cms
|
2012-10-30 11:33:21 -04:00 |
|
David Ormsbee
|
535980eb6d
|
Allow optional advertised_start metadata in Course, to let people pre-launch thier courses quietly if desired.
|
2012-10-30 11:06:50 -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
|
7966c18d2e
|
Add migration to make columns added by askbot nullable, in preparation for eventually deleting them
|
2012-10-29 15:12:15 -04:00 |
|
Victor Shnayder
|
2c01bf4a48
|
Merge pull request #982 from MITx/feature/victor/inputtypes-refactor
Feature/victor/inputtypes refactor
- addressed comments and added a few TODOs. Merging.
|
2012-10-29 09:07:12 -07:00 |
|
Victor Shnayder
|
6cc196394a
|
fixing comments
|
2012-10-29 12:06:42 -04:00 |
|
Victor Shnayder
|
d297077775
|
merge in master
|
2012-10-29 09:22:23 -04:00 |
|
Calen Pennington
|
e422716045
|
Add changelogs for the CMS and LMS
|
2012-10-29 09:07:49 -04:00 |
|
Victor Shnayder
|
b03789156c
|
add test for vsepr
|
2012-10-29 08:16:31 -04:00 |
|
Victor Shnayder
|
516b720f1e
|
Rename: use 'status' in templates as well as in the code.
|
2012-10-29 08:05:07 -04:00 |
|
Victor Shnayder
|
ab03f3dddf
|
move textinput.html to textline.html for consistency with other inputs
|
2012-10-29 07:56:10 -04:00 |
|
Victor Shnayder
|
318ea9b135
|
add back mathjax textarea
|
2012-10-29 07:51:58 -04:00 |
|
Victor Shnayder
|
02bd99697b
|
Clean up section ids and classes
- all inputtypes should have id inputtype_${id}
- should have class capa_inputtype
|
2012-10-29 07:49:33 -04:00 |
|