Kyle Fiedler
731f1cd7a8
Added tooltip styles, made all buttons the same, and other small changes throughout the courseware
2012-08-13 15:05:43 -04:00
Victor Shnayder
8716f88155
add course enrollment windows
...
* if the course metadata have enrollment_start and/or enrollment_end,
only allow normal users to enroll post start and pre end.
* If DARK_LAUNCH is on, staff can enroll outside the window
2012-08-13 15:03:46 -04:00
Bridger Maxwell
ff1a0ba274
Added wiki create and create_root. Fixed some mitxmako bugs.
2012-08-13 14:25:11 -04:00
Victor Shnayder
706fd99cab
Address comments on #394
2012-08-13 14:21:19 -04:00
kimth
fe954ca1c7
Unbreak frontend polling
2012-08-13 10:46:01 -04:00
Tom Giannattasio
6a50da3d16
Merge branch 'master' into feature/tomg/fall-design
2012-08-13 10:26:28 -04:00
Tom Giannattasio
7b4cd3e4b3
added additional processing class
2012-08-13 10:20:54 -04:00
Calen Pennington
32924d8bfe
Merge pull request #398 from MITx/kimth/partialgrading
...
Partial scoring
2012-08-13 07:19:50 -07:00
Tom Giannattasio
4eefa73336
changed field border color
2012-08-13 10:19:06 -04:00
Tom Giannattasio
8b79d811d4
added spinner gif
2012-08-13 10:19:06 -04:00
kimth
1ff8e271f5
Partial scoring
2012-08-13 10:14:29 -04:00
Calen Pennington
801df37872
Merge remote-tracking branch 'origin/master' into arjun/javascript_response
...
Conflicts:
common/lib/xmodule/xmodule/js/src/capa/display.coffee
common/lib/xmodule/xmodule/tests/__init__.py
common/lib/xmodule/xmodule/x_module.py
lms/djangoapps/courseware/module_render.py
2012-08-13 10:13:21 -04:00
Calen Pennington
bd95c03d9b
Merge pull request #396 from MITx/feature/ichuang/xqa-and-patches
...
Provide content QA (quality assessment) interface
2012-08-13 06:55:05 -07:00
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
David Ormsbee
c6ed6fc066
Merge branch 'master' into feature/server_split
2012-08-13 00:36:31 -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
ichuang
da64c8f0a1
add xqa interface to staff_problem_info, make staff_debug a modal
...
window, add xqa modal window, add xqa_key to course metadata
2012-08-11 20:12:37 -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
ichuang
241d445f30
changes to xml_module to allow problem metadata to be added via <meta>
2012-08-10 19:00:50 -04:00
Bridger Maxwell
e462fad367
Converted wiki edit page and breadcrumbs.
2012-08-10 18:15:21 -04:00
ichuang
c0a4ff3717
more useful debugging message for capa problem script errors
2012-08-10 15:25:42 -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
Tom Giannattasio
f2012e1d2a
additional processing class
2012-08-10 15:07:08 -04:00
Bridger Maxwell
3f4c4d7487
Got most of the wiki article page working. It shows the article menu now.
2012-08-10 14:46:53 -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
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
Victor Shnayder
1d8dcf30f9
docstring cleanups
2012-08-10 11:42:53 -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
David Ormsbee
0d824c6c02
Move modx_dispatch URL calls into the course
2012-08-10 02:02:44 -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
Calen Pennington
4e5af13d52
Merge pull request #374 from MITx/kimth/lms-coderesponse
...
Kimth/lms coderesponse
2012-08-09 09:11:21 -07:00
kimth
062eff12c4
Remove test url of xqueue
2012-08-09 12:06:36 -04:00
kimth
6b1bf0d4ca
Fix tests with new score_msg format
2012-08-09 12:05:34 -04:00
kimth
e47ff641f3
Testing new instances of xqueue
2012-08-09 11:57:59 -04:00
Calen Pennington
f2c8d5b427
Merge pull request #364 from MITx/MITx/feature/bridger/fast_course_grading
...
Even Faster Course Grading
2012-08-09 07:49:19 -07:00
Victor Shnayder
9867dceca5
Load templates at descriptor load
...
* instead of being lazy
2012-08-09 10:47:08 -04:00
Victor Shnayder
9d87710f59
Revert "Lazily loading capa problems (for faster grading)."
...
We don't want lazyness, and will save the proper fix (moving work into descriptor load for later)
2012-08-09 10:31:48 -04:00
kimth
e3ed383888
Move old externalresponse XML parser into subfunction, fix correctness bug (should be correct/incorrect not True/False)
2012-08-09 09:41:27 -04:00
kimth
58a1248d32
New external grader format: JSON-serialized dict
2012-08-09 08:29:12 -04:00
Kyle Fiedler
c3cd858e4b
Remove black bars for video
2012-08-08 16:27:48 -04:00
Kyle Fiedler
23e52f02c3
Fix odd movement on hover for the next button on hover
2012-08-08 16:27:48 -04:00