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

4387 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
jarv
656ee847e3 Merge pull request #449 from MITx/feature/dave/wiki_proxy 
Config changes relating to course server split
 2012-08-17 11:38:30 -07: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
David Ormsbee
9806deee38 Add proxy rule for wiki for local testing of split servers 2012-08-17 14:05:38 -04:00
Tom Giannattasio
b5b5978130 started styling attachments page 2012-08-17 13:32:40 -04:00
ichuang
5300670076 Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change 
hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver

merging now so it stops holding up content teams.
 2012-08-17 06:39:57 -07:00
Tom Giannattasio
ad45a44a7c added bootstrap js and other dependencies; tweaked settings template 2012-08-17 09:37:42 -04:00
ichuang
4dbcfe927e hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver 
This needs a more permanent solution.
 2012-08-17 09:36:43 -04:00
Calen Pennington
b0627efc74 Fix the tests of the book url 2012-08-17 09:23:37 -04:00
Calen Pennington
427c400f9e Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus 
Fix user replication to Courses you're already enrolled in
 2012-08-17 05:55:31 -07: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
ichuang
879fb0db0c Merge pull request #445 from MITx/kimth/sjsu 
Fix CustomResponse for 6.002x
changes affect 6.002 model of customresponse, making it slightly more robust when improperly used.
 2012-08-16 19:13:52 -07:00
kimth
0a9065f2be Fix CustomResponse for 6.002x 2012-08-16 22:00:10 -04:00
Bridger Maxwell
df79f84c33 Fixed static includes in wiki django templates. 2012-08-16 19:41:04 -04:00
David Ormsbee
61108c27cb When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models 2012-08-16 19:12:57 -04:00
kimth
bea9aec6ea Merge pull request #443 from MITx/feature/victor/fix-html-rendering 
fix another backcompat html bug
 2012-08-16 15:00:37 -07:00
Victor Shnayder
7e69c35735 fix another backcompat html bug 2012-08-16 17:58:10 -04:00
kimth
9686868a32 Merge pull request #442 from MITx/feature/kfiedler/courseware-style 
Added fix for answer status and show answer to stay in the same place
 2012-08-16 14:51:43 -07:00
Kyle Fiedler
f343bc28f3 Added fix for answer status and show answer to stay in the same place 2012-08-16 17:49:50 -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
Bridger Maxwell
385772373a Updated django-wiki requirement with fixed version. 2012-08-16 17:32:11 -04:00
Tom Giannattasio
490eb7a32b styled changes, new article and delete pages 2012-08-16 17:31:05 -04:00
kimth
c56fb6f326 Merge pull request #440 from MITx/feature/kfiedler/courseware-style 
BUG SMASH
 2012-08-16 14:12:45 -07:00
David Ormsbee
b5c6053000 Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2 
{} -> {0} etc in .format statements
 2012-08-16 14:11:25 -07:00
Kyle Fiedler
09973bd815 Added fix for circut simulator 2012-08-16 17:08:12 -04:00
Matthew Mongeau
409477522b Add jQuery scrollTo to courseware. 2012-08-16 17:07:43 -04:00
kimth
fa3e46880d Merge pull request #439 from MITx/feature/victor/fix-html-rendering 
fix html rendering bug
 2012-08-16 14:02:10 -07:00
Victor Shnayder
1ae71313bc fix html rendering bug 2012-08-16 16:53:29 -04:00
Tom Giannattasio
bb6d6d9ac8 edit page styles 2012-08-16 16:41:41 -04:00
ichuang
6e3eff304e {} -> {0} etc in .format statements 2012-08-16 16:22:26 -04:00
Calen Pennington
97538e7077 Merge pull request #437 from MITx/feature/ichuang/minor-py26-compat-fix 
Fix backcompat_module : html escape & py26
 2012-08-16 12:36:51 -07:00