Commit Graph

5559 Commits

Author SHA1 Message Date
David Ormsbee
978ff5b4e9 Merge pull request #633 from MITx/feature/ichuang/histogram-try-catch
put try-catch around histogram coffeescript code
2012-09-06 08:34:13 -07:00
Calen Pennington
34f2309c15 Merge pull request #631 from MITx/feature/victor/url_name-duplication
fix for multiple url_name hashing bug
2012-09-06 08:32:14 -07:00
David Ormsbee
3a40a55c76 Merge pull request #620 from MITx/jarv/add-local-logging
Jarv/add local logging
2012-09-06 08:25:17 -07:00
ichuang
56951e9961 put try-catch around histogram coffeescript code 2012-09-06 11:18:00 -04:00
David Ormsbee
39a773616b Merge pull request #630 from MITx/jarv/update-email
Jarv/update email
2012-09-06 08:10:32 -07:00
Tom Giannattasio
efd8a77bf1 Merge pull request #632 from MITx/feature/kfiedler/problems
Fix list item issues in problems
2012-09-06 07:42:39 -07:00
Kyle Fiedler
3ab85d470a Fix before element 2012-09-06 10:39:19 -04:00
Kyle Fiedler
54f621a329 Added fix for pre as a first child in a list item 2012-09-06 10:21:34 -04:00
Kyle Fiedler
54caa320ef fixed list items in html in the courseware 2012-09-06 10:21:33 -04:00
Victor Shnayder
739dd8e3f9 fix for multiple url_name hashing bug 2012-09-06 10:12:48 -04:00
John Jarvis
517e6ddeda Contact email address updates 2012-09-06 09:26:52 -04:00
John Jarvis
26ff14172c Email update for module-error template 2012-09-06 09:24:20 -04:00
kimth
d3cd85d81f Merge pull request #627 from MITx/feature/kfiedler/problems
Style changes to problems
2012-09-05 16:06:16 -07:00
Victor Shnayder
d0fcbdda8c convert answers to strings to make sure they're hashable 2012-09-05 16:00:04 -04:00
Calen Pennington
cd6b21472d Merge pull request #628 from MITx/feature/cale/manual-git-reload-feature-flag
Isolate manual git reload behind a feature flag
2012-09-05 12:29:31 -07:00
Calen Pennington
4088ac5428 Isolate manual git reload behind a feature flag 2012-09-05 15:16:40 -04:00
Kyle Fiedler
7c8838a6b2 Added some different style for the select problems 2012-09-05 15:02:50 -04:00
Kyle Fiedler
f785f6f8a1 Added some nicer styles for dynamic math 2012-09-05 14:24:12 -04:00
Kyle Fiedler
8a5e872c8f Removed a bunch of font tags 2012-09-05 14:24:12 -04:00
Calen Pennington
579544ec6a Merge pull request #626 from MITx/feature/victor/answer-export
Feature/victor/answer export
2012-09-05 11:04:34 -07:00
Victor Shnayder
a8cd4633c0 remove debugging statements 2012-09-05 13:46:15 -04:00
Victor Shnayder
f04cd838e5 Integrate csv export of answer distributions with Ike's sweet dashboard 2012-09-05 13:40:29 -04:00
Victor Shnayder
c89031b077 Export of answer distibutions to csv
- go through all students, all of their problems, save count for each answer
- return csv
- url exists, but no links to it yet
- Will need to integrate with Ike's new dashboard code
2012-09-05 13:40:29 -04:00
Calen Pennington
7702907662 Make module system handle not having a user, and pass a user in when previewing in the cms 2012-09-05 13:29:30 -04:00
John Jarvis
f7baa0d8f0 * By default local dev environments will be setup to send tracking
logs and application logs (DEBUG) to ENV_ROOT/log. Logs are rotated
  using the RotatingFileHandler
* For non dev environments logging will continue to be handled by
  rsyslogd
