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 |
|
Rocky Duan
|
44f7b37bfb
|
refactored comment_client working
|
2012-08-12 12:56:55 -07:00 |
|
ichuang
|
656a162aba
|
allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER']
|
2012-08-12 12:43:08 -04:00 |
|
ichuang
|
453d623b43
|
use mitx content-qa central server for staff_problem_info
|
2012-08-11 23:42:39 -04:00 |
|
Rocky Duan
|
b7d3361894
|
Merge branch 'mergedtom' into refactor
Conflicts:
lms/djangoapps/django_comment_client/forum/views.py
|
2012-08-11 17:43:16 -07:00 |
|
Rocky Duan
|
de8c828fb3
|
changed comment_client module to be imported as cc
|
2012-08-11 17:42:08 -07:00 |
|
Rocky Duan
|
2848c1fe38
|
switched to refactored comment_client
|
2012-08-11 17:36:58 -07: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 |
|
Rocky Duan
|
2d256dfe1d
|
attempt to fix sort
|
2012-08-11 16:35:34 -07:00 |
|
Rocky Duan
|
7030d1f1a2
|
fixed endorse&edit&delete
|
2012-08-11 14:38:37 -07:00 |
|
Rocky Duan
|
2f469f0f29
|
Merge branch 'brittany' of github.com:dementrock/mitx into mergedtom
|
2012-08-10 18:51:18 -07:00 |
|
Rocky Duan
|
39590116f7
|
make some indentation
|
2012-08-10 18:51:12 -07:00 |
|
Brittany Cheng
|
78ca885b05
|
fix comment styles
|
2012-08-10 18:42:07 -07: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 |
|
Rocky Duan
|
66beb54739
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
|
2012-08-10 17:59:28 -07:00 |
|
Rocky Duan
|
ab6cf914a0
|
Merge branch 'brittany' of github.com:dementrock/mitx into lol
Conflicts:
lms/templates/discussion/_thread.html
|
2012-08-10 17:59:19 -07:00 |
|
Brittany Cheng
|
5b6e3997af
|
fixed ul courseware
|
2012-08-10 17:58:18 -07:00 |
|
Rocky Duan
|
86b53bb248
|
uh
|
2012-08-10 17:53:22 -07:00 |
|
Brittany Cheng
|
f44358ab78
|
merge tom's styles
|
2012-08-10 17:52:07 -07: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 |
|
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 |
|
Bridger Maxwell
|
e462fad367
|
Converted wiki edit page and breadcrumbs.
|
2012-08-10 18:15:21 -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 |
|
ichuang
|
f6e84e84da
|
SECURE_PROXY_SSL_HEADER for django-1.4 in envs/dev_ike for nginx ssl proxy
|
2012-08-10 16:24:32 -04:00 |
|
ichuang
|
b159eb4825
|
add feature flag to disable login button (for systems which autologin)
|
2012-08-10 15:57:41 -04:00 |
|
Tom Giannattasio
|
f4db9c0199
|
added additional processing class
|
2012-08-10 15:54:00 -04:00 |
|
Tom Giannattasio
|
52c49f2b9a
|
added a cleaner arrow implementation
|
2012-08-10 15:48:58 -04:00 |
|
ichuang
|
f556e3f7d9
|
revert double-mangling patch in xmodule_modifiers; cale fixed in
replace_urls
|
2012-08-10 15:25:43 -04:00 |
|
ichuang
|
b6c38d3c59
|
replace_static_urls should only be run once (currently twice, eg if
html is in a veritical)
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
f99eb930ac
|
new static/admin files for django 1.4 admin
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
881f07f3c3
|
revert double-mangling patch in xmodule_modifiers; cale fixed in
replace_urls
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
dade6dd182
|
askbot template loader is broken - breaks admin view; disable in dev_ike.py
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
c0a4ff3717
|
more useful debugging message for capa problem script errors
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
411e77e19d
|
ModuleSystem should get its DEBUG set from settings.DEBUG in module_render
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
d2c1df88d1
|
update utility script to create course groups
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
27cd9ef986
|
minor change to allow github url to be overridden by metadata
|
2012-08-10 15:25:42 -04:00 |
|
ichuang
|
4240830e68
|
cms also needs replace_static_urls call fixed
|
2012-08-10 15:25:41 -04:00 |
|
ichuang
|
2e4f21ee3b
|
replace_static_urls should only be run once (currently twice, eg if
html is in a veritical)
|
2012-08-10 15:25:41 -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 |
|
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 |
|
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 |
|