ichuang
|
1f07bb0466
|
Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/psychometrics
|
2012-09-10 22:03:08 -04:00 |
|
ichuang
|
56d44ec7f3
|
display_name may be empty (eg in tests)
|
2012-09-10 21:55:58 -04:00 |
|
ichuang
|
c6f794547f
|
more tabs -> spaces
|
2012-09-10 21:45:38 -04:00 |
|
ichuang
|
d8c8c85041
|
tabs to spaces
|
2012-09-10 21:42:44 -04:00 |
|
ichuang
|
97a32e64ee
|
fix tooltip titles in seq_module for non-new-xml-format courses
|
2012-09-10 21:33:54 -04:00 |
|
ichuang
|
e62e58dc6e
|
log attempts in tracking
|
2012-09-10 20:33:56 -04:00 |
|
Victor Shnayder
|
9266bcca6d
|
fix stupid bug in textbook handling code
|
2012-09-10 17:42:01 -04:00 |
|
ichuang
|
c1d92f9351
|
track psychometrics requests; add grade statistics, check for wrong
value of max_grade (something not right about StudentModule.max_grade)
|
2012-09-10 16:57:47 -04:00 |
|
Calen Pennington
|
317e2c345e
|
Add autodeploy properties task to rakefile
|
2012-09-10 11:37:02 -04:00 |
|
Calen Pennington
|
669c2f60d6
|
Merge pull request #651 from MITx/feature/victor/proper-404s
Feature/victor/proper 404s
|
2012-09-10 08:01:06 -07:00 |
|
Calen Pennington
|
cbda5fab66
|
Merge pull request #652 from MITx/feature/victor/catch-s3-errors
don't break courseware if S3 is unreachable
|
2012-09-10 07:57:55 -07:00 |
|
Victor Shnayder
|
779f865691
|
remove check-for-404 hack from tests now that we get real 404s
|
2012-09-10 10:49:12 -04:00 |
|
Victor Shnayder
|
814cd56034
|
return proper error codes for 404 and 500 errors
|
2012-09-10 10:38:17 -04:00 |
|
Victor Shnayder
|
bff8cd4e4e
|
don't break courseware if S3 is unreachable
|
2012-09-10 10:10:25 -04:00 |
|
ichuang
|
2f2e71e0d1
|
add tracking log entries for modulestore reload
|
2012-09-09 21:08:31 -04:00 |
|
ichuang
|
ccbbb5a993
|
commit_id may be specified for modulestore reload - for multi-worker configs
also show pid in migration and instructor dashboard views for thread debugging
|
2012-09-09 19:39:11 -04:00 |
|
ichuang
|
31dd119e79
|
settings.DATABASE_FOR_PSYCHOMETRICS overrides db for psychometrics
|
2012-09-09 17:50:11 -04:00 |
|
ichuang
|
2045500c6e
|
make external_auth table searchable in django admin; fix
missed instance of login link which should have been behind DISABLE_LOGIN_BUTTON
|
2012-09-08 23:21:34 -04:00 |
|
ichuang
|
b4a3591310
|
add jquery flot axislabels plugin
|
2012-09-08 23:21:13 -04:00 |
|
ichuang
|
0bf85992da
|
psychometrics djangoapp
|
2012-09-08 22:32:28 -04:00 |
|
ichuang
|
ab0a58fb7a
|
add psychometrics - grade histograms, check time diffs, and IRT plots
|
2012-09-08 22:31:45 -04:00 |
|
ichuang
|
ad5b3a3342
|
add admin interface for tracking logs
|
2012-09-08 10:30:18 -04:00 |
|
Calen Pennington
|
b85fefe61a
|
Fixing tests that were failing to due static content directory change
|
2012-09-07 17:02:00 -04:00 |
|
Calen Pennington
|
b27802b319
|
Merge pull request #604 from MITx/feature/cale/content-static-dir
Set the course static file dir to /static directories in course repos if...
|
2012-09-07 13:50:21 -07:00 |
|
David Ormsbee
|
d4aa38f86a
|
Merge pull request #645 from MITx/lyla/wording
quick wording change
|
2012-09-07 13:11:04 -07:00 |
|
Lyla Fischer
|
9ad9359d48
|
quick wording change
|
2012-09-07 15:57:43 -04:00 |
|
Calen Pennington
|
06aec16f73
|
Merge pull request #644 from MITx/feature/victor/prettier-errors
don't show empty list if there is no error data
|
2012-09-07 12:13:21 -07:00 |
|
Victor Shnayder
|
bbd57ef79b
|
don't show empty list if there is no error data
|
2012-09-07 15:10:26 -04:00 |
|
Calen Pennington
|
8500a1b300
|
Make tests not use syslog when they're running
|
2012-09-07 14:38:53 -04:00 |
|
Kyle Fiedler
|
bce61cd6e5
|
Revert "Merge pull request #642 from MITx/bug/kfiedler/ie"
This reverts commit 2b5e8a4944, reversing
changes made to db0549be78.
|
2012-09-07 14:18:34 -04:00 |
|
Tom Giannattasio
|
2b5e8a4944
|
Merge pull request #642 from MITx/bug/kfiedler/ie
A bunch of bug fixes for IE8 and change in the styling of the login and sign up labels
|
2012-09-07 10:45:01 -07:00 |
|
Kyle Fiedler
|
4d4e5824cd
|
Change form style for login and signup modals so it is consistant in every browser and we have no usability problems
|
2012-09-07 13:29:49 -04:00 |
|
Kyle Fiedler
|
aec8cc42dc
|
Add ie fix for wiki
|
2012-09-07 12:59:30 -04:00 |
|
Kyle Fiedler
|
012edbfd40
|
Fix main navigation and footer links also make text not italic
|
2012-09-07 11:14:26 -04:00 |
|
David Ormsbee
|
db0549be78
|
Merge pull request #594 from MITx/feature/ibrahim/discussion_distinguish_instructors
Feature/ibrahim/discussion distinguish instructors
|
2012-09-07 06:52:15 -07:00 |
|
David Ormsbee
|
b276d8b4b1
|
Changes as per cpennington's code review
|
2012-09-07 09:47:13 -04:00 |
|
David Ormsbee
|
8312ddf01d
|
Merge pull request #629 from MITx/feature/victor/save-course-position
Feature/victor/save course position
|
2012-09-07 06:42:48 -07:00 |
|
David Ormsbee
|
e4c261ba37
|
Merge pull request #637 from MITx/kimth/cktsim-in-schematic
cktsim-in-schematic
|
2012-09-07 06:30:45 -07:00 |
|
David Ormsbee
|
5c2bab1ac5
|
Merge pull request #641 from MITx/hotfixes/rocha
Added proctored exams news to the frontpage
|
2012-09-07 06:28:04 -07:00 |
|
David Ormsbee
|
0b4ef7e5d9
|
Merge pull request #640 from MITx/feature/kfiedler/autofocus
Added outofocus for sign in and log in forms
|
2012-09-07 06:27:24 -07:00 |
|
Victor Shnayder
|
1e94ff19f3
|
remove debuging log message
|
2012-09-07 08:20:59 -04:00 |
|
Victor Shnayder
|
6017aa698b
|
add ENABLE_DISCUSSION_SERVICE: "False" to cms config
|
2012-09-06 17:28:12 -04:00 |
|
Victor Shnayder
|
8b7390c966
|
Turn of discussion service in test env
- add a check for the feature flag before trying to save user info to the service
|
2012-09-06 17:11:21 -04:00 |
|
Victor Shnayder
|
048dea0eff
|
make test course loading deterministic by using course_id
|
2012-09-06 16:38:33 -04:00 |
|
Carlos Andrés Rocha
|
fc793b94fc
|
Added proctored exams news to the frontpage
|
2012-09-06 16:33:10 -04:00 |
|
Kyle Fiedler
|
d923be0786
|
Added outofocus for sign in and log in forms
|
2012-09-06 16:29:51 -04:00 |
|
Victor Shnayder
|
02ddeed72a
|
better error handling in index view
|
2012-09-06 16:24:59 -04:00 |
|
David Ormsbee
|
877a30eefa
|
Merge pull request #639 from MITx/rocha/master
Added protored exam press release page
|
2012-09-06 13:09:54 -07:00 |
|
Carlos Andrés Rocha
|
11399d6031
|
Added protored exam press release page
|
2012-09-06 16:06:57 -04:00 |
|
David Ormsbee
|
bea6db620a
|
Merge pull request #533 from MITx/feature/halogenandtoast/calculator
Put in calculator in courseware
|
2012-09-06 13:00:09 -07:00 |
|