Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• bdc9570cd1 Removed Symbolset font files David Baumgold 2013-05-29 17:49:49 -04:00
• e17f9f6c37 Merge pull request #2108 from edx/pbaratta/calc-tests Peter Baratta 2013-05-30 12:54:52 -07:00
• 62d2ad8986 Put back in the blocks for Advanced Settings. cahrens 2013-05-30 15:50:01 -04:00
• 6c7491a35a Merge pull request #2153 from edx/fix/cale/remove-secrets Calen Pennington 2013-05-30 12:43:56 -07:00
• c12cb59b96 Merge pull request #2154 from edx/fix/db/advanced-settings-notifications David Baumgold 2013-05-30 12:27:19 -07:00
• 34d1ea9e63 Consolidated coverage report generation into one rake command. Added diff coverage reports using diff-coverage tool. Will Daly 2013-05-30 15:09:39 -04:00
• 57c382d587 Remove secrets from master Calen Pennington 2013-05-30 14:26:40 -04:00
• 4f1e6c484e Put the advanced settings notifications back in David Baumgold 2013-05-30 15:08:40 -04:00
• 5883ee8a5a Added directory structure tests Slater-Victoroff 2013-05-30 15:03:48 -04:00
• 1ead857792 Working on Lettuce tests for video in LMS. Peter Fogg 2013-05-30 15:01:23 -04:00
• c27391ce8f Accidently left in a set_trace and forgot to include files JonahStanley 2013-05-30 15:00:01 -04:00
• ccc253d5c0 Sped up tab lettuce test JonahStanley 2013-05-30 14:56:08 -04:00
• 9cdcc9df8c Bringing the create-dev-env.sh script up to date and generalizing for mac and debian-based systems Slater-Victoroff 2013-05-30 14:52:15 -04:00
• 858453fb83 Merge pull request #2152 from edx/fix/cale/remove-secrets Calen Pennington 2013-05-30 11:43:15 -07:00
• 6c06599d75 Prepare for Peter's change. cahrens 2013-05-30 14:30:28 -04:00
• 0cdc58bf12 Remove secrets from master Calen Pennington 2013-05-30 14:26:40 -04:00
• 7fe206a9d2 Sped up some Lettuce Tests JonahStanley 2013-05-30 14:23:49 -04:00
• 62b74008e6 Added tests for Limited Attempt Problems and Showing the Answer JonahStanley 2013-05-30 14:22:37 -04:00
• 46cf5e3338 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui cahrens 2013-05-30 14:13:14 -04:00
• 8fd15ce45d Review feedback. cahrens 2013-05-30 14:13:10 -04:00
• 86afe7279b Refactor user factory usage for lettuce tests. Fix merge conflict. Jay Zoldak 2013-05-30 13:48:07 -04:00
• 1c20978974 Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-30 12:57:31 -04:00
• c0c5e920a3 Go back to setFixtures. cahrens 2013-05-30 12:56:55 -04:00
• 0728086336 Merge pull request #2151 from edx/fix/cdodge/hack-for-deploy chrisndodge 2013-05-30 09:54:41 -07:00
• 10761f102f applying same hack from rc to master until real fix is ready Chris Dodge 2013-05-30 12:53:30 -04:00
• 2f504ec4bf fix merge conflict Jay Zoldak 2013-05-30 12:42:50 -04:00
• a1b62912f3 Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui Jay Zoldak 2013-05-30 12:33:15 -04:00
• 4a64c0c9b6 Merge in from origin/feature/christina/metadata-ui Jay Zoldak 2013-05-30 12:33:02 -04:00
• 14eb9c9a3b Merge branch 'master' into feature/christina/metadata-ui cahrens 2013-05-30 12:27:03 -04:00
• 6627ca5635 Tidy up the new lettuce tests for metadata editing a bit. Jay Zoldak 2013-05-30 12:26:18 -04:00
• 5d41e2a952 Updates from code review. cahrens 2013-05-30 12:26:01 -04:00
• 8a0c470259 Merge pull request #2131 from edx/rc/2013-05-29 marcotuts 2013-05-30 09:00:14 -07:00
• 5118b06ef2 Merge pull request #2147 from edx/diana/fix-error-descriptor Diana Huang 2013-05-30 08:52:41 -07:00
• 6eeb12ad1c Add Lettuce tests for autoplay in Studio. Peter Fogg 2013-05-30 11:32:40 -04:00
• 72377e1a55 Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script Slater-Victoroff 2013-05-30 11:16:08 -04:00
• 715e324b29 Updated documentation in doc and README and made some small edits to bash script for added robustness Slater-Victoroff 2013-05-29 10:03:30 -04:00
• e493ada3ff Removed numpy and scipy files Slater-Victoroff 2013-05-30 11:11:05 -04:00
• 84149f8f78 Merge branch 'slater/new_mac_dev_script' of https://github.com/edx/edx-platform into slater/new_mac_dev_script Slater-Victoroff 2013-05-30 10:55:54 -04:00
• 0d56b9c2ff Updated documentation in doc and README and made some small edits to bash script for added robustness Slater-Victoroff 2013-05-30 10:55:39 -04:00
• 8b6bdb92c2 Added documenntation to the docs folder and edited the mac bash script in response to tests Slater-Victoroff 2013-05-30 10:11:14 -04:00
• 5eaa6aea23 Merge pull request #2140 from edx/fix/cdodge/add-randomize-to-list-of-collections chrisndodge 2013-05-30 06:20:21 -07:00
• 91c8570c37 Merge pull request #2142 from edx/fix/cdodge/repair-edge-login chrisndodge 2013-05-29 21:16:48 -07:00
• 31ea1eba06 Merge pull request #2148 from edx/remove-symbolset David Baumgold 2013-05-29 14:51:13 -07:00
• 4720f41bc2 Removed Symbolset font files David Baumgold 2013-05-29 17:49:49 -04:00
• b2fe7f5c01 Update documentation (per Toddi). cahrens 2013-05-29 17:19:33 -04:00
• 5465bda5f3 Use MITX_FEATURES to tell if we're in the CMS; this is much cleaner. Also use $.data instead of a hidden div. Peter Fogg 2013-05-29 17:00:25 -04:00
• f0260757c5 Cleanup. cahrens 2013-05-29 16:50:22 -04:00
• 910324fb49 Fix XML Error Module so that it no longer shows the data to non-staff. Diana Huang 2013-05-29 13:58:00 -04:00
• d7a1dda937 Update display name. cahrens 2013-05-29 16:23:31 -04:00
• 9d13ac0dd7 One more tweak to CodeJail Ned Batchelder 2013-05-29 14:38:37 -04:00
• 956998496a Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support. Ned Batchelder 2013-05-29 14:25:24 -04:00
• 0714b97511 Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes. Ned Batchelder 2013-05-29 14:24:43 -04:00
• 3bfe3de679 Do autoplay in lms, not in cms. Peter Fogg 2013-05-29 16:07:36 -04:00
• 81d3aa1464 Use self.system.debug instead of self.system.course_id; this seems less hacky. Peter Fogg 2013-05-29 16:00:43 -04:00
• c6dae2f17f Merge pull request #2145 from edx/ned/codejail-slug Ned Batchelder 2013-05-29 12:58:07 -07:00
• b77919a849 Remove unnecessary fields. cahrens 2013-05-29 15:53:30 -04:00
• 0332d22a02 Prevent autoplaying of videos in Studio. Peter Fogg 2013-05-29 15:52:42 -04:00
• 551a1c1516 pep8 and documentation cleanup. cahrens 2013-05-29 15:47:46 -04:00
• e0d5118ca0 Add hidden HTML so that the video player knows whether or not we're in the LMS. Peter Fogg 2013-05-29 15:45:36 -04:00
• 4920f08d2a i18n cahrens 2013-05-29 15:15:31 -04:00
• 42a55fafb2 Merge pull request #1714 from edx/feature/valera/videoalpha1_studio chrisndodge 2013-05-29 12:01:18 -07:00
• e3bc5e6bef Update for metadata changes. cahrens 2013-05-29 14:43:31 -04:00
• 3a030df5a7 One more tweak to CodeJail Ned Batchelder 2013-05-29 14:38:37 -04:00
• 34911f68a7 Pass safe_exec a slug, the problem or response id; Use the latest CodeJail, with slug support. Ned Batchelder 2013-05-29 14:25:24 -04:00
• 1d5f32d065 Give all response types an id attribute. CustomResponse had one, with a silly name. Use it for all ResponseTypes. Ned Batchelder 2013-05-29 14:24:43 -04:00
• 7d07309f9d Don't call setFixtures. Can stomp on other tests. cahrens 2013-05-29 14:03:16 -04:00
• 4335d7a208 Added largely functional bash script for setting up dev environment on macs. Due date of June 1st for open source deadline. Slater-Victoroff 2013-05-29 10:03:30 -04:00
• c1f72887fc Use latest CodeJail to prevent bytecode writing. Ned Batchelder 2013-05-28 21:45:46 -04:00
• 879f7d1051 fix Edge login to use the updated POST-back URL /login -> /login_ajax Chris Dodge 2013-05-29 12:11:25 -04:00
• 24707f8f85 Jasmine test for views. cahrens 2013-05-29 12:09:42 -04:00
• eb4dd76328 update POST-back URL to the new one - post Drupal Chris Dodge 2013-05-29 12:02:41 -04:00
• 25dae57226 add the new category which can act as a category Chris Dodge 2013-05-29 11:16:33 -04:00
• fa6bbfb9e2 Merge pull request #2129 from edx/fix/jonahstanley/fix-flakey-test Jonah Stanley 2013-05-29 07:48:46 -07:00
• 18f28457b8 Merge pull request #2134 from edx/ned/latest-codejail Ned Batchelder 2013-05-29 06:57:02 -07:00
• 4c97d16edc add hack to assets.rake to unblock the release train Chris Dodge 2013-05-28 23:40:16 -04:00
• ce9acf9fb2 Use latest CodeJail to prevent bytecode writing. Ned Batchelder 2013-05-28 21:45:46 -04:00
• 7a388587b5 Merge pull request #2133 from edx/jinpa/public-username-off-master jinpa 2013-05-28 17:11:02 -07:00
• c976fee2d9 Copy changes to make dup email or public-username messages more informative Jane Manning 2013-05-28 14:09:58 -07:00
• 2efa160c56 Merge pull request #2128 from edx/bugfix/brian/remove-debug-request brianhw 2013-05-28 14:11:20 -07:00
• f0e688e8f8 Merge tag 'hotfix-2013-05-28' Greg Price 2013-05-28 17:01:15 -04:00
• 9f48c44fb6 Merge pull request #2120 from edx/feature/will/capa-template-tests Will Daly 2013-05-28 13:55:05 -07:00
• 54fb46cee4 make debug_request available only when DEBUG is enabled, so that production doesn't have this security risk. Brian Wilson 2013-05-28 15:30:25 -04:00
• be70e016d4 Merge pull request #2127 from edx/jtauber/mitxmako-readme James Tauber 2013-05-28 12:24:58 -07:00
• c3c4a0e9ad Hopefully fixed registration flakey test JonahStanley 2013-05-28 15:22:47 -04:00
• d38f266153 updated mitxmako README to clarify license and origin James Tauber 2013-05-28 15:14:47 -04:00
• ab18953eec Merge pull request #2020 from edx/ux/marco/forums-icons marcotuts 2013-05-28 11:22:13 -07:00
• 3106ad027d Merge pull request #2125 from edx/giulio/fix-footer-layout caesar2164 2013-05-28 11:12:49 -07:00
• 0e4c08112f Merge pull request #2115 from edx/bug/christina/preview_url Christina Roberts 2013-05-28 11:08:22 -07:00
• b668ab62f3 Merge pull request #2126 from edx/gprice/tweak-500-text Greg Price 2013-05-28 11:08:07 -07:00
• 625c6b518c Cleanup, change how we load templates. cahrens 2013-05-28 14:07:35 -04:00
• 186da0d5fe fix user button/dropdown spacing/scrolling issue Giulio Gratta 2013-05-28 10:49:58 -07:00
• 25305dc8f7 lms/mktg - removes margins from social icons and reinstates flex-gutter margin to colophon area of footer Brian Talbot 2013-05-28 13:44:16 -04:00
• ef6c365ca0 lms/mktg - revises paragraph in colophon portion of footer to match footer's flex-grid value Brian Talbot 2013-05-28 13:36:47 -04:00
• 8d7b46b51b fix footer element spacing issues Giulio Gratta 2013-05-28 10:15:39 -07:00
• f3d4381fde Minor cleanup. cahrens 2013-05-28 12:53:00 -04:00
• aca5cbb215 Merge branch 'master' into bug/christina/preview_url cahrens 2013-05-28 12:13:19 -04:00
• e0bb4ad4dd Preview url is read in from environment file. cahrens 2013-05-28 12:04:48 -04:00
• 2c32200cce Updated text per Alex's e-mail. cahrens 2013-05-28 11:12:22 -04:00
• e755bdfdfd Tweak text on 500 error page Greg Price 2013-05-24 12:51:12 -04:00
• dcb95291a9 Merge branch 'master' into feature/will/capa-template-tests Will Daly 2013-05-28 08:07:54 -04:00