Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 991bb01af4 shouldn't commit env config Rocky Duan 2012-08-19 10:42:45 -07:00
  • 6164c87074 Merge branch 'master' of github.com:MITx/mitx into merge Rocky Duan 2012-08-19 10:08:00 -07:00
  • 80ab2d27a0 fixed comment retrieval Rocky Duan 2012-08-19 10:07:31 -07:00
  • 6c3b28b526 Merge pull request #452 from MITx/feature/bridger/new_wiki David Ormsbee 2012-08-19 09:46:15 -07:00
  • 9c4b1d7067 Merge pull request #456 from MITx/kimth/multiple-fileupload David Ormsbee 2012-08-19 09:24:27 -07:00
  • 20adaa81ba Use list comprehension kimth 2012-08-19 12:22:14 -04:00
  • 9b94bb17e4 Default param is None rather than [] kimth 2012-08-19 12:19:10 -04:00
  • e2bca44ca3 Simplify is_list_of_files kimth 2012-08-19 12:09:38 -04:00
  • 52d243208e Adjust tests to reflect list of file objects, not just file kimth 2012-08-19 11:14:32 -04:00
  • f5e60412ee Send multiple files to xqueue kimth 2012-08-19 11:02:03 -04:00
  • b2599f075f Send multiple files to xqueue kimth 2012-08-19 10:57:38 -04:00
  • d2cb645834 Multiple file submissions kimth 2012-08-19 09:26:03 -04:00
  • d920e718d0 AJAX permits multiple file upload kimth 2012-08-19 08:26:12 -04:00
  • 588444c46b Filesubmission template allows multiple file selection kimth 2012-08-19 07:54:10 -04:00
  • b4ec109dac major refactor of templates Rocky Duan 2012-08-19 00:59:43 -07:00
  • e49226e9e1 some refactor Rocky Duan 2012-08-19 00:16:04 -07:00
  • 1c1d449a82 minor refactoring Rocky Duan 2012-08-18 19:16:49 -07:00
  • 0dd5428e24 refactored code to render ajax content Rocky Duan 2012-08-18 17:54:43 -07:00
  • 238adb1a03 Merge branch 'master' into profile Rocky Duan 2012-08-18 17:04:37 -07:00
  • 028bd23c1c Merge branch 'master' of github.com:MITx/mitx into profile Rocky Duan 2012-08-18 16:57:00 -07:00
  • 0d2f787c32 cache setting Rocky Duan 2012-08-18 16:41:49 -07:00
  • 9aeec6904a Merge pull request #455 from MITx/kimth/circuitsim-link-fix ichuang 2012-08-18 13:56:07 -07:00
  • 1e08164db5 Added MathJax to wiki pages. Bridger Maxwell 2012-08-18 13:12:04 -04:00
  • 0598a471c1 Wiki menu no longer shows edit for users who can't edit. Changed template to mako for convenience. Bridger Maxwell 2012-08-18 12:22:50 -04:00
  • 78b3ca050e More info in comment kimth 2012-08-18 10:08:49 -04:00
  • 25d3890595 Remove outdated hardcoded url from circuit simulator kimth 2012-08-18 09:51:27 -04:00
  • 3fc59b3da5 Added javascript groups to wiki preview modal so circuits show up. Bridger Maxwell 2012-08-18 00:17:20 -04:00
  • 55f3a971cf Wiki circuit editors zoom to fit contents. Bridger Maxwell 2012-08-18 00:10:42 -04:00
  • 361e409d4e Got the tests passing! Bridger Maxwell 2012-08-18 00:02:09 -04:00
  • 1470045b74 Fixed wiki circuit editor modal to be a little better styled. Bridger Maxwell 2012-08-17 21:44:56 -04:00
  • a4b97c5f10 Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-17 21:44:05 -04:00
  • 40b49224a2 Merge pull request #451 from MITx/feature/kfiedler/courseware-style kimth 2012-08-17 17:54:03 -07:00
  • 2a84d147f0 Fixed a sizing bug in circuit editor. Bridger Maxwell 2012-08-17 20:22:28 -04:00
  • d3962ecd92 Updated CodeMirror modes for better syntax highlighting. Bridger Maxwell 2012-08-17 20:16:08 -04:00
  • 0fbfaf612f Merge remote-tracking branch 'origin/master' into feature/bridger/new_wiki Bridger Maxwell 2012-08-17 17:52:22 -04:00
  • 68f3aabc15 Updated django-wiki requirement. Bridger Maxwell 2012-08-17 17:42:23 -04:00
  • 8473188fea Added new styles for sequence nav and reset some of the styles for inputs Kyle Fiedler 2012-08-17 17:41:45 -04:00
  • 58620ebc2f Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-17 17:33:28 -04:00
  • 93d15d15d0 Added markdown extensions from 6.002x Bridger Maxwell 2012-08-17 17:32:44 -04:00
  • a2d0ada82c styled settings page Tom Giannattasio 2012-08-17 17:01:45 -04:00
  • 1bd790fabb finished attachment styles Tom Giannattasio 2012-08-17 16:46:40 -04:00
  • c253474297 added modal functionality for attachments page Tom Giannattasio 2012-08-17 15:59:31 -04:00
  • ed1a08d397 Merge branch 'feature/ichuang/add-gitreload-to-migrate' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate ichuang 2012-08-17 15:46:52 -04:00
  • b6e41dc05c fix view_tracking_log to show proper timezone ichuang 2012-08-17 15:46:09 -04:00
  • e47f3ccf35 added CodeMirror styles for the circuit editor Tom Giannattasio 2012-08-17 15:26:25 -04:00
  • f7d4831939 update utility scripts for djang-1.4; will make them management cmds later ichuang 2012-08-17 15:20:19 -04:00
  • 63ba133fbb added Code Mirror styles Tom Giannattasio 2012-08-17 15:10:24 -04:00
  • 445ce72b53 Leave management of services and package installation to puppet Calen Pennington 2012-08-17 14:59:11 -04:00
  • af06dd948d Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Tom Giannattasio 2012-08-17 14:53:12 -04:00
  • 90eeaa0538 Updated django-wiki requirement. Bridger Maxwell 2012-08-17 14:52:54 -04:00
  • 411fcfd0cd Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Tom Giannattasio 2012-08-17 14:50:44 -04:00
  • 1411c0e066 started tweaking upload interface Tom Giannattasio 2012-08-17 14:50:40 -04:00
  • a6c6d0f4d1 MITX_FEATURES['USE_DJANGO_PIPELINE']=False in dev_ike by default ichuang 2012-08-17 14:49:59 -04:00
  • b05bace12a Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-17 14:48:06 -04:00
  • e96a5fcbee started attachments rework Tom Giannattasio 2012-08-17 14:44:27 -04:00
  • 8595cb24b2 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-17 14:44:25 -04:00
  • 656ee847e3 Merge pull request #449 from MITx/feature/dave/wiki_proxy jarv 2012-08-17 11:38:30 -07:00
  • 83ea5efac6 add course-specific askbot URLs for AWS course servers David Ormsbee 2012-08-17 14:34:58 -04:00
  • 6b716c2883 Put in CodeMirror editor with inline circuits. Bridger Maxwell 2012-08-17 14:32:29 -04:00
  • f67a356466 added additional bootstrap js files Tom Giannattasio 2012-08-17 14:14:07 -04:00
  • 9806deee38 Add proxy rule for wiki for local testing of split servers David Ormsbee 2012-08-17 14:05:38 -04:00
  • b5b5978130 started styling attachments page Tom Giannattasio 2012-08-17 13:32:40 -04:00
  • 39e2d64207 Merge branch 'master' of github.com:MITx/mitx into feature/ichuang/add-gitreload-to-migrate ichuang 2012-08-17 16:22:40 +00:00
  • 4365b4a092 more flexible event logs retrieval ichuang 2012-08-17 16:17:00 +00:00
  • 7dd7de9566 add gitreload to lms migration, so it doesn't have to run separately ichuang 2012-08-17 15:57:12 +00:00
  • 5300670076 Merge pull request #446 from MITx/hotfix/ichuang/pyxserver-default-url-change ichuang 2012-08-17 06:39:57 -07:00
  • ad45a44a7c added bootstrap js and other dependencies; tweaked settings template Tom Giannattasio 2012-08-17 09:37:42 -04:00
  • 4dbcfe927e hotfix: eecs1 is inaccessible due to dead router; switch to qisx for pyxserver This needs a more permanent solution. ichuang 2012-08-17 09:36:43 -04:00
  • b0627efc74 Fix the tests of the book url Calen Pennington 2012-08-17 09:23:37 -04:00
  • 427c400f9e Merge pull request #444 from MITx/feature/fix_user_repl_to_3_plus Calen Pennington 2012-08-17 05:55:31 -07:00
  • 502691fa6e Merge pull request #441 from MITx/feature/halogenandtoast/fix_scroll Calen Pennington 2012-08-17 05:54:51 -07:00
  • 879fb0db0c Merge pull request #445 from MITx/kimth/sjsu ichuang 2012-08-16 19:13:52 -07:00
  • 0a9065f2be Fix CustomResponse for 6.002x kimth 2012-08-16 22:00:10 -04:00
  • df79f84c33 Fixed static includes in wiki django templates. Bridger Maxwell 2012-08-16 19:41:04 -04:00
  • 61108c27cb When replicating CourseEnrollment, make sure Users were created in all DBs before replicating other models David Ormsbee 2012-08-16 19:12:41 -04:00
  • bea9aec6ea Merge pull request #443 from MITx/feature/victor/fix-html-rendering kimth 2012-08-16 15:00:37 -07:00
  • 7e69c35735 fix another backcompat html bug Victor Shnayder 2012-08-16 17:58:10 -04:00
  • 9686868a32 Merge pull request #442 from MITx/feature/kfiedler/courseware-style kimth 2012-08-16 14:51:43 -07:00
  • f343bc28f3 Added fix for answer status and show answer to stay in the same place Kyle Fiedler 2012-08-16 17:49:50 -04:00
  • b0b10aa598 Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Tom Giannattasio 2012-08-16 17:35:56 -04:00
  • 2de55d074b Merge branch 'feature/bridger/new_wiki' of github.com:MITx/mitx into feature/bridger/new_wiki Bridger Maxwell 2012-08-16 17:34:38 -04:00
  • 385772373a Updated django-wiki requirement with fixed version. Bridger Maxwell 2012-08-16 17:32:11 -04:00
  • 490eb7a32b styled changes, new article and delete pages Tom Giannattasio 2012-08-16 17:31:05 -04:00
  • c56fb6f326 Merge pull request #440 from MITx/feature/kfiedler/courseware-style kimth 2012-08-16 14:12:45 -07:00
  • b5c6053000 Merge pull request #438 from MITx/feature/ichuang/minor-py26-compat-fix-part2 David Ormsbee 2012-08-16 14:11:25 -07:00
  • 09973bd815 Added fix for circut simulator Kyle Fiedler 2012-08-16 17:08:12 -04:00
  • 409477522b Add jQuery scrollTo to courseware. Matthew Mongeau 2012-08-16 17:07:02 -04:00
  • fa3e46880d Merge pull request #439 from MITx/feature/victor/fix-html-rendering kimth 2012-08-16 14:02:10 -07:00
  • 1ae71313bc fix html rendering bug Victor Shnayder 2012-08-16 16:53:29 -04:00
  • c89e290cdd use only one conf param Rocky Duan 2012-08-16 13:43:48 -07:00
  • bb6d6d9ac8 edit page styles Tom Giannattasio 2012-08-16 16:41:41 -04:00
  • 730d4d9485 add askbot flag back Rocky Duan 2012-08-16 13:40:12 -07:00
  • 6e3eff304e {} -> {0} etc in .format statements ichuang 2012-08-16 16:22:26 -04:00
  • 97538e7077 Merge pull request #437 from MITx/feature/ichuang/minor-py26-compat-fix Calen Pennington 2012-08-16 12:36:51 -07:00
  • f09fa831d8 Merge pull request #436 from MITx/kimth/sjsu Calen Pennington 2012-08-16 12:32:21 -07:00
  • b17cbcdccd Added fixes for speed dropdown Kyle Fiedler 2012-08-16 15:27:23 -04:00
  • 73d9d10aa8 html needs < in backcompat_module ichuang 2012-08-16 15:17:55 -04:00
  • 0cac6c9512 minor change to backcompat_module for py26 compat ichuang 2012-08-16 15:16:42 -04:00
  • 9acb1ddaca Hide chapters in addition to sections kimth 2012-08-16 15:06:49 -04:00
  • ea03838a0f Merge pull request #434 from MITx/sarina/max-attempts-fix ichuang 2012-08-16 11:57:30 -07:00