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

44 Commits

Author SHA1 Message Date
Ned Batchelder
61b53713d2 Remove unused imports from lms, as detected by pylint. 2013-06-19 16:56:34 -04:00
Calen Pennington
241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location 2013-05-21 09:34:12 -04:00
Calen Pennington
cfae1cdf62 Pep8 autofixes 2013-02-06 11:13:50 -05:00
Calen Pennington
0fff578e7d Merge remote-tracking branch 'origin/master' into feature/cale/cms-master 
Conflicts:
	.gitmodules
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/course.scss
	lms/urls.py
 2012-11-16 09:03:15 -05:00
Victor Shnayder
8c27e3a249 Revert overly aggressive killing. 
(don't worry--askbot is still dead)
 2012-10-30 20:49:10 -04:00
Victor Shnayder
793354a0dc remove (almost) all references to askbot. 2012-10-30 18:23:07 -04:00
Calen Pennington
bc69ed8c9e Move logsettings to common, so that it's shared between cms and lms 2012-10-11 12:31:52 -04:00
Calen Pennington
0162e4c031 Remove more askbot remnants 2012-10-11 12:31:51 -04:00
ichuang
0c3d054253 fix: university domain should not be determined by HTTP_HOST for dev or behind proxy 2012-09-04 18:36:26 -04:00
ichuang
bc63b99a10 disable subdomain filtering in dev_ike (should allow non-fall2012 courses) 2012-08-23 13:13:58 -04:00
ichuang
e1c9e52fc5 move textinput display:inline into capa display.scss file as class 2012-08-20 19:18:00 -04:00
ichuang
a6c6d0f4d1 MITX_FEATURES['USE_DJANGO_PIPELINE']=False in dev_ike by default 2012-08-17 14:49:59 -04:00
ichuang
da9742a88a reroute email on AWS test machine (dev_ike) 2012-08-12 18:39:39 -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
ichuang
8bbf433479 disable diajgo debug toolbar on mit server (dev_ike.py) 2012-08-07 15:10:00 -04:00
ichuang
871ed954be ACCESS_REQUIRE_STAFF_FOR_COURSE default False in lms.envs.dev 2012-08-06 14:16:11 -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
10ebcefd54 add openid authentication 2012-08-01 14:59:55 -04:00
ichuang
3a664753b4 minor changes - test this branch with more courses (8.01x, 6.00x) 2012-07-08 22:05:21 -04:00
ichuang
0daf7b0497 merging of stable-edx4edx into master - bugfixes and debugging 2012-07-08 19:03:29 -04:00
ichuang
edeb81ce63 change 8.01x default chapter 2012-07-04 15:50:39 -04:00
ichuang
ce74aa798d fix name of 6.002x course to correspond to change in course.xml 2012-07-03 12:16:33 -04:00
ichuang
20720c91b9 add 7.00x to dev_ike.py 2012-07-02 18:29:42 -04:00
ichuang
5f4a27d6cc typo 2012-07-01 13:17:57 -04:00
ichuang
b3cc34c3d4 add debugging to courseware debug (tricky with https behind gunicorn) 2012-07-01 13:16:09 -04:00
ichuang
23128ced67 courseware views now goes to default chapter and section if unprovided 
- uses multicourse settings (default_chapter and default_section)
  - it would be nice to use course_settings instead, but that is not
    currently compatible with multicourse
 2012-07-01 12:51:14 -04:00
ichuang
14745893b7 add edx4edx root stuff from aws config to dev_ike config 2012-06-29 15:47:49 -04:00
ichuang
8a6dd2f756 add 6.00x to dev_ike.py 2012-06-28 14:20:22 -04:00
ichuang
200e188c09 add MITX_FEATURES['REROUTE_ACTIVATION_EMAIL'] config for edx4edx activation 
- issue is that content machine isn't whitelisted for email
 - this also provides secondary filtering for user registration
 2012-06-26 23:00:25 -04:00
ichuang
a1b53c3cd6 add 3.091x to multicourse 2012-06-26 18:40:07 -04:00
ichuang
caa14922bb edx4edx configuration running on content server. Notes: 
- django debug commented out in lms/envs/dev.py (temporarily - need cleanup)
  - email backend set
  - index page modified for edx4edx
 2012-06-26 14:04:56 +00:00
ichuang
b59b80871a add edit link to module pages with filenames (html & problem) 
uses new 'github_url' dict key in multicourse_settings
this replaces the previous "quickedit" functionality
 2012-06-24 14:46:02 -04:00
ichuang
37539fdd4b revised 8.01x entry in dev_ike 2012-06-21 23:35:48 -04:00
ichuang
6566c45e6f use pipeline 2012-06-21 21:40:41 -04:00
ichuang
a892752b89 add 18.06x to dev_ike.py 2012-06-20 22:16:35 -04:00
ichuang
748398fca1 for externalresponse - fallback to script code if <answer> code not provided 2012-06-17 22:36:39 -04:00
ichuang
923a47d761 add 7.03x to dev_ike.py 2012-06-15 14:54:26 -04:00
ichuang
6f14acee9e add MITX_FEATURES['DISPLAY_HISTOGRAMS_TO_STAFF'] flag to settings 2012-06-10 22:34:30 -04:00
ichuang
989a74ba3f django pipeline working now (with new pip -e git+git...) 2012-06-10 20:05:33 -04:00
Calen Pennington
54756bf5e2 Use relative includes in settings files 2012-06-06 14:16:28 -04:00
Calen Pennington
5ba03130aa Moving LMS code into subdirectory 2012-06-06 14:09:01 -04:00