Commit Graph

  • 956669de21 If location cannot be found, move on Vik Paruchuri 2013-05-21 14:21:46 -04:00
  • 0887383ca7 Don't show peer grading button unless there is a peer grading element in the course Vik Paruchuri 2013-05-21 14:18:00 -04:00
  • 158948336f Merge pull request #2046 from edx/fix/cale/pylint-cleanup Calen Pennington 2013-05-21 10:27:13 -07:00
  • ea1bc6b875 Merge pull request #2080 from edx/feature/nate/handle-heroku-maintenance-mode Nate Hardison 2013-05-21 10:07:09 -07:00
  • cfe220a746 Add exceptions for unused imports in settings files Calen Pennington 2013-05-21 13:07:04 -04:00
  • cc7b2942ee Handle Heroku's 503 maintenance mode response Nate Hardison 2013-05-17 15:35:14 -07:00
  • 82482e89ea Finish calc.py tests; add docstrings, etc Peter Baratta 2013-05-21 11:07:19 -04:00
  • 3b15207bc6 Use draft module store so we can test editing components (problems, html, etc.). cahrens 2013-05-21 09:58:34 -04:00
  • 0b92e0b91b Upgrade version of xblock. cahrens 2013-05-21 09:49:28 -04:00
  • 094e396556 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master Chris Dodge 2013-05-21 09:47:11 -04:00
  • 3dc9791382 Update xblock, start Selenium. cahrens 2013-05-21 09:38:56 -04:00
  • bb699f482d Update xblock, start Selenium. cahrens 2013-05-21 09:37:55 -04:00
  • d5d99ef60f Switch to official pylint 0.28 release Calen Pennington 2013-05-15 10:02:08 -04:00
  • 241ef68f4f Start linting envs files, add task to only pylint errors, and move pylintrc file to the correct location Calen Pennington 2013-05-15 09:44:47 -04:00
  • fd6da08a97 Fix text Vik Paruchuri 2013-05-21 00:26:39 -04:00
  • 1f34561cff Update examples, fix parsing error, avoid collision with capa template Vik Paruchuri 2013-05-21 00:22:33 -04:00
  • 4dab8f07b0 fix mocking issue Vik Paruchuri 2013-05-20 17:29:11 -04:00
  • 073c6d9a79 Merge pull request #2088 from edx/bug/btalbot/studio-lineheight Brian Talbot 2013-05-20 13:49:18 -07:00
  • d0e8965a3c Fix pep8/pylint issues Vik Paruchuri 2013-05-20 16:42:27 -04:00
  • c8eeea240b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui cahrens 2013-05-20 16:27:11 -04:00
  • 4facd262bd Jasmine test for metadata model. cahrens 2013-05-20 16:26:48 -04:00
  • 3b3cf19c47 Fix tests and add in jasmine test Vik Paruchuri 2013-05-20 15:52:19 -04:00
  • 23269359c1 Jasmine tests, fix some review issues Vik Paruchuri 2013-05-20 15:31:56 -04:00
  • 5e8d2ce4f7 Start making comprehensive calc tests Peter Baratta 2013-05-20 13:59:12 -04:00
  • 3cf915005b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui marco 2013-05-20 15:22:31 -04:00
  • 79c78cbccd made firefox input number increment objects positioned as % to respond to page size accordingly marco 2013-05-20 15:22:21 -04:00
  • 8bbbe992fe studio - references new line-height() Sass mixin when declaring typography archetypes Brian Talbot 2013-05-20 14:09:57 -04:00
  • 31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet Brian Talbot 2013-05-20 14:02:00 -04:00
  • 4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-20 15:06:40 -04:00
  • c94f8d6f56 Merge pull request #2089 from edx/bugfix/e0d/resize-notes-uri e0d 2013-05-20 11:49:59 -07:00
  • a7b02e0029 actually needs to be 255 given unicode requirements e0d 2013-05-20 14:40:05 -04:00
  • 7641e128de Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui marco 2013-05-20 14:39:50 -04:00
  • c0cff81e5e styled firefox number buttons marco 2013-05-20 14:39:37 -04:00
  • c947133e54 A better way to compute the hash, that gets the right hash after an install actually installs something. Ned Batchelder 2013-05-20 14:39:25 -04:00
  • 7699c1794c Merge remote-tracking branch 'origin/master' into feature/vik/oe-editor Vik Paruchuri 2013-05-20 14:16:04 -04:00
  • 25388dec96 Minor cleanup. cahrens 2013-05-20 13:31:55 -04:00
  • 2020923f2d Prevent invalid numeric entries. cahrens 2013-05-20 13:26:27 -04:00
  • f63a4432d0 Merge pull request #2086 from edx/bugfix/e0d/resize-notes-uri e0d 2013-05-20 10:24:27 -07:00
  • ec09ac7f29 Put numpy into a pre.txt so that everything will actually install. Ned Batchelder 2013-05-20 12:57:07 -04:00
  • 16e1ecf686 fix some pylint violations Vik Paruchuri 2013-05-20 12:46:12 -04:00
  • 23384ca2eb Use backticks so that the command won't echo to the user. Ned Batchelder 2013-05-20 12:09:28 -04:00
  • fa87a64984 Missing trailing paren Ned Batchelder 2013-05-20 12:06:36 -04:00
  • c356904027 css styles for firefox input number fields marco 2013-05-20 12:06:30 -04:00
  • 0e37564490 pep8 fixes e0d 2013-05-20 12:01:25 -04:00
  • a54ecb98c6 resizing uri column e0d 2013-05-20 11:59:56 -04:00
  • 5b5fbc6b14 Fingerprint the filenames in site-packages to decide when to install requirements. Ned Batchelder 2013-05-17 18:15:40 -04:00
  • ed2c1cf0d1 Remove header from cheatsheet Vik Paruchuri 2013-05-20 11:46:01 -04:00
  • 32f7691040 minor style changes for increment and decrement buttons on firefox number fields marco 2013-05-20 11:39:13 -04:00
  • 55fda26fd8 Fix tests, fix xqueue error, minor polish Vik Paruchuri 2013-05-20 11:29:19 -04:00
  • 3229aaf503 Call polyfill at right time. cahrens 2013-05-20 11:16:20 -04:00
  • 6bdbbb62d5 Polish up editor, fix issues Vik Paruchuri 2013-05-20 11:09:35 -04:00
  • d4b54ceca7 Update open ended editor to parse tasks properly Vik Paruchuri 2013-05-20 10:49:04 -04:00
  • a44e816877 remove_open_ended_panel_tab() -> remove_extra_paneltab(). Also, update new forums test factors to use refactored Models.py Chris Dodge 2013-05-20 10:33:52 -04:00
  • 3671c7a7fd Merge pull request #2075 from edx/fix/btalbot/studio-navLineHeight Brian Talbot 2013-05-20 07:29:19 -07:00
  • fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master Chris Dodge 2013-05-20 10:22:36 -04:00
  • 986999c62e Fix cheatsheet, start working on xml replacement Vik Paruchuri 2013-05-20 09:50:15 -04:00
  • aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons marco 2013-05-20 09:45:33 -04:00
  • 3a15f93564 Render proper templates when user clicks on editor buttons Vik Paruchuri 2013-05-20 09:20:46 -04:00
  • 9a7006473e Do basic work on a simple editor for combinedopenended Vik Paruchuri 2013-05-20 09:07:03 -04:00
  • bf8df49728 studio - revising line height between course nav titles and prefixes Brian Talbot 2013-05-17 15:34:14 -04:00
  • 0947329fc4 Merge pull request #2076 from edx/fix/btalbot/studio-fontrefs Brian Talbot 2013-05-20 05:39:50 -07:00
  • 098a5dda48 studio - reverts google web font import method back to original @font-face syntax since Sass doesn't like google's original method when processing Brian Talbot 2013-05-17 16:41:21 -04:00
  • 4c80325db3 Start working on COE editor, fix name checking in module_render Vik Paruchuri 2013-05-20 08:11:54 -04:00
  • 9834f27eb9 Fingerprint the filenames in site-packages to decide when to install requirements. Ned Batchelder 2013-05-17 18:15:40 -04:00
  • f8e9c4d4d1 Merge pull request #2078 from edx/hotfix/rocha/celery-default-queue-name e0d 2013-05-17 15:02:31 -07:00
  • 34d39dde9a Set the default celery queue name in addition to the default routing key Carlos Andrés Rocha 2013-05-17 17:57:09 -04:00
  • bab4b18647 Set the browser size on startup of acceptance tests. This resolves an issue on Mac OS X in which the login dropdown arrow couldn't be clicked because it was off-screen. It should make the test suite more stable. Will Daly 2013-05-17 17:21:44 -04:00
  • 372084e0b6 Merge branch 'drupal-new' Greg Price 2013-05-17 16:17:35 -04:00
  • de5b4d7d27 Merge branch 'master' into drupal-new Greg Price 2013-05-17 16:10:56 -04:00
  • 5f7e856cf3 Merge pull request #2073 from edx/ned/message-if-no-install-needed Ned Batchelder 2013-05-17 13:08:51 -07:00
  • 5555d41d80 OK, all the phases should have messages. Ned Batchelder 2013-05-17 16:04:24 -04:00
  • 340d39f322 Merge pull request #2069 from edx/fix/cale/coffee-watch-on-osx Calen Pennington 2013-05-17 13:02:08 -07:00
  • 5268d982ce Merge pull request #2067 from edx/fix/gprice/mktg-button-closed-registration Greg Price 2013-05-17 12:40:54 -07:00
  • 39456f98b5 Merge pull request #2072 from edx/fix/sarina/add-frances Sarina 2013-05-17 12:38:47 -07:00
  • 0042988ea7 Merge pull request #2063 from edx/feature/rocha/lets-use-celery Carlos Andrés Rocha 2013-05-17 12:36:23 -07:00
  • 00378add25 Merge pull request #2065 from edx/diana/drupal/fix-link-test Diana Huang 2013-05-17 12:08:46 -07:00
  • b16e17a250 Some i18n work and other minor cleanup. cahrens 2013-05-17 14:57:25 -04:00
  • bc650887c9 Merge pull request #2070 from edx/fix/gprice/moar-cookies Greg Price 2013-05-17 11:56:59 -07:00
  • 61f135944d Print a message if the requirements files haven't changed. Ned Batchelder 2013-05-17 14:56:44 -04:00
  • 73e05b3e67 Add Frances Botsford as one of our authors Sarina Canelake 2013-05-17 14:48:11 -04:00
  • a28aed5803 Added tests for capa input templates. This includes tests for HTML we expect to be unescaped. Will Daly 2013-05-16 15:29:01 -04:00
  • 036be2a692 Merge pull request #2001 from edx/jtauber/intial-authors Sarina 2013-05-17 11:37:51 -07:00
  • d4cee365e6 Ensure CSRF cookie is present for login and registration pages Greg Price 2013-05-17 14:23:28 -04:00
  • 280f09739f Batched coffee --watch compilation in smaller batches Calen Pennington 2013-05-17 14:22:01 -04:00
  • f200bca6f8 Merge pull request #2066 from edx/fix/gprice/mktg-access-courseware Greg Price 2013-05-17 11:13:40 -07:00
  • db3189d5ad Disable marketing registration button for courses that user cannot enroll in Greg Price 2013-05-17 14:02:56 -04:00
  • cb9d2c8879 Merge pull request #2064 from edx/bug/frances/studio-ffnavwrap frances botsford 2013-05-17 11:08:03 -07:00
  • e69b5c4792 adjusted width of header nav to prevent wrapping in PC FF, also put max-width on Org name and Course number in header to prevent the nav from getting bumped way over Frances Botsford 2013-05-17 12:39:07 -04:00
  • e4509ae3ad Make "access courseware" buttons for marketing site break out of iframes Greg Price 2013-05-17 13:31:22 -04:00
  • 15a5e6c1ac Fix test so that it works with both CMS and LMS settings Diana Huang 2013-05-17 13:18:10 -04:00
  • ef3204da69 Merge pull request #2059 from edx/feature/zoldak/forum-testing Kevin Chugh 2013-05-17 10:10:55 -07:00
  • f4044ed1e8 Merge pull request #2061 from edx/bug/christina/static-pages Christina Roberts 2013-05-17 09:59:59 -07:00
  • ba983d5f49 Merge pull request #2062 from edx/diana/drupal/lettuce-tests Diana Huang 2013-05-17 08:56:11 -07:00
  • 35bd38d677 Add status app with simple view to check celery workers Carlos Andrés Rocha 2013-04-03 17:33:11 -04:00
  • c05efbc31e Added base Celery settings Carlos Andrés Rocha 2013-03-25 17:18:02 -04:00
  • 95496b5c50 Cleanup dev settings a little bit Carlos Andrés Rocha 2013-03-27 14:20:24 -04:00
  • 935905665c Have to look in subdirectories for requirements files. Ned Batchelder 2013-05-17 11:29:34 -04:00
  • 1c9ebbc9ef Put colon on Visibility back in. cahrens 2013-05-17 11:02:25 -04:00
  • 5920ea91ee One minor update. cahrens 2013-05-17 11:00:00 -04:00
  • a32a740c39 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui cahrens 2013-05-17 10:56:08 -04:00