Commit Graph

  • 1e598ad1f5 Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint Chris Dodge 2012-11-13 10:34:31 -05:00
  • dbcb1adfaf Merge remote-tracking branch 'origin/master' into feature/cale/cms-master Calen Pennington 2012-11-13 10:22:42 -05:00
  • eb92ad1fd8 Merge pull request #1032 from MITx/feature/jzoldak/cms-unit-testing Calen Pennington 2012-11-13 07:08:52 -08:00
  • a060b8de9c Use xmodule.templates instead of hard coding them in the test Jay Zoldak 2012-11-13 08:35:22 -05:00
  • f9f5850a55 update press page mentions through September, and home page pointers for early November. Brian Wilson 2012-11-12 23:14:20 -05:00
  • 5f97533caa add meta tag for google verification Arjun Singh 2012-11-12 13:52:58 -08:00
  • f54d424124 Merge pull request #1038 from MITx/vik/add_self_assessment Victor Shnayder 2012-11-12 13:35:29 -08:00
  • 3f95116ac1 only ask for hints if assessed as wrong Victor Shnayder 2012-11-12 16:23:58 -05:00
  • 92ab5af627 bigger error messages Victor Shnayder 2012-11-12 16:23:40 -05:00
  • 6e5a6f9753 make textboxes read-only when that makes sense. Victor Shnayder 2012-11-12 16:23:29 -05:00
  • 39210fa95f Move point where input box is disabled Vik Paruchuri 2012-11-12 14:20:44 -05:00
  • d5702fc712 Add in ability to define score points Vik Paruchuri 2012-11-12 14:19:04 -05:00
  • ba8781ddf4 Modify to store scores instead of correct/incorrect, remove student ability to edit response Vik Paruchuri 2012-11-12 14:07:06 -05:00
  • b378af87be Merge pull request #1011 from MITx/vik/add_self_assessment Victor Shnayder 2012-11-12 10:21:48 -08:00
  • 6a313fd562 more css tweaks Victor Shnayder 2012-11-12 13:17:26 -05:00
  • 0ad2154b86 merge in origin/master Victor Shnayder 2012-11-12 13:10:21 -05:00
  • 2b55c5906d css tweaks Victor Shnayder 2012-11-12 13:09:16 -05:00
  • 68fb5c9799 bugfixes re: button state Victor Shnayder 2012-11-12 13:03:12 -05:00
  • 4922ab33c0 hook up reset button Victor Shnayder 2012-11-12 12:43:55 -05:00
  • 0ec7043e05 mostly working version of self-assessment Victor Shnayder 2012-11-12 12:14:12 -05:00
  • 1e956d448f Do not display the grade when student is not passing John Jarvis 2012-11-10 02:18:59 -05:00
  • ca6cfe4247 http->https John Jarvis 2012-11-09 23:40:18 -05:00
  • 50415acbff Merge pull request #1037 from MITx/fix/rocha/dashboard-without-certificates jarv 2012-11-09 18:42:39 -08:00
  • 5f5f56bbbd Fix syntax on dashboard template Carlos Andrés Rocha 2012-11-09 21:40:55 -05:00
  • e37a71b67b Merge pull request #1036 from MITx/fix/rocha/dashboard-without-certificates jarv 2012-11-09 18:01:16 -08:00
  • 8c2cbede9e Quickfix to render the dashboard when there is no certificate db tables Carlos Andrés Rocha 2012-11-09 20:58:02 -05:00
  • 39a5b6ebde Merge pull request #1035 from MITx/feature/jarv/cert-feature-flag Carlos Andrés Rocha 2012-11-09 17:32:05 -08:00
  • 157c98a79d only check cert_status when certificates feature flag is enabled John Jarvis 2012-11-09 20:31:05 -05:00
  • 6857dae0eb Merge pull request #1034 from MITx/feature/rocha/cert jarv 2012-11-09 15:54:12 -08:00
  • fc32032bd1 Cleanup django-admin commands John Jarvis 2012-11-09 18:53:29 -05:00
  • d6403fe34c renmaing unusual to unicode, fixing syntax and removing id in enrolled_students query John Jarvis 2012-11-09 18:51:31 -05:00
  • 2c41b94d11 Cleanup and django-admin commands John Jarvis 2012-11-09 17:48:03 -05:00
  • 35acbc840e add note about new end_of_course_survey_url flag to docs Victor Shnayder 2012-11-09 14:25:06 -05:00
  • c27913c505 bugfixes in template Victor Shnayder 2012-11-09 14:18:49 -05:00
  • aedb02543c always return grade as part of cert status Victor Shnayder 2012-11-09 14:00:05 -05:00
  • ca9cb86a7d show proper course will-start/started/ended text on dashboard Victor Shnayder 2012-11-09 13:14:12 -05:00
  • 1b2371d64a fix bug in has_ended Victor Shnayder 2012-11-09 13:13:48 -05:00
  • 9fbcb4445e adding migrations John Jarvis 2012-11-09 12:59:53 -05:00
  • 21c30002b1 fix syntax in template Victor Shnayder 2012-11-09 12:25:58 -05:00
  • 2846c61d15 Revert "remove (almost) all references to askbot." Victor Shnayder 2012-11-09 12:03:12 -05:00
  • 0b69870d05 Reverting askbot removal for now Victor Shnayder 2012-11-09 12:02:44 -05:00
  • cf33d85ef9 Wire up cert status Victor Shnayder 2012-11-09 12:02:01 -05:00
  • 01dcf291b6 Adding setting variable for CERT_QUEUE John Jarvis 2012-11-09 11:03:58 -05:00
  • 83b79fb87e Adding new certificate state for "notpassing" John Jarvis 2012-11-09 10:57:03 -05:00
  • c6bfb67b1a revised no certificate state for dashboard messages and removed course message UI for future work on separate branch Brian Talbot 2012-11-08 12:08:09 -05:00
  • d155869f16 added in course-wide completion message static states and styling Brian Talbot 2012-11-08 11:38:01 -05:00
  • be13bc6026 added in completed course status to dashboard and certificate availability states Brian Talbot 2012-11-07 17:15:29 -05:00
  • 5d6687d897 Adding error_reason John Jarvis 2012-11-05 15:35:59 -05:00
  • 076619c81b Changing private method to use a single underscore John Jarvis 2012-11-05 15:04:22 -05:00
  • fb882d285f cert.state->cert.status John Jarvis 2012-11-05 15:03:55 -05:00
  • 8e5d6bd416 Change 'remove' to 'delete' for consistency John Jarvis 2012-11-04 18:56:30 -05:00
  • 8d628ef234 unavailable->CertificateStatuses.unavailable John Jarvis 2012-11-02 13:38:44 -04:00
  • 507794acf5 Adding defaults to created and added fields John Jarvis 2012-11-02 13:35:56 -04:00
  • 0481cf995f Updating view for different certificate statuses, error John Jarvis 2012-11-01 22:17:05 -04:00
  • 5529eecb85 Separate function for send_to_xqueue John Jarvis 2012-11-01 21:59:51 -04:00
  • 5019e2d03c cleanup John Jarvis 2012-11-01 21:51:43 -04:00
  • cb1489a7cb docstring cleanup, grading for regen_cert John Jarvis 2012-11-01 21:51:10 -04:00
  • df37f11122 Adding modified and created fields to GeneratedCertificates John Jarvis 2012-11-01 21:40:23 -04:00
  • a9b26cb871 Cleanup, docstrings, recording name in certificate table John Jarvis 2012-11-01 21:37:02 -04:00
  • f589adcd71 Comment about basic auth John Jarvis 2012-11-01 20:53:03 -04:00
  • 66c31fe21a Adding logging, reading sitename from settings John Jarvis 2012-11-01 20:51:05 -04:00
  • 84ff92d4d9 new migrations for certificates John Jarvis 2012-11-01 17:05:09 -04:00
  • 8c2e55676b Cleanup John Jarvis 2012-11-01 17:01:53 -04:00
  • fceed0fc70 view for the certificate callback URL John Jarvis 2012-11-01 16:41:22 -04:00
  • 0ef54cdeb8 Certificate interface to xqueue John Jarvis 2012-11-01 16:40:40 -04:00
  • 416b5458a6 Certificate model for tracking certificate statuses John Jarvis 2012-11-01 16:39:21 -04:00
  • 29ed95c147 "ungenerated_certs" command update John Jarvis 2012-11-01 16:38:36 -04:00
  • b326b83fb6 Adding XQueueCertificate interface. John Jarvis 2012-11-01 16:34:51 -04:00
  • 8ccaafd758 adding migration for certificate changes John Jarvis 2012-10-30 20:17:02 -04:00
  • 22ed22d956 Updating the certificate app for testing John Jarvis 2012-10-30 18:35:03 -04:00
  • d636d729c6 add migration to remove askbot columns Victor Shnayder 2012-10-30 19:54:15 -04:00
  • 76f0cf4a86 remove (almost) all references to askbot. Victor Shnayder 2012-10-30 18:23:07 -04:00
  • f88cb685aa split out the assess and reflect states. Still need matching js Victor Shnayder 2012-11-09 16:20:53 -05:00
  • 5f926ebad0 Add better comments and modulestore cleanup. Jay Zoldak 2012-11-09 14:34:04 -05:00
  • da3c3e5f20 initial xlint implementation. Accumulate all import errors during XmlModuleStore importing. Also do checks post XmlModuleStore import and assert that the structure (course->chapter->sequential->vertical) is present in the courses. Chris Dodge 2012-11-09 13:54:12 -05:00
  • bc34d79dbf Improve assertions by using HTML matchers. Jay Zoldak 2012-11-09 12:14:11 -05:00
  • 58eea1bc80 Remove section close tag that had no open tag. Jay Zoldak 2012-11-09 11:40:23 -05:00
  • f249c227a5 Fix typo in close tag in header Jay Zoldak 2012-11-09 11:05:37 -05:00
  • 7efaa87c19 Add test for clone item. Also change password hashing for faster tests. Jay Zoldak 2012-11-09 10:54:50 -05:00
  • 39fda1ea9b in progress staff section styling Brian Talbot 2012-11-09 10:31:08 -05:00
  • da8efc17de Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint Chris Dodge 2012-11-09 09:37:21 -05:00
  • 48093da589 Merge pull request #1030 from MITx/fix/cdodge/need-to-pass-course-namespace-for-cms-rewrite chrisndodge 2012-11-09 06:26:10 -08:00
  • 01889df686 need to pass in course namespace when rewrite static links in the CMS Chris Dodge 2012-11-09 09:23:48 -05:00
  • e6ce669e19 Merge pull request #1029 from MITx/fix/cdodge/static-import-path-error chrisndodge 2012-11-09 06:13:19 -08:00
  • 5a02e37cce make sure we strip away the leading '/' from the subpath for static content otherwise the naming expectations will break Chris Dodge 2012-11-09 09:11:56 -05:00
  • 14564b2310 Merge branch 'feature/cale/cms-master' into feature/jzoldak/cms-unit-testing Jay Zoldak 2012-11-09 08:58:48 -05:00
  • b145112740 multi-input field markup and styling Brian Talbot 2012-11-09 08:39:54 -05:00
  • f1e1f9e7e5 in progress field layout styling Brian Talbot 2012-11-08 18:11:48 -05:00
  • fb3b52b99f refactor + style self-assessment in progress Victor Shnayder 2012-11-08 18:01:09 -05:00
  • 8f2ab52215 in progress form styling of course info Brian Talbot 2012-11-08 17:48:38 -05:00
  • ddfbf3b678 Add test for course overview page Jay Zoldak 2012-11-08 17:16:25 -05:00
  • 6b12cfd740 Merge pull request #1028 from MITx/feature/ned/better-node-installation jarv 2012-11-08 14:13:27 -08:00
  • f912fb9542 Get node.js from a more up-to-date PPA. Ned Batchelder 2012-11-08 17:04:29 -05:00
  • 3774c95b5e Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/cdodge/xlint Chris Dodge 2012-11-08 16:12:26 -05:00
  • 13700316a6 Merge pull request #1025 from MITx/feature/cdodge/static-tab-edit chrisndodge 2012-11-08 13:10:51 -08:00
  • 981f5cee45 initial buildout of a 'xlint' test to verify legacy coursewar Chris Dodge 2012-11-08 16:07:17 -05:00
  • 2077f62dd5 Add test for index page, plus SOUTH migrations for faster test execution. Jay Zoldak 2012-11-08 14:16:51 -05:00
  • 488918b777 Merge pull request #1027 from MITx/origin/feature/cdodge/static-tab-edit chrisndodge 2012-11-08 10:33:03 -08:00
  • c3c6a7af7e address feedback from cale Chris Dodge 2012-11-08 13:29:46 -05:00
  • 171e932266 Merge branch 'master' into feature/cale/cms-master Calen Pennington 2012-11-08 12:28:40 -05:00