Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3531 Commits

Author SHA1 Message Date
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
ichuang
a759850e3e add SSL / MIT certificates auth; clean up external_auth.views 2012-08-01 22:42:06 -04:00
Rocky Duan
5d3b187540 Merge branch 'master' of github.com:MITx/mitx 2012-08-01 16:45:21 -04:00
ichuang
10ebcefd54 add openid authentication 2012-08-01 14:59:55 -04:00
Victor Shnayder
46775386d3 make CACHE_TIMEOUT messages go away 2012-08-01 11:40:12 -04:00
Brittany Cheng
f1e07024d4 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 18:43:21 -04:00
Kyle Fiedler
9d14033f6b Added some styles for the top navigation and for the sidebar navigation 2012-07-31 16:29:01 -04:00
David Ormsbee
fafa86b413 Merge pull request #322 from MITx/feature/kfiedler/courseware-style 
Added fix for videos start to zero out colors and mit styles
 2012-07-31 11:31:16 -07:00
Kyle Fiedler
d30ae5389e Added fix for videos start to zero out colors and mit styles 2012-07-31 14:18:42 -04:00
Calen Pennington
b659846e1f Add askbot to lms staticfiles_dirs in test 2012-07-31 12:46:47 -04:00
Brittany Cheng
32cf7c6f66 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-31 11:26:17 -04:00
Kyle Fiedler
2bbb19790d Fixed jquery ui image problem and added a base style sheet for lms to override fonts 2012-07-31 11:06:39 -04:00
Brittany Cheng
bba8e29733 Merge branch 'master' of github.com:MITx/mitx into discussion2 2012-07-30 18:36:23 -04:00
Kyle Fiedler
257ce0430f Moved vendor sass files to css folder and included them in 2012-07-30 17:39:19 -04:00
Brittany Cheng
95291ef745 fix line 511 2012-07-30 17:29:07 -04:00
Brittany Cheng
554fc827f4 Merge branch 'master' of github.com:dementrock/mitx into discussion2 2012-07-30 17:22:12 -04:00
Rocky Duan
941ae0f068 basic error handling 2012-07-30 17:16:44 -04:00
Brittany Cheng
91cb814ee0 merging with origin master 2012-07-30 16:28:49 -04:00
Calen Pennington
1fce1dbe34 Make sure that django-pipelined css and js don't collide between the cms and lms 2012-07-30 14:04:39 -04:00
Calen Pennington
818cb0d1e7 Separate cms and lms auth and env files, and have the LMS that runs with the CMS use the CMS modulestore 2012-07-30 12:59:28 -04:00
Calen Pennington
012036a478 Clean up minor whitespace stuff in settings 2012-07-30 12:59:28 -04:00
Rocky Duan
0790a3add4 image uploading & render markdown 2012-07-27 17:50:38 -04:00
Victor Shnayder
59defd33b6 Formatting and little bugfixes 
* add course and org to full/course.xml
* fix error path in clean_xml script
* commit rakefile change needed by c5334f150c
 2012-07-27 16:09:25 -04:00