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

1559 Commits

Author SHA1 Message Date
David Ormsbee
c7d2e252e2 Fix errors that were preventing collectstatic from running 2012-08-19 22:31:05 -04:00
David Ormsbee
9fceae7a71 Merge branch 'master' into feature/bk_forum_int 2012-08-19 21:14:17 -04: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
64e6160548 slight behavior change 2012-08-19 10:44:05 -07: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
80ab2d27a0 fixed comment retrieval 2012-08-19 10:07:31 -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
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
0598a471c1 Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. 2012-08-18 12:22:50 -04:00
Bridger Maxwell
3fc59b3da5 Added javascript groups to wiki preview modal so circuits show up. 2012-08-18 00:17:20 -04:00
Bridger Maxwell
361e409d4e Got the tests passing! 2012-08-18 00:02:09 -04:00
Bridger Maxwell
1470045b74 Fixed wiki circuit editor modal to be a little better styled. 2012-08-17 21:44:56 -04:00
Bridger Maxwell
a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 21:44:05 -04:00
kimth
40b49224a2 Merge pull request #451 from MITx/feature/kfiedler/courseware-style 
Added new styles for sequence nav and reset some of the styles for inputs
 2012-08-17 17:54:03 -07:00
Bridger Maxwell
0fbfaf612f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki 2012-08-17 17:52:22 -04:00
Kyle Fiedler
8473188fea Added new styles for sequence nav and reset some of the styles for inputs 2012-08-17 17:41:45 -04:00
Bridger Maxwell
58620ebc2f Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 17:33:28 -04:00
Bridger Maxwell
93d15d15d0 Added markdown extensions from 6.002x 2012-08-17 17:32:44 -04:00
Tom Giannattasio
a2d0ada82c styled settings page 2012-08-17 17:01:45 -04:00
Tom Giannattasio
1bd790fabb finished attachment styles 2012-08-17 16:46:40 -04:00
Tom Giannattasio
c253474297 added modal functionality for attachments page 2012-08-17 15:59:31 -04:00
Tom Giannattasio
e47f3ccf35 added CodeMirror styles for the circuit editor 2012-08-17 15:26:25 -04:00
Tom Giannattasio
63ba133fbb added Code Mirror styles 2012-08-17 15:10:24 -04:00
Tom Giannattasio
411fcfd0cd Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 14:50:44 -04:00
Tom Giannattasio
1411c0e066 started tweaking upload interface 2012-08-17 14:50:40 -04:00
Bridger Maxwell
b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:48:06 -04:00
Tom Giannattasio
e96a5fcbee started attachments rework 2012-08-17 14:44:27 -04:00
Bridger Maxwell
8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 
Conflicts:
	lms/templates/wiki/base.html
 2012-08-17 14:44:25 -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
Tom Giannattasio
f67a356466 added additional bootstrap js files 2012-08-17 14:14:07 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
Calen Pennington
b0627efc74 Fix the tests of the book url 2012-08-17 09:23:37 -04:00
Calen Pennington
502691fa6e Merge pull request #441 from MITx/feature/halogenandtoast/fix_scroll 
Add jQuery scrollTo to courseware.
 2012-08-17 05:54:51 -07:00
Bridger Maxwell
df79f84c33 Fixed static includes in wiki django templates. 2012-08-16 19:41:04 -04:00
Tom Giannattasio
b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:35:56 -04:00
Bridger Maxwell
2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-16 17:34:38 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00