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

Commit Graph

  • 50f665311e update latex template problem; add template adaptive hint problem ichuang 2012-10-14 21:28:25 -04:00
  • 8742ba76a3 improved latex problem template; hls codemirror box autosizes height; capa responsetypes can now include "inline='1'" for their span to be inline ichuang 2012-10-14 20:19:14 -04:00
  • 0f16e8a358 Return only username on OpenID provider requests. Carlos Andrés Rocha 2012-10-14 19:45:22 -04:00
  • 12869ecedd fix hls modal window style (it now autosizes properly) ichuang 2012-10-14 17:48:45 -04:00
  • 69bfdac49f minor change in dev_ike for cms-master ichuang 2012-10-14 16:58:11 -04:00
  • 09d7d6d688 add AUTH_USE_MIT_CERTIFICATES feature flag to CMS, and @ssl_login_shortcut ichuang 2012-10-14 16:40:04 -04:00
  • 92f329ca1a Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx ichuang 2012-10-14 16:36:40 -04:00
  • f4b61e8f47 Merge pull request #901 from MITx/fix/cdodge/multiple-choice chrisndodge 2012-10-14 12:44:49 -07:00
  • d34075ff89 remove the — from the HTML, this apparently is causing the CAS and LMS to barf on staging, but strangly not on dev Chris Dodge 2012-10-14 15:43:16 -04:00
  • 4594d37bf2 Merge pull request #900 from MITx/feature/ichuang-fix-capa_module-reset-string-bug Victor Shnayder 2012-10-14 10:36:49 -07:00
  • 3c8830f3b0 reset_problem in capa_module should always return dicts not strings this is for the master branch (versus cms-master) ichuang 2012-10-14 12:57:58 -04:00
  • 15d4af26a5 Merge pull request #899 from MITx/feature/victor/capa-ajax Victor Shnayder 2012-10-14 08:40:39 -07:00
  • f4d8df94dd Make chem preview more robust Victor Shnayder 2012-10-14 11:35:32 -04:00
  • 97233cf00e Work-around for bug in pip lookup Piotr Mitros 2012-10-14 10:33:11 -04:00
  • f845cc4e08 Merge pull request #898 from MITx/fix/cdodge/multiple-choice chrisndodge 2012-10-13 20:44:06 -07:00
  • 8f1336d87a remove HTML comment from schematiceditor template Chris Dodge 2012-10-13 23:27:37 -04:00
  • 1154c4b897 auto-resend activation email if they try to log in and aren't activated David Ormsbee 2012-10-13 23:20:33 -04:00
  • db8f69d497 fix tabs in latex_html.yaml template ichuang 2012-10-13 23:10:51 -04:00
  • bf959d8fc3 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx ichuang 2012-10-13 22:54:14 -04:00
  • f846f4c2ad add import filter capability to html & problem editing; provides latex2edx interface ichuang 2012-10-13 22:33:41 -04:00
  • bdbeec9ad5 Merge pull request #895 from MITx/fix/cdodge/multiple-choice chrisndodge 2012-10-13 19:21:21 -07:00
  • 444d4b1054 fix exception in LMS when rendering newly create multiple choice problems. The capa module is barfing on the HTML comment which was in there and the XML parser couldn't handle it. Chris Dodge 2012-10-13 22:19:48 -04:00
  • 1b4f569c08 Merge pull request #894 from MITx/fix/cdodge/cas-bugs chrisndodge 2012-10-13 18:53:48 -07:00
  • 13e23cbbab Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-bugs Chris Dodge 2012-10-13 21:49:05 -04:00
  • 91fe7da44a Merge pull request #883 from MITx/fix/cale/edge-bugs chrisndodge 2012-10-13 18:46:05 -07:00
  • ebf6d74776 Merge branch 'feature/cale/cms-master' into fix/cale/edge-bugs Chris Dodge 2012-10-13 21:44:15 -04:00
  • 258a467fa6 make delete unit delete both the draft and non-draft versions Chris Dodge 2012-10-13 20:55:49 -04:00
  • 1ec0fae801 Merge pull request #891 from MITx/feature/victor/capa-ajax arjun810 2012-10-13 17:05:44 -07:00
  • ccc5e5771d Merge pull request #893 from MITx/kimth/toggle-stay-in-place arjun810 2012-10-13 16:01:58 -07:00
  • 271fa6956a save_item should also do proper 'is this element draft aware' logic so that incorrect versioning occurs on elements which do not support versioning at this point in time (aka courses, sections, and subsections). Chris Dodge 2012-10-13 18:53:32 -04:00
  • cbc619f8af hack patch to at least keep the unit.html page from blowing up Chris Dodge 2012-10-13 16:09:33 -04:00
  • 2e43d2ebcc don't display a broken thumbnail image if a thumbnail is not available Chris Dodge 2012-10-13 15:43:50 -04:00
  • 113e8b97b6 Toggle shouldn't follow anchor kimth 2012-10-13 16:19:54 +00:00
  • f1517fefa6 hide search button on asset index page Chris Dodge 2012-10-13 10:45:52 -04:00
  • 8151b1030f remove wip on Import header button Chris Dodge 2012-10-13 10:42:49 -04:00
  • a46c517a9d Merge pull request #892 from MITx/kimth/fix-mc-soln-conflict arjun810 2012-10-12 23:27:19 -07:00
  • 3b461ee11f choicegroup should only process choices belonging to its input_id kimth 2012-10-13 06:13:33 +00:00
  • 49a921c81e Merge pull request #873 from MITx/feature-alex-crystallography-mitx Victor Shnayder 2012-10-12 20:11:41 -07:00
  • adae176943 merge Victor Shnayder 2012-10-12 23:06:39 -04:00
  • db8639e06a Fix preview code Victor Shnayder 2012-10-12 22:52:41 -04:00
  • 48de4b40ee Fix my js_loader patch Victor Shnayder 2012-10-12 22:52:02 -04:00
  • edb31c97b6 Merge pull request #890 from MITx/feature/cdodge/cas-new-course chrisndodge 2012-10-12 18:34:40 -07:00
  • 73477ec1bf reset_problem in capa_module should always return dicts not strings ichuang 2012-10-12 21:06:15 -04:00
  • a12baec599 add new files Chris Dodge 2012-10-12 20:55:16 -04:00
  • a58e6ce9e4 create course. Quick review on import. Add progress bar stuff to import as well as redirect Chris Dodge 2012-10-12 20:54:27 -04:00
  • 1c18ad9607 make loader only load scripts once per run, midway through fixing multiple chem equations per page Victor Shnayder 2012-10-12 19:18:58 -04:00
  • b2afa82c8e Merge pull request #886 from MITx/hotfix/arjun/fix_integer_disc_ids_2 arjun810 2012-10-12 14:59:20 -07:00
  • d7b237ce0a more removal of data("id") in favor of attr("data-id") Arjun Singh 2012-10-12 14:47:44 -07:00
  • d97533c04f Merge pull request #885 from MITx/hotfix/rocha/fix-unicode-in-custom-tabs Victor Shnayder 2012-10-12 14:39:15 -07:00
  • f1120a1139 Removed unused import Carlos Andrés Rocha 2012-10-12 17:39:05 -04:00
  • e8cd125701 Fix to read utf-8 enconded html files for custom course tabs Carlos Andrés Rocha 2012-10-12 17:36:19 -04:00
  • 619e9f18ac Merge pull request #884 from MITx/feature/victor/capa-ajax Victor Shnayder 2012-10-12 14:08:11 -07:00
  • 54d1f2afac address Ike's comments. Victor Shnayder 2012-10-12 17:03:11 -04:00
  • fd5c7c622c Merge pull request #862 from MITx/feature/victor/capa-ajax ichuang 2012-10-12 13:51:10 -07:00
  • 26e735b178 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/cas-new-course Chris Dodge 2012-10-12 16:11:59 -04:00
  • 4e4b6accda wip: create new course Chris Dodge 2012-10-12 16:11:55 -04:00
  • 64240c441f Add date display when subsection date is set and section date isn't Calen Pennington 2012-10-12 16:00:03 -04:00
  • 623c756b9f Enable section and subsection reordering (with no drag between them) Calen Pennington 2012-10-12 15:59:46 -04:00
  • d78e041c2d Testing and small fixes Victor Shnayder 2012-10-12 15:32:36 -04:00
  • a160f6144f Fix date display in unit page Calen Pennington 2012-10-12 15:16:44 -04:00
  • 4005cbf455 Hide/show wips w/ press of 'w' key Calen Pennington 2012-10-12 15:11:02 -04:00
  • 607b99dece Make separate links for lms_preview and lms as needed Calen Pennington 2012-10-12 15:03:06 -04:00
  • f5f1e858d5 Merge pull request #874 from MITx/hotfix/arjun/fix_integer_disc_ids David Ormsbee 2012-10-12 11:38:28 -07:00
  • 73bbfe8c4d Merge pull request #875 from MITx/feature/arjun/community_tas David Ormsbee 2012-10-12 11:37:47 -07:00
  • 01ac01b62c Re-enable change name, and fix up change email styles David Ormsbee 2012-10-12 14:31:20 -04:00
  • d10f56dd08 Only try to remove a directory if it exists during import Calen Pennington 2012-10-12 14:10:32 -04:00
  • f6f2663b77 fix arrows list Victor Shnayder 2012-10-12 14:08:21 -04:00
  • fb48a4fb8f Remove scheme on jquery.form.js load so that it works over https Calen Pennington 2012-10-12 14:02:51 -04:00
  • b6f7427e22 make tests pass again Victor Shnayder 2012-10-12 14:02:22 -04:00
  • 19d3cb3870 Add a chemicalequationinput with live preview Victor Shnayder 2012-10-12 13:52:48 -04:00
  • ab913cb5ac Fix edit_unit header to point to the correct course module Calen Pennington 2012-10-12 13:22:53 -04:00
  • 90a847cb26 Fix context course on edit subsection Calen Pennington 2012-10-12 13:19:14 -04:00
  • 0e277277a8 Merge pull request #881 from MITx/fix/cdodge/cas-thumbnail-exception-handling Calen Pennington 2012-10-12 10:12:36 -07:00
  • d31a7c6d6b log and continue on thumbnail generation exception Chris Dodge 2012-10-12 13:11:55 -04:00
  • 78df26605d Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into fix/cdodge/cas-thumbnail-exception-handling Chris Dodge 2012-10-12 13:03:02 -04:00
  • 5aa474a10d Merge pull request #879 from MITx/feature/cale/cas-import-ui chrisndodge 2012-10-12 10:02:43 -07:00
  • c70f29e83a Wire up import to the frontend, and make sure that it puts it into the already extant course Calen Pennington 2012-10-12 12:40:03 -04:00
  • b17836f232 swallow exceptions when generating thumbnails Chris Dodge 2012-10-12 12:27:21 -04:00
  • 3d2a1c2493 removed red import button – drawing too much attention; this will be reworked onto a different page at some point anyways Tom Giannattasio 2012-10-12 10:39:43 -04:00
  • c7cdaf8080 styled import page Tom Giannattasio 2012-10-12 10:36:02 -04:00
  • c2abd4b537 Add import page template Calen Pennington 2012-10-12 09:03:13 -04:00
  • 02a325b018 First stab at an import page. Needs styling Calen Pennington 2012-10-11 16:02:58 -04:00
  • 9cf5cd088a Merge pull request #880 from MITx/feature/cale/edge-landing-page Calen Pennington 2012-10-12 08:38:44 -07:00
  • a9ba3543d3 styled edge registration form Tom Giannattasio 2012-10-12 11:08:24 -04:00
  • ac71da1535 Make header tabs work Calen Pennington 2012-10-11 14:18:02 -04:00
  • ff25d13256 Merge pull request #868 from MITx/fix/cdodge/cas-delete-regression chrisndodge 2012-10-12 08:17:35 -07:00
  • 3c8de11f09 Standardize on how we bypass the draft-aware modulestore Calen Pennington 2012-10-12 11:10:12 -04:00
  • 750e70e842 Merge pull request #878 from MITx/feature/cale/edge-landing-page chrisndodge 2012-10-12 08:01:46 -07:00
  • 281f194b2a per feedback, change back 'draft-aware' modulestore to not delete the published copy. In delete_item in views.py do the logic to determine whether we should be using a 'draft-aware' modulestore or not, based on the category type Chris Dodge 2012-10-12 09:25:13 -04:00
  • 1015b3a974 DraftMongoContentStore needs to both delete the draft *and* the non-draft entities Chris Dodge 2012-10-11 17:18:02 -04:00
  • 73a80ec4eb Merge pull request #877 from MITx/feature/cdodge/cas-tarball-import Calen Pennington 2012-10-12 07:38:24 -07:00
  • 14a1a7da31 allow importing of .tar.gz packages of courseware Chris Dodge 2012-10-12 10:33:31 -04:00
  • 4814f8c38e Cleaning up logos for edge landing page Calen Pennington 2012-10-12 10:31:46 -04:00
  • c41c084b39 Wire up login and register forms for edx landing page Calen Pennington 2012-10-12 09:55:32 -04:00
  • 96bdd03406 re-enable email change functionality David Ormsbee 2012-10-12 09:54:47 -04:00
  • b2d70e2801 Merge pull request #872 from MITx/feature/cale/edge-landing-page chrisndodge 2012-10-12 06:27:19 -07:00
  • 71201a73b2 styles and tiny bit of logic for community tas Arjun Singh 2012-10-12 04:54:56 -07:00
  • c28c3f9916 Merge branch 'master' into hotfix/arjun/fix_integer_disc_ids Arjun Singh 2012-10-12 04:23:29 -07:00
  • 6fbf2f9720 revert toString changes; use attr('data-id') instead of data('id') when mongo ids are involved Arjun Singh 2012-10-12 04:22:27 -07:00
  • c814758715 Merge pull request #866 from MITx/feature/cdodge/cms-import Calen Pennington 2012-10-11 19:22:19 -07:00