Rocky Duan
1742775262
added configuration parameter to turn on / off discussion service
2012-08-13 15:35:19 -07:00
ichuang
a111a44da0
when MITX_FEATURES['DISABLE_LOGIN_BUTTON'] then show_signup_immediately should still work
2012-08-13 18:09:14 -04:00
Bridger Maxwell
0a9ad1a5f9
Added settings template.
2012-08-13 16:42:57 -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
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
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
Rocky Duan
d6f3492975
replaced comment client sym link
2012-08-12 22:55:55 -07:00
Rocky Duan
12897ffff0
added title & tag for new post & fixed error handling; reply button in generated thread doesn't work
2012-08-12 22:54:02 -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
Rocky Duan
7b7164a101
fixed unicode bug
2012-08-12 17:12:16 -07:00
Rocky Duan
322828fbff
removed unnecessary template
2012-08-12 16:41:16 -07: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
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
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
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
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
ichuang
411e77e19d
ModuleSystem should get its DEBUG set from settings.DEBUG in module_render
2012-08-10 15:25:42 -04:00
