kimth
75eee443ff
Xqueue callback acquires lock on StudentModule to avoid race condition
2012-08-14 18:13:53 -04:00
Tom Giannattasio
a58a047582
moved global nav class
2012-08-14 16:12:36 -04:00
Tom Giannattasio
5aefda8d51
modified zebra stripes
2012-08-14 16:09:32 -04:00
Tom Giannattasio
dd92f51f02
added fluid widths
2012-08-14 16:09:32 -04:00
Tom Giannattasio
d673895eaa
added drag functionality
2012-08-14 16:09:32 -04:00
Tom Giannattasio
defa5b3159
basic gradebook template built; basic scroll functionality built
2012-08-14 16:09:32 -04:00
Tom Giannattasio
9871050f94
started gradebook
2012-08-14 16:09:32 -04:00
Calen Pennington
3ec0876618
Merge pull request #410 from MITx/feature/cale/queue_config
...
Feature/cale/queue config
2012-08-14 12:57:18 -07:00
Calen Pennington
d7fc2d6654
Merge pull request #408 from MITx/feature/fix_askbot_urls
...
Fix askbot URLs in the theme
2012-08-14 12:54:17 -07:00
David Ormsbee
3c9f099026
Modify server group dev config to enable separate concurrent Askbot instances.
2012-08-14 14:31:39 -04:00
Calen Pennington
814f55aad0
Fix the name of HTTPBasicAuth
2012-08-14 12:45:34 -04:00
Calen Pennington
6e88777126
Import HttpBasicAuth from the right place
2012-08-14 12:34:25 -04:00
Calen Pennington
8ce12b10b2
Pass HttpBasicAuth object to requests, rather than a list, which it didn't understand
2012-08-14 12:32:52 -04:00
David Ormsbee
e85db61407
Fix simple navigation and JS includes on askbot
2012-08-14 12:21:20 -04:00
David Ormsbee
9687dc8397
Add social images to Askbot theme
2012-08-14 12:20:58 -04:00
Calen Pennington
c4bed2c128
Add basic authentication support for requests made to the xqueue server
2012-08-14 11:59:47 -04:00
Calen Pennington
43745dacca
Add queue interface for test purposes
2012-08-14 11:59:46 -04:00
Calen Pennington
09fc932a20
Add default XQUEUE_INTERFACE to the dev environment
2012-08-14 11:59:46 -04:00
Calen Pennington
91b6bb649c
Move queue interface url and auth into configuration, rather than hardcoding it
2012-08-14 11:59:46 -04:00
David Ormsbee
137d4856cc
We're loading static assets from the askbot theme directory in the lms proj now.
2012-08-14 11:54:02 -04:00
Calen Pennington
cfe712cb2a
Merge pull request #407 from MITx/kimth/generic-coderesponse
...
Kimth/generic coderesponse
2012-08-14 08:48:50 -07:00
kimth
1c2d034283
LMS-side MAX_FILESIZE set in settings.py
2012-08-13 21:17:47 -04:00
kimth
936f2c49f5
Server-side (LMS) checking of uploaded filesize
2012-08-13 21:00:29 -04:00
ichuang
a111a44da0
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work
2012-08-13 18:09:14 -04:00
Calen Pennington
a7b88550c7
Merge pull request #401 from MITx/feature/kfiedler/courseware-style
...
Added tooltip styles, made all buttons the same, and other small changes...
2012-08-13 12:29:48 -07:00
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
Victor Shnayder
706fd99cab
Address comments on #394
2012-08-13 14:21:19 -04:00
Tom Giannattasio
6a50da3d16
Merge branch 'master' into feature/tomg/fall-design
2012-08-13 10:26:28 -04:00
Tom Giannattasio
ee0cbf66f9
added a cleaner arrow implementation
2012-08-13 10:19:06 -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
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
ichuang
da9742a88a
reroute email on AWS test machine (dev_ike)
2012-08-12 18:39:39 -04:00
ichuang
2c9652ab74
change xqa server location to suburl
2012-08-12 18:29:48 -04:00
Victor Shnayder
3455f8f64d
Hide errors from non-staff users
2012-08-12 18:03:12 -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
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
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
kimth
d41f709c92
Moved xqueue_callback URLs into the course
2012-08-10 18:51:35 -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
ichuang
f99eb930ac
new static/admin files for django 1.4 admin
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