2012-09-05 11:25:33 -04:00
Calen Pennington
82c877c036 Merge pull request #598 from MITx/kimth/solutions
Let admins see answers of problems at any time
2012-09-05 08:24:45 -07:00
Calen Pennington
5a137cf3ec Merge pull request #625 from MITx/feature/ichuang/fix-force-univ-domain
fix FORCE_UNIVERSITY_DOMAIN check in student.views
2012-09-05 08:22:24 -07:00
Calen Pennington
8c301e04ae Merge pull request #614 from MITx/feature/arjun/fix_customresponse_msg
Clean up customresponse messages + points
2012-09-05 08:20:54 -07:00
ichuang
34ea1e0b95 fix FORCE_UNIVERSITY_DOMAIN check in student.views 2012-09-05 11:19:02 -04:00
Calen Pennington
a0608df706 Merge pull request #621 from MITx/feature/victor/fewer-xml-warnings
Remove lots of loud warnings about duplicate url names for things which ...
2012-09-05 08:17:02 -07:00
Calen Pennington
2f3f9e5ce9 Merge pull request #624 from MITx/rocha/master
Cleanup of 'About Course' page link to its Courseware
2012-09-05 08:15:33 -07:00
Calen Pennington
54e8819fb1 Merge pull request #615 from MITx/feature/ichuang/instructor-dashboard-upgrade
Upgrade to instructor dashboard
2012-09-05 08:03:55 -07:00
Carlos Andrés Rocha
2d42c91b9d Cleanup of 'About Course' page link to its Courseware 2012-09-05 10:22:36 -04:00
Calen Pennington
4d2983cb99 Merge pull request #587 from MITx/feature/victor/forum-anon-user-500
Add some rudimentary error checking to forum views
2012-09-05 06:21:46 -07:00
kimth
46389550f7 Merge pull request #623 from MITx/feature/dave/courseware_button_fix
Quick fix for prod issue -- making view courseware link from course abou...
2012-09-05 05:21:27 -07:00
David Ormsbee
44722e86e1 Quick fix for prod issue -- making view courseware link from course about page always work. 2012-09-05 08:20:06 -04:00
ichuang
d56d235fc9 minor change to create_user command, don't fail on kerberos lookup failure 2012-09-04 23:02:51 -04:00
David Ormsbee
319e6260d0 Upped the number of threads per discussion page to 8, per Tony's request. 2012-09-04 21:11:34 -04:00
David Ormsbee
f26dae1a9f Merge pull request #622 from MITx/rocha/master
[#35491529] Small corrections to OpenID provider login page
2012-09-04 17:58:11 -07:00
Carlos Andrés Rocha
0f1db7969d [#35491529] Small corrections to OpenID provider login page 2012-09-04 20:53:51 -04:00
ichuang
566b9694c4 revert inadvertent change to course.html 2012-09-04 19:47:37 -04:00
ichuang
5c90ec19d9 clarify that /gitreload is behind ENABLE_LMS_MIGRATION in docs 2012-09-04 19:08:28 -04:00
ichuang
98eb764525 cleaned up instructor dashboard CSV unit test code, per https://github.com/MITx/mitx/pull/615 2012-09-04 18:56:49 -04:00
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04:00
ichuang
4cbdf90d5e cleaned up access.py - now has _has_instructor_access_to_loation 2012-09-04 18:26:22 -04:00
Victor Shnayder
c23b31c6ee Remove lots of loud warnings about duplicate url names for things which don't store state, and have the same hash.
- should make 6.002 discussion tags happier
2012-09-04 16:20:39 -04:00
ichuang
d643057052 count all types of modules, not just childless ones 2012-09-04 11:21:18 -04:00
ichuang
4f8161df84 address two comments in https://github.com/MITx/mitx/pull/615 2012-09-04 11:10:22 -04:00
David Ormsbee
41b5e5b81f Merge pull request #619 from MITx/feature/arjun/generalize_show
Make show answer work for choiceresponse + javascriptinputs
2012-09-04 07:49:02 -07:00
ichuang
258274f2a7 add string to model class unicode 2012-09-04 10:25:28 -04:00