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

261 Commits

Author SHA1 Message Date
Calen Pennington
82bab71ccf First pass at branding the header logo on subdomains 2012-08-22 14:05:19 -04:00
Bridger Maxwell
9162bdb1b9 Changed wiki setting so article owners can't change permissions. 2012-08-21 23:06:45 -04:00
Bridger Maxwell
214fb9185d Disabling anonymous wiki access until styling supports it. 2012-08-21 18:42:20 -04:00
Bridger Maxwell
1e068b6a4a Disabled wiki attachments. 2012-08-21 18:01:51 -04:00
Victor Shnayder
2c19d01441 Merge pull request #479 from MITx/feature/arjun/syllabus 
Adding a syllabus page (accessible via course navigation)
 2012-08-21 14:33:07 -07:00
Arjun Singh
b86fbdbd10 Adding comments about removing the syllabus tab ASAP. 2012-08-21 13:23:00 -07:00
Calen Pennington
188584c77d Allow puppet to set COURSE_LISTINGS 2012-08-21 16:21:43 -04:00
Calen Pennington
dca434ad34 Merge pull request #448 from MITx/feature/ichuang/add-gitreload-to-migrate 
add gitreload to lms-migration code
 2012-08-21 12:52:52 -07:00
Arjun Singh
99703761b0 Merge master 2012-08-21 12:01:09 -07:00
David Ormsbee
b31722bcff Merge branch 'master' into feature/bk_forum_int 2012-08-21 12:05:06 -04:00
Arjun Singh
1cfed46d06 Adding a syllabus page (accessible via course navigation) 2012-08-21 05:47:26 -07:00
Bridger Maxwell
fa3734b6fc Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 
Conflicts:
	repo-requirements.txt
 2012-08-21 08:24:29 -04:00
David Ormsbee
66a9512e57 disable askbot and enable berkeley forum in AWS config 2012-08-20 19:30:45 -04:00
ichuang
65ea54f7e2 typo in common.py ALLOWED_GITRELOAD_IPS fixed 2012-08-20 19:23:15 -04:00
ichuang
e1c9e52fc5 move textinput display:inline into capa display.scss file as class 2012-08-20 19:18:00 -04:00
Victor Shnayder
c5aef50701 add test database for new toy course. Trying to fix build 2012-08-20 19:11:47 -04:00
David Ormsbee
eb96497cff Merge branch 'master' into feature/bk_forum_int 
Conflicts:
	lms/djangoapps/courseware/views.py
	lms/templates/courseware/courseware.html
	requirements.txt
 2012-08-20 18:57:46 -04:00
ichuang
e3ecd22fa0 github IPs in lms.envs.common; made create_user, create_groups, 
manage_course_groups management commands (in lms_migration)
 2012-08-20 18:38:05 -04:00
David Ormsbee
b6dfa50a73 Adjust settings so we can change the comments service URL from Django config 2012-08-20 17:33:45 -04:00
Bridger Maxwell
6d30a98f0f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-20 13:08:35 -04:00
David Ormsbee
6a05a812c3 Merge pull request #460 from MITx/kimth/multiple-fileupload 
Kimth/multiple fileupload
 2012-08-19 18:08:40 -07:00
kimth
2f63a9b403 Limit number of files that can be uploaded at once 2012-08-19 20:12:01 -04:00
Bridger Maxwell
38a9631659 Updated to use django-wiki with significantly less sql queries. 2012-08-19 17:37:58 -04:00
Rocky Duan
d17981a9c4 shouldn't commit env config 2012-08-19 10:43:50 -07:00
Rocky Duan
991bb01af4 shouldn't commit env config 2012-08-19 10:42:45 -07:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Rocky Duan
238adb1a03 Merge branch 'master' into profile 
Conflicts:
	lms/djangoapps/django_comment_client/forum/views.py
	lms/templates/course_navigation.html
 2012-08-18 17:04:37 -07:00
Rocky Duan
028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile 
Conflicts:
	lms/djangoapps/courseware/module_render.py
	lms/djangoapps/courseware/views.py
	lms/templates/course_navigation.html
 2012-08-18 16:57:00 -07:00
Rocky Duan
0d2f787c32 cache setting 2012-08-18 16:41:49 -07:00
Bridger Maxwell
1e08164db5 Added MathJax to wiki pages. 2012-08-18 13:12:04 -04:00
Bridger Maxwell
361e409d4e Got the tests passing! 2012-08-18 00:02:09 -04:00
Bridger Maxwell
0fbfaf612f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 17:52:22 -04:00
Bridger Maxwell
93d15d15d0 Added markdown extensions from 6.002x 2012-08-17 17:32:44 -04:00
ichuang
a6c6d0f4d1 MITX_FEATURES['USE_DJANGO_PIPELINE']=False in dev_ike by default 2012-08-17 14:49:59 -04:00
David Ormsbee
83ea5efac6 add course-specific askbot URLs for AWS course servers 2012-08-17 14:34:58 -04:00
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
Rocky Duan
c89e290cdd use only one conf param 2012-08-16 13:43:48 -07:00
Calen Pennington
3b36fbf914 Move mitxmako out of common lib, and pass template rendering function into MongoModuleStore 2012-08-16 12:49:42 -04:00
kimth
909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 11:27:56 -04:00
kimth
1bb8d9366d Xqueue URL is https not http 2012-08-16 11:27:29 -04:00
Calen Pennington
a3b144045c Merge pull request #427 from MITx/feature/bridger/new_wiki 
New wiki installed from pip
 2012-08-16 08:01:39 -07:00
Bridger Maxwell
c4b362ca71 Removed old path include for django-wiki. 2012-08-16 10:56:33 -04:00
Calen Pennington
3efea9cbb0 Merge pull request #425 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-16 07:31:56 -07:00
Bridger Maxwell
8fb83ee33c Added django-wiki as a submodule. 2012-08-15 23:01:06 -04:00
Calen Pennington
13b9e58f8f Merge pull request #419 from MITx/feature/url_based_course_lists 
URL based course lists
 2012-08-15 12:07:02 -07:00
David Ormsbee
f535f44e62 Fix typo that caused two classes to not get loaded 2012-08-15 14:32:36 -04:00
Calen Pennington
e524f3bf6c Point at the new urls for the sandbox queue server LB 2012-08-15 14:12:32 -04:00
David Ormsbee
7386d66c0f Add dev_int.py config for testing course listings by subdomain 2012-08-15 11:53:20 -04:00
David Ormsbee
346d5b91a1 implement subdomain-based course displays 2012-08-15 11:53:20 -04:00