Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
13,803 Commits 1 Branch 0 Tags
ccc253d5c0db2f02150c0b2f60483db7d3ecfd8a
Commit Graph

700 Commits

Author SHA1 Message Date
David Baumgold
007a4e534f Merge pull request #2110 from edx/fix/db/lettuce-tests 
Fix lettuce tests
 2013-05-23 09:55:56 -07:00
David Baumgold
cf1e906c13 Fix lettuce tests 2013-05-23 12:50:19 -04:00
chrisndodge
a8084628e1 Merge pull request #1956 from edx/feature/cdodge/autoprovision-forums-master 
Feature/cdodge/autoprovision forums master
 2013-05-23 09:27:36 -07:00
Calen Pennington
257dae634b Merge pull request #2090 from edx/fix/cale/amazon-ses-errors 
Fix/cale/amazon ses errors
 2013-05-23 09:17:51 -07:00
Will Daly
a4ad495bef Merge pull request #2084 from edx/fix/will/lettuce-browser-size 
Set the browser size on startup of acceptance tests.
 2013-05-23 08:00:48 -07:00
Calen Pennington
f521b8e8c0 Handle errors while sending emails around changing user data 
The most common error is Amazon SES having blacklisted an email address.
However, we handle any error being raised during user.email_user.

Fixes JIRA LMS-131
 2013-05-23 10:27:34 -04:00
