Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• ec53e3ca90 Merge pull request #1994 from edx/fix/gprice/remove-dashboard-news Greg Price 2013-05-10 08:55:59 -07:00
• d04e8492a8 Merge pull request #1996 from edx/fix/gprice/drupal-course-about-404 Greg Price 2013-05-10 08:52:45 -07:00
• 7d544d449f Remove edX news from dashboard if marketing site is enabled Greg Price 2013-05-09 13:00:25 -04:00
• 6f06a3d92a Make login link button in header work with course enrollment flow Greg Price 2013-05-08 15:22:22 -04:00
• 7dd2973eca Return 404 for course about pages if the marketing site is enabled Greg Price 2013-05-09 13:50:48 -04:00
• 0a8d426706 Make activation complete page use non-modal login link Greg Price 2013-05-09 16:47:11 -04:00
• c00b903757 Make course number in registration button not transformed to lowercase Greg Price 2013-05-10 10:58:12 -04:00
• 4324453827 Added option to run acceptance tests without collectstatic Will Daly 2013-05-10 10:43:46 -04:00
• 881b72a6d1 Added option to run a specific feature Will Daly 2013-05-10 10:35:51 -04:00
• a0fb4d6c85 Merge branch 'master' into drupal-new Greg Price 2013-05-10 10:30:10 -04:00
• a1e6c194c6 removing LINK_PATH John Jarvis 2013-05-10 10:24:32 -04:00
• 2546d6227f Added test_acceptance command to rake file that runs all acceptance tests. Will Daly 2013-05-10 10:03:44 -04:00
• 51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master Chris Dodge 2013-05-10 10:01:53 -04:00
• 1b0eff52ed create test cases to simulate error exporting/importing textbooks Chris Dodge 2013-05-10 10:01:10 -04:00
• c730d43dbf Resolved import conflict involving django-staticfiles (lettuce assumes we are using django.contrib.staticfiles). This allows us to run the django-admin.py harvest test server, instead of launching the server ourselves. Will Daly 2013-05-10 09:18:37 -04:00
• ee52726853 Merge pull request #2000 from edx/fix/cale/dont-show-template-course Calen Pennington 2013-05-10 04:06:33 -07:00
• 2bb180a353 Merge pull request #1935 from edx/fix/formularesponse_needs_samples ichuang 2013-05-09 19:02:57 -07:00
• 5a73a06885 parameterizes CMS email settings Jason Bau 2013-05-09 16:21:55 -07:00
• 3352ae7f75 repo rename to edx-platform John Jarvis 2013-05-09 18:29:45 -04:00
• c765906fc5 Merge pull request #1986 from edx/feature/gprice/fix-help-modal-text Greg Price 2013-05-09 14:37:13 -07:00
• 89d0dc1963 Update "thank you" text in help modal Greg Price 2013-05-07 15:54:34 -04:00
• a6ad65cb98 trying to fix pylint errors Arthur Barrett 2013-05-09 16:57:19 -04:00
• a407c84bdf add model unit tests Arthur Barrett 2013-05-09 16:34:02 -04:00
• 0bea50ede1 start refactoring views.py Steve Strassmann 2013-05-09 16:24:21 -04:00
• ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function Calen Pennington 2013-05-09 15:26:01 -04:00
• 11244107fd add an empty models.py file to django_comment_client Chris Dodge 2013-05-09 16:16:11 -04:00
• 9aed148dc1 add search test Arthur Barrett 2013-05-09 16:08:29 -04:00
• aad5096ca1 add more tests for update and delete actions Arthur Barrett 2013-05-09 15:43:34 -04:00
• 2838dba199 fix pep8 violations Arthur Barrett 2013-05-09 15:12:22 -04:00
• 004018c1eb Merge branch 'feature/christina/metadata-ui' of github.com:edx/mitx into feature/christina/metadata-ui marco 2013-05-09 14:59:01 -04:00
• 6dbfa7499b removed metadata-edit styling marco 2013-05-09 14:58:54 -04:00
• b314b5ce59 Renaming of some files. cahrens 2013-05-09 14:51:16 -04:00
• 4a7f7d6537 Update the other templates that include metadata-edit.html. cahrens 2013-05-09 14:34:52 -04:00
• dd583ce4f9 Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-05-09 14:32:05 -04:00
• 244261f1cf added more unit tests Arthur Barrett 2013-05-09 14:31:38 -04:00
• cad8ae1b9b merged in new data requirements for html marco 2013-05-09 14:19:31 -04:00
• f9023fd112 Merge pull request #1983 from edx/diana/jobs-page-update Diana Huang 2013-05-09 11:04:14 -07:00
• e5b18a5688 Put Front End Developer back in. Diana Huang 2013-05-09 13:58:25 -04:00
• d09e93142f Merge pull request #1980 from edx/backbone-1.0.0 David Baumgold 2013-05-09 09:34:35 -07:00
• f1f65c563e fix failing unit test in lms.envs.test env Arthur Barrett 2013-05-09 11:51:24 -04:00
• 60f41eb108 Cleanup. cahrens 2013-05-09 11:49:09 -04:00
• cf491b1184 Remove component.html changes. cahrens 2013-05-09 11:46:47 -04:00
• 682d06bcff Fix a lot of pep8 violations Vik Paruchuri 2013-05-09 11:27:44 -04:00
• 7e42512bfa Merge branch 'ux/marco/studio-componentsettings' into feature/christina/metadata-ui cahrens 2013-05-09 11:20:04 -04:00
• bfdbcc2f32 Beginnings of Backbone views/models. cahrens 2013-05-09 11:16:12 -04:00
• 3ebd5de744 added rest of settings list marco 2013-05-09 10:54:10 -04:00
• 623c55222f Merge pull request #1987 from edx/feature/gprice/redirect-if-logged-in Greg Price 2013-05-09 07:50:49 -07:00
• f72659fa2e Add in asserts Vik Paruchuri 2013-05-09 10:15:07 -04:00
• f9e97cb935 Add test for proper saving Vik Paruchuri 2013-05-09 10:05:48 -04:00
• 7a1ef62ee3 Do some code reformatting Vik Paruchuri 2013-05-09 09:56:02 -04:00
• 8c12eb78c9 Fix some exceptions Vik Paruchuri 2013-05-09 09:54:57 -04:00
• 09d34a02cc Add in some comments Vik Paruchuri 2013-05-09 09:50:32 -04:00
• 8323cc7c60 Refactor tests Vik Paruchuri 2013-05-09 09:44:16 -04:00
• 3284247905 restyling of the input fields, partway through adding in examples of all settings marco 2013-05-09 09:35:31 -04:00
• ec5f239d91 Add in new Coordinator position. Diana Huang 2013-05-09 09:12:07 -04:00
• 7b8b168f2e Move the mockquerydict Vik Paruchuri 2013-05-08 19:21:12 -04:00
• a2e5bd071b Add in tests for peer grading module Vik Paruchuri 2013-05-08 19:17:14 -04:00
• fd46ebd1fa Move some functions, make notification tests more robust Vik Paruchuri 2013-05-08 19:04:07 -04:00
• ff84545f31 Start to add peer grading tests, make dummy system a separate thing Vik Paruchuri 2013-05-08 18:49:28 -04:00
• 4d759e9772 Test full flow, including reset Vik Paruchuri 2013-05-08 18:15:57 -04:00
• f26a258598 Add in test for grader reply Vik Paruchuri 2013-05-08 18:07:17 -04:00
• c7197cd567 Merge branch 'master' into feature/abarrett/lms-notes-app Arthur Barrett 2013-05-08 18:04:24 -04:00
• bf21211b25 adding some tests Arthur Barrett 2013-05-08 18:03:41 -04:00
• 2ef3bcc92d Commit just to get Jenkins to rerun. dcadams 2013-05-08 14:52:18 -07:00
• dcabac8edf Merge branch 'master' of github.com:edx/mitx into feature-dcadams-usermanagement dcadams 2013-05-08 14:48:29 -07:00
• ca1aeb5bb8 Merge pull request #1988 from edx/devops/jbau/server_email_lms_setting Jason Bau 2013-05-08 14:30:19 -07:00
• 4bba6c7d55 Merge pull request #1981 from edx/fix/gprice/drupal-mktg-links Greg Price 2013-05-08 14:23:48 -07:00
• 1354cd412a Set SERVER_EMAIL so that mail_admins works Jason Bau 2013-05-08 14:16:20 -07:00
• f8539cc2d7 Redirect authenticated users from registration or login to dashboard Greg Price 2013-05-08 17:10:54 -04:00
• 8e6a0914d4 Merge pull request #1984 from edx/feature/gprice/accept-zendesk-ssl-cert Greg Price 2013-05-08 13:30:04 -07:00
• 1e61bbd1c8 Jobs page updates. Diana Huang 2013-05-08 16:06:08 -04:00
• c39a21d833 Remove old import Vik Paruchuri 2013-05-08 16:03:11 -04:00
• 3801f574a4 Add in xqueue submission tests Vik Paruchuri 2013-05-08 16:00:07 -04:00
• b36a05b8cb Merge pull request #1982 from edx/fix/btalbot/studio-alerts Brian Talbot 2013-05-08 12:51:45 -07:00
• 0e525d69ff Disable SSL cert validation for Zendesk API Greg Price 2013-05-08 15:45:12 -04:00
• 1d53625673 Add in ability to mock a server, a lot more testing code for open ended Vik Paruchuri 2013-05-08 15:37:25 -04:00
• 165e7059c8 guard predicates are rake tasks, not functions Steve Strassmann 2013-05-08 15:34:35 -04:00
• 25dd2c7d67 studio - alerts: synced up example HTML to show advanced settings live notification, aria roles, and action classes; integrated typography mixins Brian Talbot 2013-05-08 15:30:17 -04:00
• 1eb05cfd4e remove unnecessary count Arthur Barrett 2013-05-08 15:07:36 -04:00
• dfcbb73662 add guard code to ensure gnu gettext utilities are loaded before rake tests Steve Strassmann 2013-05-08 14:55:16 -04:00
• ce3e733d1f Problems in 7.02x need lxml for their sandbox. Ned Batchelder 2013-05-08 14:49:02 -04:00
• 6264d41f92 Very minor docstring tweak :) Ned Batchelder 2013-05-08 14:48:46 -04:00
• beb4b39b73 fix logging Steve Strassmann 2013-05-08 14:25:31 -04:00
• 0f70b0aa8a refactored api resource map and added total to search query Arthur Barrett 2013-05-08 14:09:29 -04:00
• dc473e6f7b more verbose messages.po Steve Strassmann 2013-05-08 14:07:57 -04:00
• d05ba84f13 /usr/bin/env in shebang line Steve Strassmann 2013-05-08 13:49:42 -04:00
• 0a62d5c76b pull from master Steve Strassmann 2013-05-08 13:45:47 -04:00
• 0c6c7868ae Merge pull request #1965 from edx/feature/christina/fields Christina Roberts 2013-05-08 10:32:55 -07:00
• d8d4111a99 Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master Chris Dodge 2013-05-08 12:15:26 -04:00
• 5c55595e8b Start to add in some more open ended module tests Vik Paruchuri 2013-05-08 12:10:49 -04:00
• e190dc00d6 Remove marketing URLs from common.py Greg Price 2013-05-08 11:06:02 -04:00
• d522b53f6d Merge pull request #1974 from edx/diana/hide-api-key Diana Huang 2013-05-08 07:50:31 -07:00
• 15938dd8e4 pull from master Steve Strassmann 2013-05-08 09:48:47 -04:00
• 7f69e45b9e whitespace changes David Baumgold 2013-05-08 09:21:16 -04:00
• ec79ebd4a7 Updated Backbone.js and Underscore.js David Baumgold 2013-05-08 09:11:56 -04:00
• b19c80ccb5 Merge pull request #1957 from edx/fix/will/bug_392 Will Daly 2013-05-08 06:23:49 -07:00
• 894cfd1f48 update doc strings in api Arthur Barrett 2013-05-07 18:45:40 -04:00
• c82b28aac3 Merge pull request #1977 from edx/fix/gprice/drupal-registration-links Greg Price 2013-05-07 14:58:26 -07:00
• 7143749d7b Fix links to honor code, ToS, and privacy policy for marketing site Greg Price 2013-05-07 17:54:32 -04:00
• fb4685fe9a Merge pull request #1976 from edx/vik/fix/oe-bugs VikParuchuri 2013-05-07 14:54:17 -07:00