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

Commit Graph

  • 7f32aae47d rename method to something that actually better reflects what it is doing. Also rename a variable to help with readability Chris Dodge 2013-01-30 11:50:11 -05:00
  • e5115953ad rework redorder tabs so that we account for the fact that static tabs can be in any arbitrary order (with respect to non-static tabs) when working with an imported course Chris Dodge 2013-01-30 11:36:28 -05:00
  • 8720d1ac3a Merge pull request #1379 from MITx/bug/dhm/grading Christina Roberts 2013-01-30 08:34:32 -08:00
  • 19927a83a5 Ensure settings and course info CRUD operations tell the user if there's a server error and pull the server error handler into a common function. Don Mitchell 2013-01-30 11:24:55 -05:00
  • 67775fbfa9 Merge pull request #1377 from MITx/feature/christina/misc chrisndodge 2013-01-30 08:24:38 -08:00
  • 3a2d851132 Images pass through fine Vik Paruchuri 2013-01-30 11:17:38 -05:00
  • 6c21469bed Fix some image upload issues Vik Paruchuri 2013-01-30 11:11:23 -05:00
  • d6947f1da7 Proper image submission, error handling Vik Paruchuri 2013-01-30 11:02:31 -05:00
  • b38595f115 Fix the fixtures, add new tests, remove useless code from the original JS Diana Huang 2013-01-30 10:50:47 -05:00
  • d0ea29358a Merge pull request #1381 from MITx/press/bostonX David Ormsbee 2013-01-30 07:48:22 -08:00
  • bae898edb0 Auto convert image to link, display inside student answer Vik Paruchuri 2013-01-30 10:47:50 -05:00
  • 99dd9636ce fix copy+paste bug. Victor Shnayder 2013-01-30 10:43:36 -05:00
  • 043d962329 Merge github.com:MITx/mitx into feature/kevin/groups_ui_changes Your Name 2013-01-30 10:26:23 -05:00
  • 012d8107fa Get image upload, check for issues, upload to S3 Vik Paruchuri 2013-01-30 10:04:14 -05:00
  • fd4b3f9489 Merge pull request #1332 from MITx/fix/cdodge/unit-test-of-draft-store Christina Roberts 2013-01-30 06:49:53 -08:00
  • dbf15fc2ac add comment on draft store test which explains test success is just for get_items() not to throw an exception when passed in a course_id Chris Dodge 2013-01-30 09:46:38 -05:00
  • 74fcf96611 don't hard code the ordering of the tabs in the test. Take the current ordering defintion (in the test data) and reverse it Chris Dodge 2013-01-30 09:43:57 -05:00
  • ab4fd03dd8 Catch any and all save errors Don Mitchell 2013-01-30 09:43:27 -05:00
  • 0c0a897127 Work on uploading image submission to S3 Vik Paruchuri 2013-01-30 09:36:01 -05:00
  • 4df62d968d Fix up new jasmine tests Diana Huang 2013-01-30 09:31:42 -05:00
  • ce8a48405b Clean up some JS errors showing up in the xmodule jasmine tests Diana Huang 2013-01-30 09:31:20 -05:00
  • 3c1c61fb19 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). cahrens 2013-01-30 09:23:07 -05:00
  • 2854d7d066 Point course_image.jpg at the correct place in the /static url space Calen Pennington 2013-01-29 16:21:46 -05:00
  • 07487a8d8f Use descriptor when setting up replace_urls, as it's been created at that point Calen Pennington 2013-01-29 14:27:27 -05:00
  • e773b8e7b1 Fix import error Calen Pennington 2013-01-29 14:22:39 -05:00
  • 9ae83338c6 Whitespace cleanup Calen Pennington 2013-01-29 14:20:21 -05:00
  • 95f2c9e275 Standardize how static urls are replaced by modules in their own html Calen Pennington 2013-01-29 14:20:01 -05:00
  • 89f984c08b Prefix courseware urls with /static, since they are no longer served through collectstatic Calen Pennington 2013-01-29 13:48:07 -05:00
  • d132f2e18a Only put data repos in STATICFILES_DIRS if we're serving them from django (which is only in dev) Calen Pennington 2013-01-28 15:05:04 -05:00
  • d06f5f7791 Fix file upload stuff, debug some image check routines Vik Paruchuri 2013-01-30 09:02:04 -05:00
  • 0622dc995d Javascript to handle file uploads Vik Paruchuri 2013-01-29 22:42:08 -05:00
  • fbdc190a58 Add in file upload ability Vik Paruchuri 2013-01-29 22:16:48 -05:00
  • f367b7ace2 Change ruby version Vik Paruchuri 2013-01-29 21:53:36 -05:00
  • b730c25056 Fix rubric rendering Vik Paruchuri 2013-01-29 21:51:48 -05:00
  • 08e06f8719 Fix some tab problems Vik Paruchuri 2013-01-29 21:39:54 -05:00
  • 01f218b7f8 Fix some tab issues from the rebase Vik Paruchuri 2013-01-29 21:36:55 -05:00
  • 9c5fe05689 Update reqs for pillow, work on file uploads Vik Paruchuri 2013-01-29 18:30:49 -05:00
  • 4d1f9d2edf Function to upload stuff to S3 Vik Paruchuri 2013-01-29 17:35:48 -05:00
  • 929160e180 Add in ability to validate images and image paths (urls) Vik Paruchuri 2013-01-29 17:29:02 -05:00
  • 5d4ad4b8ca Simple method to count colors in an image Vik Paruchuri 2013-01-29 17:15:02 -05:00
  • 255405d0bf Automatically show results at certain points (when need to reset, when finished with a problem, etc) Vik Paruchuri 2013-01-25 11:47:27 -05:00
  • 9e673e8aa7 Remove wrapper p tags Vik Paruchuri 2013-01-25 10:04:21 -05:00
  • fde370bd92 Fix notification issue, sanitize input html Vik Paruchuri 2013-01-25 09:55:47 -05:00
  • a5daf1f34d Perhaps properly sanitize js Vik Paruchuri 2013-01-24 13:44:48 -05:00
  • 6425a519fd Fix notifications to work with cache (sync timings) Vik Paruchuri 2013-01-24 09:36:25 -05:00
  • 2f2b5fa753 Fix unicode problem Vik Paruchuri 2013-01-23 17:34:26 -05:00
  • bd0b933ff2 Highlight the correct tab Vik Paruchuri 2013-01-23 17:06:29 -05:00
  • ea6ce60d0b Use the variable and not the hex value. Diana Huang 2013-01-23 16:37:26 -05:00
  • d4ed059975 Do some better error checking for items. Diana Huang 2013-01-23 16:05:25 -05:00
  • a2db72e10f Update text. Diana Huang 2013-01-23 15:48:42 -05:00
  • 486753a263 Display alerts from notifications on the panel. Diana Huang 2013-01-23 15:41:18 -05:00
  • 9f19eafcf0 Update main notification dashboard with new styles. Diana Huang 2013-01-23 14:12:06 -05:00
  • 4140b74e47 Fix progress return Vik Paruchuri 2013-01-23 12:49:18 -05:00
  • cee69bb765 Fix return of score to progress tab Vik Paruchuri 2013-01-23 12:46:21 -05:00
  • 252e54fef5 Add in is_scored boolean, remove some noisy debug statements Vik Paruchuri 2013-01-23 12:31:58 -05:00
  • d07bf0157e UI updates to the Open Ended Problems page Diana Huang 2013-01-23 10:55:30 -05:00
  • 665fb707b1 Cache notifications for 5 mins so that we don't hit the grading server on every web request Vik Paruchuri 2013-01-23 10:43:45 -05:00
  • 68f563a178 Fix naming issue Vik Paruchuri 2013-01-22 17:35:40 -05:00
  • 8b8c1dbe60 Fix query error Vik Paruchuri 2013-01-22 17:29:09 -05:00
  • 3531bce7d3 Fix score checking, latest post assessment scraping Vik Paruchuri 2013-01-22 15:10:12 -05:00
  • 29f738f7ce Minor count fix Vik Paruchuri 2013-01-22 14:34:08 -05:00
  • 5291271591 Add in some minimal checking to make sure that the max score and scores for each rubric point are 3 Vik Paruchuri 2013-01-22 14:33:18 -05:00
  • 33003e65d4 Make things less noisy (remove debug statements) Vik Paruchuri 2013-01-22 14:21:17 -05:00
  • 0630f59c06 Pass proper parameters, fix templating Vik Paruchuri 2013-01-22 13:13:57 -05:00
  • 6412eb4080 Fix naming for overall need to check Vik Paruchuri 2013-01-22 10:19:34 -05:00
  • bb55792b2b Make things less noisy (remove debug statements) Vik Paruchuri 2013-01-22 14:21:17 -05:00
  • d3d4e557d6 Fix notification display Vik Paruchuri 2013-01-22 14:16:18 -05:00
  • 457afaaeda Making tab render properly for open ended notifications Vik Paruchuri 2013-01-22 14:14:28 -05:00
  • f47c431faf Fix templating Vik Paruchuri 2013-01-22 13:22:30 -05:00
  • 8602e1595b Pass proper parameters, fix templating Vik Paruchuri 2013-01-22 13:13:57 -05:00
  • 0f212cc8f2 Fix course id passing, template rendering Vik Paruchuri 2013-01-22 12:53:20 -05:00
  • 6b7ba37999 Combined notification view Vik Paruchuri 2013-01-22 12:09:34 -05:00
  • 22a2bdaa3d Disable student problem list caching, build out notifications Vik Paruchuri 2013-01-22 11:57:26 -05:00
  • 4112f8ad8e Pass back dictionaries where needed from notifications functions Vik Paruchuri 2013-01-22 11:53:46 -05:00
  • 68db8b0d77 Refactor tab logic, start adding in combined notifications view Vik Paruchuri 2013-01-22 11:46:46 -05:00
  • 61d62f274e Fix issue with parsing of open ended list Vik Paruchuri 2013-01-22 10:57:20 -05:00
  • f4574c75db Proper config dictionary generation for controller query Vik Paruchuri 2013-01-22 10:54:14 -05:00
  • 693337593e Properly parse url for grading controller Vik Paruchuri 2013-01-22 10:43:08 -05:00
  • e6dd07a41e Fix parameter passing Vik Paruchuri 2013-01-22 10:39:49 -05:00
  • b0599ea133 Fix queries and some controller query stuff Vik Paruchuri 2013-01-22 10:34:48 -05:00
  • 2191f3e228 Add in open ended problems view Vik Paruchuri 2013-01-22 10:30:03 -05:00
  • fe77bb00c4 Fix naming for overall need to check Vik Paruchuri 2013-01-22 10:19:34 -05:00
  • 5e63a4690b Work on getting combined notifications Vik Paruchuri 2013-01-22 10:18:04 -05:00
  • d28228639e Add in controller query stuff Vik Paruchuri 2013-01-17 16:58:35 -05:00
  • c62ce7822e Add in service support for getting the grading status list Vik Paruchuri 2013-01-17 16:16:13 -05:00
  • 43783e4ff0 Add in an item to check for combined notifications Vik Paruchuri 2013-01-17 15:18:39 -05:00
  • 7b65f56121 Add service to query controller for eta of submission and to check if name is unique Vik Paruchuri 2013-01-17 15:15:58 -05:00
  • b5508b0123 Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-29 17:36:54 -05:00
  • c487e026f3 Merge pull request #1380 from MITx/press/bostonX David Ormsbee 2013-01-29 14:35:17 -08:00
  • f1973dc660 minor update to new jasmine test Diana Huang 2013-01-29 17:34:54 -05:00
  • 5bfd2c33b0 send cohort to post view context Your Name 2013-01-29 17:34:52 -05:00
  • 19c46d224f BostonX press release Victor Shnayder 2013-01-29 17:33:06 -05:00
  • b8c1dba1cb Catch save error and throw it in the user's face (bug 147). May need to add catches in more places or put in $.ajaxSetup? Don Mitchell 2013-01-29 17:31:12 -05:00
  • 43d4661c3f Merge branch 'master' into feature/kevin/groups_ui_changes Your Name 2013-01-29 17:23:29 -05:00
  • 3404011f16 update front end to support selection and display of cohort ids Your Name 2013-01-29 17:23:08 -05:00
  • 40d59faa68 Merge pull request #1330 from MITx/diana/open-ended-ui-updates David Ormsbee 2013-01-29 14:10:18 -08:00
  • 0b9262a478 Merge pull request #1378 from MITx/feature/jarv/certificate-restriction jarv 2013-01-29 13:48:05 -08:00
  • 615e6da2f4 Minor update to embargo text John Jarvis 2013-01-29 16:47:09 -05:00
  • f7424eb8d6 Merge branch 'master' into tests/diana/update-oe-unit-tests Diana Huang 2013-01-29 16:44:15 -05:00
  • 26cb1c5a25 Fixes for https://edx.lighthouseapp.com/projects/102637/tickets/144 (progress tab not updating). cahrens 2013-01-29 16:30:41 -05:00