Commit Graph

58450 Commits

Author SHA1 Message Date
Tom Giannattasio
af01aec210 changed field border color 2012-08-10 14:17:59 -04:00
Tom Giannattasio
759be4d13d added spinner gif 2012-08-10 14:08:58 -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
Bridger Maxwell
45baccae85 Added a django template loader that can return Mako templates. Started pulling in new wiki. 2012-08-10 11:31:29 -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
David Ormsbee
165d5dcfd3 add config files for running different server groups in dev 2012-08-10 02:02:44 -04:00
David Ormsbee
0d824c6c02 Move modx_dispatch URL calls into the course 2012-08-10 02:02:44 -04:00
Victor Shnayder
1c3038ff3a Make accordion remember state
* use url_name to compare to passed params
* remove unused fields from template context
* Also make it possible to link to a chapter
2012-08-09 19:47:08 -04:00
Mike Chen
2a9bf1a115 Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground 2012-08-09 14:46:01 -04:00
Tom Giannattasio
ced521c17d cleaned up textbook nav styles 2012-08-09 14:44:50 -04:00
Calen Pennington
ecbb0ee39a Merge pull request #373 from MITx/MITx/feature/bridger/fast_course_grading
Make templates render on non-xml modulestores
2012-08-09 10:41:19 -07:00
Victor Shnayder
298954fc01 Clean up customtag handling
* load the template at descriptor init
* make it  export inline, not as a pointer
* update import/export test to do export to initial directory
2012-08-09 13:32:57 -04:00
Mike Chen
efad5632d8 set invisible instead of remove to preserve space of voting arrows when voting is disabled 2012-08-09 13:03:28 -04:00
Mike Chen
1bea419237 fix discussion_module after merging from MITx/mitx 2012-08-09 13:02:43 -04:00
David Ormsbee
2c676bc4ff Merge pull request #376 from MITx/dormsbee/new_jobs
Dormsbee/new jobs
2012-08-09 10:01:48 -07:00
David Ormsbee
b78c038bf2 Merge pull request #375 from MITx/dormsbee/new_jobs
Dormsbee/new jobs
2012-08-09 10:00:14 -07:00
Mike Chen
3ae1de5ed9 Merge branch 'master' of github.com:MITx/mitx into ccp0101/playground 2012-08-09 12:52:15 -04:00
Mike Chen
67ab56af6c Merge branch 'brittany' of github.com:dementrock/mitx into ccp0101/playground
Conflicts:
	lms/templates/discussion/_thread.html
2012-08-09 12:44:43 -04:00
Mike Chen
f7924aef08 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/playground
Conflicts:
	lms/urls.py
2012-08-09 12:40:55 -04:00
Tom Giannattasio
3c23aca898 styled bulleted lists on jobs page 2012-08-09 12:26:32 -04:00