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
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
Victor Shnayder
2005492f7f
Remove noisy debug message
...
* also adds a comment to lms/urls.py
2012-08-10 11:41:05 -04:00
Tom Giannattasio
022c65a6b4
fixed class name header bug
2012-08-10 11:40:16 -04:00
Calen Pennington
5f44b08f9c
Merge pull request #382 from MITx/feature/victor/check-access-control
...
Did a quick security scan through views.
2012-08-10 07:59:24 -07:00
Victor Shnayder
8740ba8837
Did a quick security scan through views.
...
* we appear to be fairly consistent in using is_staff and has_staff_access_to_course
* cleaned up some docstrings and little code things as I went
* fixed small bug in change_enrollment view (check for non-anon user)
2012-08-10 10:43:20 -04:00
ichuang
86e5bb4f1f
Merge pull request #381 from MITx/feature/cale/prevent_extra_static_mangling
...
When in debug mode, check the staticfiles.finders before mangling urls
ok, confirmed working. thanks.
2012-08-10 07:32:04 -07:00
Calen Pennington
1f1a87d970
Merge pull request #379 from MITx/feature/victor/keep-accordion-state
...
Make accordion remember state
2012-08-10 07:15:57 -07:00
David Ormsbee
172072209f
Add common djangoapps to tests run
2012-08-10 10:15:55 -04:00
Calen Pennington
4f27dd436e
When in debug mode, check the staticfiles.finders before mangling urls
2012-08-10 10:13:18 -04:00
Calen Pennington
b9459ace96
Merge remote-tracking branch 'origin/release/1.1'
2012-08-10 08:56:23 -04:00
Calen Pennington
e29feb089a
Merge pull request #377 from MITx/feature/tomg/fall-design
...
wayfinding style changes
2012-08-10 05:51:50 -07:00
David Ormsbee
8d9297ea04
Some refactoring of how user info is copied over when enrollments are created.
2012-08-10 02:02:44 -04:00
David Ormsbee
731e04e013
Add an explanation of replication
2012-08-10 02:02:44 -04:00
David Ormsbee
b597b17db1
Add support for replicating course enrollment/unenrollment to course databases
2012-08-10 02:02:44 -04:00
