Commit Graph

4112 Commits

Author SHA1 Message Date
Calen Pennington
a3d7c4892d Merge pull request #397 from MITx/feature/server_split
Model replication to course databases
2012-08-13 06:39:03 -07:00
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split
Conflicts:
	lms/urls.py
2012-08-13 09:21:02 -04:00
Calen Pennington
a984fbb65f Merge pull request #394 from MITx/feature/victor/hide-error-modules
Hide errors from non-staff users
2012-08-13 06:17:13 -07:00
Calen Pennington
fdee13e4c0 Merge pull request #393 from MITx/feature/victor/bad-content-warn-not-error
Feature/victor/bad content warn not error
2012-08-13 06:13:19 -07:00
Calen Pennington
8402d26901 Merge pull request #392 from MITx/feature/victor/dark-launch
Feature/victor/dark launch
2012-08-13 06:11:45 -07:00
David Ormsbee
3cabb2dea6 Remove the no-longer-used is_valid_course_id code 2012-08-13 01:00:55 -04:00
David Ormsbee
d24ee25615 Remove debug checking for UserProfile 2012-08-13 00:57:33 -04:00
David Ormsbee
0aad62d6a8 Remove extra braces that were causing mako syntax errors 2012-08-13 00:48:35 -04:00
David Ormsbee
c6ed6fc066 Merge branch 'master' into feature/server_split 2012-08-13 00:36:31 -04:00
David Ormsbee
510435ada5 Sketchy adding of test dbs to the cms test.py config file -- these are required for the Student (shared django app) tests to run 2012-08-13 00:35:51 -04:00
David Ormsbee
7711f81303 Add nginx.conf file for running a multi-server dev env 2012-08-12 23:35:50 -04:00
Victor Shnayder
3455f8f64d Hide errors from non-staff users 2012-08-12 18:03:12 -04:00
Victor Shnayder
af7e70a979 Log content problems as warnings, not errors
* will avoid newrelic complaining
* NOTE: Is this what we want post-ship?
  - need some way of notifying instructors of problems
2012-08-12 17:21:40 -04:00
Victor Shnayder
e980f8b296 add notes on how to run individual tests 2012-08-12 16:59:07 -04:00
Victor Shnayder
d7f94a05b7 Add DARK_LAUNCH functionality
* pass user to check_course
* if dark launch feature enabled, users with staff access to course
can see courseware before start date.  Students still can't.
* tests.
* Remaining: enrollment view has custom access control.  Need to check it.
2012-08-12 16:23:31 -04:00
Victor Shnayder
622eebc473 Don't error on missing static files
* Just log a warning and return a dummy url
* May want smarter checking later
  (e.g. would be nice to tell staff what files are missing.)
2012-08-12 16:21:38 -04:00
David Ormsbee
54b0a465fa Ugly hack so that an LMS-specific test of the shared Student djangoapp doesn't break CMS test runs 2012-08-12 16:10:08 -04:00
ichuang
9a54295ea1 Merge pull request #391 from MITx/feature/cale/allow-broken-content-links
If there is a missing static file, don't break the server, just leave a ...
2012-08-10 18:36:52 -07:00
Calen Pennington
14bfbb06a5 If there is a missing static file, don't break the server, just leave a dead url 2012-08-10 21:22:12 -04:00
Calen Pennington
b5d377adb5 Merge pull request #388 from MITx/kimth/lms-coderesponse
Spinner on waiting for queue
2012-08-10 17:48:54 -07:00
kimth
e8ac66fce2 Merge branch 'feature/server_split' of https://github.com/MITx/mitx into feature/server_split 2012-08-10 18:52:04 -04:00
kimth
d41f709c92 Moved xqueue_callback URLs into the course 2012-08-10 18:51:35 -04:00
David Ormsbee
689c761bbc Remove comment in Rakefile I was just testing. 2012-08-10 17:07:03 -04:00
David Ormsbee
cbfdf59760 Fix test error regarding UserProfiles (a UserProfile must exist before a CourseEnrollment) 2012-08-10 16:41:46 -04:00
kimth
125bbbf934 Spinner on waiting for queue 2012-08-10 15:25:07 -04:00
Calen Pennington
c867560662 Merge pull request #385 from MITx/kimth/lms-coderesponse
Kimth/lms coderesponse
2012-08-10 12:19:36 -07:00
Calen Pennington
b4f3d7ceb1 Merge pull request #386 from MITx/feature/victor/missing-metadata
Fix metadata inheritance
2012-08-10 12:14:10 -07:00
Tom Giannattasio
f2012e1d2a additional processing class 2012-08-10 15:07:08 -04:00
Victor Shnayder
38a89e9f1a Make courseware navigation work again.
* bodyclass block got accidentally deleted
2012-08-10 14:51:47 -04:00
David Ormsbee
b3676cd760 Add replication tests 2012-08-10 14:43:43 -04:00
Tom Giannattasio
185ab1f615 added spinner class and image 2012-08-10 14:22:34 -04:00
Victor Shnayder
feba37cf78 respond to comments on merge 2012-08-10 13:39:58 -04:00
Victor Shnayder
67949f8a32 Fix metadata inheritance
* with xml datastore, re-do all inheritance once the whole course is loaded
2012-08-10 13:15:14 -04:00
kimth
f6b2cabd83 Position change in sequence kills polling thread, rather than new Problem creation 2012-08-10 13:10:53 -04:00
Calen Pennington
310788ca08 Merge pull request #384 from MITx/feature/tomg/fall-design
fixed course name title bar bug
2012-08-10 10:05:59 -07:00
kimth
64eba4332c Remove temp xqueue url 2012-08-10 12:01:53 -04:00
kimth
36091697a5 Student browser polls for queued submission result 2012-08-10 11:59:45 -04:00
Tom Giannattasio
538185173a added truncation for super long titles 2012-08-10 11:48:07 -04:00
Calen Pennington
1009d28939 Merge pull request #383 from MITx/feature/victor/course-grade-detail
Feature/victor/course grade detail
2012-08-10 08:46:00 -07:00
Victor Shnayder
6882b4b53d responding to review comments on #383 2012-08-10 11:42:54 -04:00
Tom Giannattasio
c6d5d4aaae fixed instructor tab active state 2012-08-10 11:42:54 -04:00
Victor Shnayder
a6148856b2 make the tests work around the 404 bug 2012-08-10 11:42:54 -04:00
Victor Shnayder
c3814a81fd In-progress auth tests
* need to actually return 404 codes to clients when DEBUG=False
* add option to make nose more verbose and drop to pdb on error
2012-08-10 11:42:54 -04:00
Victor Shnayder
8e364e6d45 ensure float when computing module score 2012-08-10 11:42:54 -04:00
Victor Shnayder
c9fd7b22a0 Add instructor dashboard
* dashboard links to gradebook and dummy grade summary page
2012-08-10 11:42:53 -04:00
Victor Shnayder
1d8dcf30f9 docstring cleanups 2012-08-10 11:42:53 -04:00
Victor Shnayder
43d6948f02 Fix links to student profile pages from gradebook 2012-08-10 11:42:53 -04:00
Victor Shnayder
1903a66bea Style cleanup in gradebook
* don't display thousands of '%' characters
* s/percentage/fraction/, since that's what it is
2012-08-10 11:42:53 -04:00
Victor Shnayder
15a4db1774 Only show enrolled students in course gradebook
* also added todo about need for pagination
2012-08-10 11:42:53 -04:00
Victor Shnayder
5882a89c82 Add management command to create random users
* required some refactoring in create_account() view
2012-08-10 11:41:05 -04:00