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

4850 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
David Ormsbee
9c4b1d7067 Merge pull request #456 from MITx/kimth/multiple-fileupload 
Kimth/multiple fileupload
 2012-08-19 09:24:27 -07:00
kimth
20adaa81ba Use list comprehension 2012-08-19 12:22:14 -04:00
kimth
9b94bb17e4 Default param is None rather than [] 2012-08-19 12:19:10 -04:00
kimth
e2bca44ca3 Simplify is_list_of_files 2012-08-19 12:09:38 -04:00
kimth
52d243208e Adjust tests to reflect list of file objects, not just file 2012-08-19 11:14:32 -04:00
kimth
f5e60412ee Send multiple files to xqueue 2012-08-19 11:02:03 -04:00
kimth
b2599f075f Send multiple files to xqueue 2012-08-19 11:00:51 -04:00
kimth
d2cb645834 Multiple file submissions 2012-08-19 09:26:03 -04:00
kimth
d920e718d0 AJAX permits multiple file upload 2012-08-19 08:26:12 -04:00
kimth
588444c46b Filesubmission template allows multiple file selection 2012-08-19 07:54:10 -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
ichuang
9aeec6904a Merge pull request #455 from MITx/kimth/circuitsim-link-fix 
Remove outdated hardcoded url from circuit simulator
 2012-08-18 13:56:07 -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
kimth
78b3ca050e More info in comment 2012-08-18 10:08:49 -04:00
kimth
25d3890595 Remove outdated hardcoded url from circuit simulator 2012-08-18 09:51:27 -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
55f3a971cf Wiki circuit editors zoom to fit contents. 2012-08-18 00:10:42 -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
2a84d147f0 Fixed a sizing bug in circuit editor. 2012-08-17 20:22:28 -04:00
Bridger Maxwell
d3962ecd92 Updated CodeMirror modes for better syntax highlighting. 2012-08-17 20:16:08 -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
68f3aabc15 Updated django-wiki requirement. 2012-08-17 17:42:23 -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
Calen Pennington
445ce72b53 Leave management of services and package installation to puppet 2012-08-17 14:59:11 -04:00
Tom Giannattasio
af06dd948d Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki 2012-08-17 14:53:12 -04:00
Bridger Maxwell
90eeaa0538 Updated django-wiki requirement. 2012-08-17 14:52:54 -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