Commit Graph

  • 2302b40022 Fix static_replace tests Calen Pennington 2013-02-06 10:33:36 -05:00
  • 1cc62fae75 Catch null pointer for uninitialized dates Don Mitchell 2013-02-06 10:23:29 -05:00
  • 40854fc1b4 Merge branch 'master' into feature/diana/close-oe-problems Diana Huang 2013-02-06 10:15:18 -05:00
  • 96eb16cd72 Make local dev work by trying checking staticfiles_storage for both the course_prefixed and non-course_prefixed urls Calen Pennington 2013-02-06 10:08:20 -05:00
  • bb789e758b studio - course nav: general flex-grid layout - WIP Brian Talbot 2013-02-06 09:57:03 -05:00
  • 4ba7de3402 Merge branch 'feature/cas/manual-policy' of github.com:MITx/mitx into feature/cas/manual-policy Don Mitchell 2013-02-06 09:56:19 -05:00
  • 8093de1d93 Set size of ACE Editor. cahrens 2013-02-06 09:49:27 -05:00
  • 0f5571f499 Merge branch 'feature/btalbot/studio-softlanding' of github.com:MITx/mitx into feature/btalbot/studio-softlanding Don Mitchell 2013-02-06 09:48:09 -05:00
  • 280de111e1 studio - soft landing: fixed flexible grid proportions on sign up/in UI Brian Talbot 2013-02-06 09:18:34 -05:00
  • f9304a88cb Remove unneeded error type. Diana Huang 2013-02-06 09:15:24 -05:00
  • 05ec0c11c6 Oops, when i alphabetized i got the value incorrectly. Don Mitchell 2013-02-06 09:08:28 -05:00
  • 95d3957377 Merge pull request #1438 from MITx/feature/vik/peer-grading-xmodule Diana Huang 2013-02-06 06:07:18 -08:00
  • 8c86eb2522 studio - soft landing: revised copy Brian Talbot 2013-02-06 09:03:07 -05:00
  • 592d7e532b Keys are sorted now Don Mitchell 2013-02-06 08:58:20 -05:00
  • 1687a99c5c studio - soft landing: added in modal copy and resolved image dimensions issue Brian Talbot 2013-02-06 08:53:23 -05:00
  • 92f2149daa Merge pull request #1443 from MITx/feature/ichuang/flag-to-disable-progress-graph David Ormsbee 2013-02-06 05:48:03 -08:00
  • 31b8f0ce7f Have errors go through jsmolcalc's getInfo Victor Shnayder 2013-02-05 23:27:52 -05:00
  • 6a7e30e331 add doc about disable_progress_graph ichuang 2013-02-06 04:01:28 +00:00
  • 0936f448fc add disable_progress_graph key to course metadata ichuang 2013-02-05 13:26:49 +00:00
  • c7a133470d inline discussions working Kevin Chugh 2013-02-05 22:43:09 -05:00
  • 219c51f898 Fix placeholder email in signup form Victor Shnayder 2013-02-05 22:24:20 -05:00
  • 222c01b20b Removed console logs Julian Arni 2013-02-04 23:56:49 -05:00
  • adb77ea699 hack to fix validation issues John Hess 2013-01-30 21:32:50 -05:00
  • 05e25dadcf Added validation warnings Julian Arni 2013-01-30 13:34:16 -05:00
  • 02eb55a913 Compiled version of Carlos' merge Victor Shnayder 2013-02-05 17:40:46 -05:00
  • 9bc25ff372 Replace editamolecule input type applet with GWT version Carlos Andrés Rocha 2013-01-23 13:18:43 -05:00
  • ab9bd4b805 Have errors go through jsmolcalc's getInfo Victor Shnayder 2013-02-05 14:41:11 -05:00
  • d74b21e444 Added edit a gene jmclaus 2013-01-09 16:53:50 -05:00
  • 752a455257 Fixed design-a-protein input type to save the value of output Carlos Andrés Rocha 2013-01-09 18:46:36 -05:00
  • bc3f373edf Added design protein 2D jmclaus 2013-01-09 15:14:25 -05:00
  • a52bf81846 WIP Support multiple edit-a-molecule applets Carlos Andrés Rocha 2013-01-09 15:42:53 -05:00
  • 11db1190e6 WIP Save edit-a-molecule state in input field Carlos Andrés Rocha 2013-01-09 11:50:42 -05:00
  • 41cce2d84f WIP Rename edit-a-molecule files to be more consistent Carlos Andrés Rocha 2013-01-09 11:48:17 -05:00
  • b864770da4 WIP show edit-a-molecule applet Carlos Andrés Rocha 2013-01-08 16:23:25 -05:00
  • efaaf58db5 WIP restore chemicalequationinput template Carlos Andrés Rocha 2013-01-08 18:01:43 -05:00
  • f68f023e35 WIP integration of edit-a-molecule Carlos Andrés Rocha 2013-01-08 16:17:19 -05:00
  • c5b86f3e81 Initial template for edit a molecule input Victor Shnayder 2013-01-07 13:40:36 -05:00
  • d0d15c0dc2 Import edit-a-molecule resources Carlos Andrés Rocha 2013-01-07 14:22:06 -05:00
  • 739938f35f add readme for symbolicresponse implementation (thanks Ike!) Victor Shnayder 2012-12-27 22:55:41 +01:00
  • 6d053b35c3 change sample upload script to work properly over https Victor Shnayder 2013-02-05 14:05:27 -05:00
  • 697c1d7bc9 sample script to log in and upload an answer to a problem Victor Shnayder 2012-12-21 12:47:00 +01:00
  • 4110a4e28b Protect against failure to load MathJax Victor Shnayder 2012-12-21 11:44:19 +01:00
  • 5275db9ab9 Cancel kind of works (reverts but leaves in new fields :-( ) Filter out system metadata fields Don Mitchell 2013-02-05 19:17:43 -05:00
  • 94e6346cf2 Fix combined open ended tests Vik Paruchuri 2013-02-05 19:04:30 -05:00
  • a1e73392c1 Fix descriptor creation Vik Paruchuri 2013-02-05 19:02:21 -05:00
  • 6b468df57d Merge pull request #1441 from MITx/hotfix/dave/revert_comment_client_changes Victor Shnayder 2013-02-05 15:54:25 -08:00
  • 0fc50095d9 Fix combined open ended tests Vik Paruchuri 2013-02-05 18:53:53 -05:00
  • a3a886bd0f Revert "Add tests for django-comment-client models" (which actually had a model change as well) David Ormsbee 2013-02-05 18:51:16 -05:00
  • 119b4206a4 Revert "Fix permissions bug and add test cases for django comment client permissions." David Ormsbee 2013-02-05 18:42:01 -05:00
  • 8877ec3500 More robust default version Vik Paruchuri 2013-02-05 18:38:21 -05:00
  • d5b70d7bfc inline cohorting working Your Name 2013-02-05 18:38:06 -05:00
  • 4614687e7f Debug image submissions Vik Paruchuri 2013-02-05 18:24:18 -05:00
  • 1b465d1beb implement testcenter_login Brian Wilson 2013-02-05 18:01:55 -05:00
  • 6e7287dd8e Fix some bugs in the peer grading problem code. Diana Huang 2013-02-05 17:36:06 -05:00
  • 74d37327b2 Also this Don Mitchell 2013-02-05 17:21:49 -05:00
  • 8f16d639b7 CRUD on policy fields w/ some validation Don Mitchell 2013-02-05 17:21:02 -05:00
  • 8bf29c0e1a Alter image test criteria Vik Paruchuri 2013-02-05 17:17:58 -05:00
  • 06499bbafc Fix some of the tests Vik Paruchuri 2013-02-05 17:10:35 -05:00
  • 1d3f8f0655 Pass display name and content link rewriting down the chain Vik Paruchuri 2013-02-05 16:54:57 -05:00
  • 8e7fa6c90c Support due date and display name Vik Paruchuri 2013-02-05 16:48:21 -05:00
  • e6770bcaa7 Parse and pass metadata Vik Paruchuri 2013-02-05 16:42:56 -05:00
  • 56b8353dfd studio - soft landing: refined sign in/up error states visually Brian Talbot 2013-02-05 16:41:24 -05:00
  • 3222e083eb Merge pull request #1435 from MITx/feature/cale/no-course-collectstatic-bugfix Christina Roberts 2013-02-05 13:36:56 -08:00
  • 0d8cfb9baa Merge pull request #1437 from MITx/fix/cdodge/static-content-server-return-404 Christina Roberts 2013-02-05 13:36:28 -08:00
  • 0133c7c669 Patch peer grading tab to work Vik Paruchuri 2013-02-05 16:32:40 -05:00
  • b68aff72f2 Merge pull request #1436 from MITx/debug/dave/sass David Ormsbee 2013-02-05 13:26:22 -08:00
  • 3fa1fe0cd6 change from throwing a Http404 exception, which I believe will try to render a static 404.html template - and ironically triggers a 500 server error. Just create a HttpResponse and set the status_code to 404. Chris Dodge 2013-02-05 16:26:07 -05:00
  • 1ef9d6388f re-add compression flag to sass David Ormsbee 2013-02-05 16:25:59 -05:00
  • 3dc05aa904 Make some bug fixes, alter definition passing to work Vik Paruchuri 2013-02-05 16:25:46 -05:00
  • 706a1072b9 undo pipeline changes David Ormsbee 2013-02-05 16:24:53 -05:00
  • 8360a7a7f5 Fix bug where we imported two functions w/ the same name Calen Pennington 2013-02-05 16:23:10 -05:00
  • 51db547a63 Merge branch 'master' into diana/rubric-ui-improvements Diana Huang 2013-02-05 16:18:56 -05:00
  • ce0b31465c Add in methods to interact with xmodule, change descriptor Vik Paruchuri 2013-02-05 16:17:55 -05:00
  • 8c4b661292 Merge pull request #1434 from MITx/bug/btalbot/studio-boldblockquote Christina Roberts 2013-02-05 13:13:44 -08:00
  • a7588410b2 Fix tests Diana Huang 2013-02-05 16:11:04 -05:00
  • 8ab76f72ad Switching over to a versioning system Vik Paruchuri 2013-02-05 16:07:35 -05:00
  • 31c89e6d03 Consolidate error messages. Diana Huang 2013-02-05 16:06:14 -05:00
  • c70531ae27 Move closed check logic into the OpenEndedChild Diana Huang 2013-02-05 16:00:16 -05:00
  • 120aa3cd3b Merge pull request #1421 from MITx/feature/vik/peer-grading-xmodule Diana Huang 2013-02-05 12:55:48 -08:00
  • 018412ca26 Return False to make this code clearer Diana Huang 2013-02-05 15:41:23 -05:00
  • 37900c3f76 Add more error logging for date parsing and make the closure checking more robust Diana Huang 2013-02-05 15:37:20 -05:00
  • d713b288b5 studio - resolved HTML display issue where bold and blockquote elements didn't match LMSs style Brian Talbot 2013-02-05 15:21:41 -05:00
  • ce87e6f221 Skip two tests Vik Paruchuri 2013-02-05 14:57:59 -05:00
  • b0d843e38d studio - soft landing: removed forgot password link from tab order of sign in form Brian Talbot 2013-02-05 14:55:58 -05:00
  • cae65706fd Pare down on peer grading service Vik Paruchuri 2013-02-05 14:37:08 -05:00
  • 8027cc7024 Fix some issues with tests Vik Paruchuri 2013-02-05 14:35:44 -05:00
  • 134f2f7af7 Fix tests, bugfix for problem url error Vik Paruchuri 2013-02-05 14:21:08 -05:00
  • cdf28f6183 studio - soft landing: added in edX Studio logo Brian Talbot 2013-02-05 14:14:14 -05:00
  • e13de7543f Test fixes, err response fixes, address review comments Vik Paruchuri 2013-02-05 14:12:11 -05:00
  • 34dc6e6320 Fix some issues with peer grading service Vik Paruchuri 2013-02-05 13:37:55 -05:00
  • 74c112e5cc Merge pull request #1373 from MITx/feature/zoldak/django-comment-client-tests David Ormsbee 2013-02-05 10:37:18 -08:00
  • e50652e733 Merge pull request #1397 from MITx/feature/cale/no-course-collectstatic David Ormsbee 2013-02-05 10:32:54 -08:00
  • 7984c4dfcb Move over grading service to xmodule Vik Paruchuri 2013-02-05 13:10:56 -05:00
  • 2097b69332 Added button to show/hide guided notes and discussions. Arthur Barrett 2013-02-05 13:10:23 -05:00
  • 45e4c0cfac Moved discussion thread html to its own template and only scroll when not in view. Arthur Barrett 2013-02-05 12:37:58 -05:00
  • 8bb5cc1c23 studio - course nav: added in root link to main nav Brian Talbot 2013-02-05 11:50:58 -05:00
  • afa5b75de2 studio - soft landing: optimizing/compressing new images Brian Talbot 2013-02-05 11:48:30 -05:00
  • 69ee6b584e Merge pull request #1430 from MITx/feature/jarv/remove-repos-cfg Calen Pennington 2013-02-05 08:43:47 -08:00
  • bff477e8d3 Removing repos.json import John Jarvis 2013-02-05 11:35:12 -05:00
  • b456281a8f studio - soft landing/nav: added in functionality/content to soft landing view and started punch list Brian Talbot 2013-02-05 11:34:28 -05:00