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

14265 Commits

Author SHA1 Message Date
Bridger Maxwell
adbe71b5df Got simplewiki just cleaned up enough to work again, so I could view a page for reference. 2012-08-19 19:57:19 -04:00
Rocky Duan
96b9a37048 work around compatibility issue 2012-08-19 16:42:56 -07:00
Rocky Duan
12d51334f8 mustache template 2012-08-19 16:03:42 -07:00
David Ormsbee
a729e16e88 Merge pull request #459 from MITx/feature/bridger/new_wiki 
Fix broken dependency updates for wiki
 2012-08-19 13:05:59 -07:00
Bridger Maxwell
24c0b5145d Updated django-wiki and plugin imports. 2012-08-19 14:41:49 -04:00
Rocky Duan
6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge 2012-08-19 10:08:00 -07:00
David Ormsbee
6c3b28b526 Merge pull request #452 from MITx/feature/bridger/new_wiki 
Feature/bridger/new wiki
 2012-08-19 09:46:15 -07:00
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
Rocky Duan
b4ec109dac major refactor of templates 2012-08-19 00:59:43 -07:00
Rocky Duan
e49226e9e1 some refactor 2012-08-19 00:16:04 -07:00
Rocky Duan
1c1d449a82 minor refactoring 2012-08-18 19:16:49 -07:00
Rocky Duan
0dd5428e24 refactored code to render ajax content 2012-08-18 17:54:43 -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
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
Bridger Maxwell
6b716c2883 Put in CodeMirror editor with inline circuits. 2012-08-17 14:32:29 -04:00
ichuang
39e2d64207 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate 2012-08-17 16:22:40 +00:00
ichuang
7dd7de9566 add gitreload to lms migration, so it doesn't have to run separately 2012-08-17 15:57:12 +00:00
Calen Pennington
b0627efc74 Fix the tests of the book url 2012-08-17 09:23:37 -04:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
kimth
9acb1ddaca Hide chapters in addition to sections 2012-08-16 15:06:49 -04:00
Calen Pennington
4e9e65e0e1 Merge pull request #432 from MITx/feature/cale/fix-tests 
Move mitxmako out of common lib, and pass template rendering function in...
 2012-08-16 10:52:12 -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
Calen Pennington
9118e585cc Merge pull request #426 from MITx/feature/halogenandtoast/multiple_textbooks 
Feature/halogenandtoast/multiple textbooks
 2012-08-16 09:47:53 -07:00
Calen Pennington
919b3e2137 Merge pull request #429 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-16 08:52:23 -07:00
Victor Shnayder
691744e359 Use .display_name instead of metadata['display_name'] 
* the former does a fallback if metadata['display_name'] isn't set.
 2012-08-16 11:37:54 -04:00
kimth
909a368f4a Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 11:27:56 -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
337f109af7 Moved django-wiki submodule to be a pip install from git. 2012-08-16 10:54:34 -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
Matthew Mongeau
ae09598d9a Display textbooks in course navigation, handle in urls and views. 2012-08-16 10:31:17 -04:00
kimth
da9a4710ce Merge branch 'master' into kimth/xqueue_callback_blocking 2012-08-16 09:38:25 -04:00
Bridger Maxwell
326a0f61c1 Updated django-wiki submodule. 2012-08-15 23:43:05 -04:00
Bridger Maxwell
8fb83ee33c Added django-wiki as a submodule. 2012-08-15 23:01:06 -04:00
Bridger Maxwell
262a49a6da Permissions on root article no longer allow students to edit it. 2012-08-15 21:47:08 -04:00
Rocky Duan
449da71cd9 fixed vote permission 2012-08-15 18:04:56 -07:00
Bridger Maxwell
a163b486ac Fixed up course_nav to swizzle url reversing too. 2012-08-15 19:34:42 -04:00
Bridger Maxwell
e76be095e9 Middleware for changing redirects to stay in course wiki. 2012-08-15 18:54:22 -04:00
Bridger Maxwell
0d28d286e2 Added creation of Site() object on wiki load. 2012-08-15 18:54:01 -04:00
Mike Chen
d56ac9a71b added comment 2012-08-15 17:22:09 -04:00
Mike Chen
158e978a7e added naive caching. not sure how to expire. 2012-08-15 17:15:08 -04:00
Mike Chen
2454c06b08 Merge branch 'master' of github.com:dementrock/mitx into ccp0101/performance 2012-08-15 16:14:17 -04:00
kimth
58932bb2f7 Drop import of re 2012-08-15 15:23:14 -04:00
kimth
3c1e67e339 Merge master 2012-08-15 15:19:08 -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
Calen Pennington
213e3cdc7c Merge pull request #418 from MITx/feature/victor/strip-metadata 
Feature/victor/strip metadata
 2012-08-15 12:01:58 -07:00
kimth
02d970c31e Map '/course/' urls to the course's root in the multicourse hierarchy 2012-08-15 14:45:12 -04:00
David Ormsbee
1c2b6e8088 Remove stuff that I should have deleted during the rebase 2012-08-15 14:39:56 -04:00