Calen Pennington
7ef6132194 Make factories return unicode data 
Django always returns string data from the database as unicode objects
(ref: https://docs.djangoproject.com/en/1.4/ref/unicode/#models).
Therefor, our factories should do the same
 2013-05-22 21:38:07 -04:00
Calen Pennington
2add58bb5a Create sequences for names, emails, and usernames in UserFactory 2013-05-22 21:35:49 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
Chris Dodge
470569545d add a migrations to the new django_comment_common to keep things a bit more consistent with our normal useage. 2013-05-22 13:32:32 -04:00
Chris Dodge
fbbae44988 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 
Conflicts:
	cms/djangoapps/contentstore/views/course.py
	lms/djangoapps/django_comment_client/base/views.py
	lms/djangoapps/django_comment_client/management/commands/show_permissions.py
	lms/djangoapps/django_comment_client/models.py
	lms/djangoapps/django_comment_client/tests/test_utils.py
	lms/envs/common.py
 2013-05-20 10:22:36 -04:00
Will Daly
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.
 2013-05-17 17:21:44 -04:00
Greg Price
372084e0b6 Merge branch 'drupal-new' 
Conflicts:
	lms/envs/common.py
 2013-05-17 16:17:35 -04:00
Greg Price
de5b4d7d27 Merge branch 'master' into drupal-new 2013-05-17 16:10:56 -04:00
Diana Huang
00378add25 Merge pull request #2065 from edx/diana/drupal/fix-link-test 
Drupal: Fix test so that it works with both CMS and LMS settings
 2013-05-17 12:08:46 -07:00
Greg Price
d4cee365e6 Ensure CSRF cookie is present for login and registration pages 2013-05-17 14:23:28 -04:00
Diana Huang
15a5e6c1ac Fix test so that it works with both CMS and LMS settings 2013-05-17 13:18:10 -04:00
Diana Huang
ba983d5f49 Merge pull request #2062 from edx/diana/drupal/lettuce-tests 
Fix Lettuce Tests for Drupal site
 2013-05-17 08:56:11 -07:00
Carlos Andrés Rocha
35bd38d677 Add status app with simple view to check celery workers 2013-05-17 11:33:14 -04:00
Diana Huang
2b80b358ed Add in a test for the marketing_link function in mitxmako 2013-05-17 10:51:37 -04:00
Greg Price
362736c4d1 Merge pull request #2060 from edx/fix/gprice/marketing-links 
Fix marketing links in password reset pages
 2013-05-16 14:24:13 -07:00
Greg Price
4e95aa053f Fix marketing links in password reset pages 2013-05-16 16:57:56 -04:00
Diana Huang
b6c0081064 Look for the existence of the links, not for 
the actual urls
 2013-05-16 16:30:29 -04:00
Diana Huang
22cf0dfa97 Fix bug in lettuce tests where the unregister dialog wasn't 
getting closed fast enough.
 2013-05-16 16:30:29 -04:00
Diana Huang
1c2175304e Merge branch 'master' into drupal-new 2013-05-16 16:27:36 -04:00
Ned Batchelder
e947218285 Merge master to here. 2013-05-16 14:21:51 -04:00
Will Daly
1e1e6450df Pep8 fixes 2013-05-16 11:33:50 -04:00
Will Daly
1240c5ae92 Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-15 11:40:54 -04:00
Chris Dodge
ce52be1e57 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-15 09:59:26 -04:00
Will Daly
8e069c1faa Skip tests that break on Ubuntu due to alerts (which will be removed 
soon anyway).  Removed @skip-phantom and @skip-firefox tags

Fixed sign up test to work in Ubuntu

Added comments
 2013-05-15 09:39:07 -04:00
Will Daly
ee5f0ac0ce Workaround for Ubuntu ChromeDriver issue. Now retries 
until it acquires a valid session.
 2013-05-15 08:24:27 -04:00
Will Daly
9dbcf0baa4 Updated login session handling to fix issue with ChromeDriver on Ubuntu 2013-05-14 14:47:50 -04:00
Greg Price
a5bb31792b Add a prefix string to Zendesk errors to be more searchable in Splunk 2013-05-13 16:38:52 -04:00
Will Daly
2e0b5b24d8 Pylint and pep8 fixes 2013-05-13 15:21:45 -04:00
Will Daly
d1e35b14bb Merge branch 'master' into feature/will/ci-lettuce-tests 2013-05-13 14:08:06 -04:00
Chris Dodge
d39d44ba49 keep migrations in djangoapp_comment_client 2013-05-10 12:58:00 -04:00
Greg Price
7d544d449f Remove edX news from dashboard if marketing site is enabled 2013-05-10 11:03:49 -04:00
Greg Price
a0fb4d6c85 Merge branch 'master' into drupal-new 
Conflicts:
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/sass/base/_base.scss
	lms/templates/forgot_password_modal.html
 2013-05-10 10:30:10 -04:00
Chris Dodge
51809965fe Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-10 10:01:53 -04:00
Will Daly
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.
 2013-05-10 09:18:37 -04:00
Calen Pennington
ea859bd6c7 Filter out the template course from the mongo modulestore get_courses function 2013-05-09 16:22:23 -04:00
Greg Price
f8539cc2d7 Redirect authenticated users from registration or login to dashboard 2013-05-08 17:10:54 -04:00
Greg Price
0e525d69ff Disable SSL cert validation for Zendesk API 
They are currently using a CA that is not installed on our servers. Since it
isn't a top-tier CA and we aren't submitting anything particularly sensitive
anyway, we don't have to feel too bad about this.
 2013-05-08 15:45:12 -04:00
Chris Dodge
d8d4111a99 Merge branch 'master' of github.com:edx/mitx into feature/cdodge/autoprovision-forums-master 2013-05-08 12:15:26 -04:00
Will Daly
aaa383b8ca safe_key() now hashes the prefix/version as well, just in case 
these are configured to be too long in the settings.
 2013-05-07 15:48:51 -04:00
Diana Huang
2947ce246f Better error handling for when marketing urls are missing from the settings. 2013-05-07 13:17:30 -04:00
Chris Dodge
3c747f0e6e consolidate the list of permissions 2013-05-07 11:53:02 -04:00
Chris Dodge
81ecf0c5df add unit test to verify forum seeding occurs when creating new courses 2013-05-07 11:18:15 -04:00
Will Daly
1b0b365fa6 Added unit tests for safe_key() to resolve bug 392. 
Updated safe_key() so that it: (a) avoids creating keys that
are too long for memcache, and (b) handles unicode in keys, prefixes,
and versions

Added __init__.py, which should have been in the last commit

Pep8/Pylint fixes
 2013-05-06 17:26:18 -04:00
Diana Huang
a081ba4bbb Merge pull request #1934 from edx/diana/drupal/fix-lms-links 
Fix links between marketing site and courseware.
 2013-05-06 14:14:29 -07:00