Andal.LND/edx-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,654 Commits 1 Branch 0 Tags
bff94de284fa58da2cedfaa657f4d5228bf89093
Commit Graph

953 Commits

Author SHA1 Message Date
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
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
Bridger Maxwell
3dce1c2884 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-14 11:40:00 -04:00
Bridger Maxwell
a2841af834 Added views for automatic course article creation. 2012-08-14 08:39:41 -04:00
kimth
1c2d034283 LMS-side MAX_FILESIZE set in settings.py 2012-08-13 21:17:47 -04:00
Rocky Duan
1742775262 added configuration parameter to turn on / off discussion service 2012-08-13 15:35:19 -07:00
Bridger Maxwell
ff1a0ba274 Added wiki create and create_root. Fixed some mitxmako bugs. 2012-08-13 14:25:11 -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
David Ormsbee
4ac7862975 Merge branch 'master' into feature/server_split 
Conflicts:
	lms/urls.py
 2012-08-13 09:21:02 -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
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
ichuang
656a162aba allow xqa server url to be set by MITX_FEATURES['USE_XQA_SERVER'] 2012-08-12 12:43:08 -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
dade6dd182 askbot template loader is broken - breaks admin view; disable in dev_ike.py 2012-08-10 15:25:42 -04:00
David Ormsbee
b3676cd760 Add replication tests 2012-08-10 14:43:43 -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
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
165d5dcfd3 add config files for running different server groups in dev 2012-08-10 02:02:44 -04:00
Calen Pennington
6abc2d733f Merge pull request #370 from MITx/feature/bridger/django1.4 
Feature/bridger/django1.4
 2012-08-08 12:52:33 -07:00
Bridger Maxwell
14a35b9605 Upgrading to django 1.4. 2012-08-08 11:57:15 -04:00
Mike Chen
5e6261ebb1 courseware still not working.. 2012-08-08 11:30:11 -04:00
Mike Chen
8627a5f33e Merge branch 'master' of github.com:dementrock/mitx into ccp0101/moderation 2012-08-08 11:20:13 -04:00
Calen Pennington
80b8529f2f Merge branch 'hotfix/1.0.4' 
Conflicts:
	common/djangoapps/util/middleware.py
 2012-08-08 11:05:26 -04:00
Arjun Singh
b9f2d4bc13 Remove coffee libraries (use the system coffee); don't set the OS NODE_PATH but rather just read it in once and then modify the temporary environments used when executing node. 2012-08-07 15:52:39 -04:00
ichuang
8bbf433479 disable diajgo debug toolbar on mit server (dev_ike.py) 2012-08-07 15:10:00 -04:00
Arjun Singh
26f31324c4 Moving a few static files out of lms into common 2012-08-07 13:39:59 -04:00
Victor Shnayder
932a9be747 Make tests pass again 
* test enrolls in course before testing pages
* support github edit links with new file structure
* Some pep8 cleanups
 2012-08-07 11:06:47 -04:00
Arjun Singh
fb6dbb120e Fixing dependency system for javascriptresponses. In particular, adding a location for node-only packages (that are never sent to the client) in lms/lib/node_modules and adding lms/static/js, lms/static/coffee/* to the NODE_PATH, along with the course's data directory. 2012-08-07 03:28:35 -04:00
Rocky Duan
0ae68e7324 Merge branch 'master' of github.com:MITx/mitx into merge 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-06 22:38:31 -04:00
Arjun Singh
869e638e07 Removing compiled js files in data directories before recompiling them; this causes compilation errors to fail loudly. 2012-08-06 18:08:07 -04:00
Mike Chen
af656fcf21 use permissions to check if one can edit or relp 2012-08-06 15:08:47 -04:00
ichuang
871ed954be ACCESS_REQUIRE_STAFF_FOR_COURSE default False in lms.envs.dev 2012-08-06 14:16:11 -04:00
Calen Pennington
8059008bde Switch from exception logging middleware to a django signal handler, so that we no longer swallow Http404 exceptions and turn them into 500 errors 2012-08-06 10:13:12 -04:00
ichuang
0347eb498c add MITX_FEATURES flags to enable textbook and discussion, 
and modify course_navigation correspondingly
 2012-08-05 20:24:00 -04:00
ichuang
c42960c172 add feature ENABLE_SQL_TRACKING_LOGS and url view /event_logs 2012-08-05 16:32:58 -04:00
ichuang
9db88b0b52 fix comment in dev.py 2012-08-04 21:13:43 -04:00
Rocky Duan
7c58fd27a1 Merge branch 'master' of github.com:MITx/mitx 
Conflicts:
	lms/templates/profile.html
 2012-08-04 18:07:27 -04:00
ichuang
9de6e28180 limit course reload to localhost or user.is_staff 2012-08-03 22:52:48 -04:00
ichuang
30922fb449 add ACCESS_REQUIRE_STAFF_FOR_COURSE feature for enrollment check 2012-08-03 21:39:23 -04:00
ichuang
84ed806f0d start on lms migration path: view for loaded modules, and reload method 2012-08-03 20:20:35 -04:00
ichuang
938871571b Merge branch 'master' of github.com:MITx/mitx into ExternalAuth 2012-08-01 23:01:29 -04:00