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

4789 Commits

Author SHA1 Message Date
cahrens
87d904cb35 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/templates/base.html
 2013-05-24 16:10:34 -04:00
chrisndodge
27c6816bac Merge pull request #2113 from edx/fix/cdodge/few-xml-serialize-fixes 
randomize_module.py was missing 'import lxml' to support definition_to_x...
 2013-05-24 06:26:23 -07:00
Chris Dodge
b6090952da randomize_module.py was missing 'import lxml' to support definition_to_xml(). Also, fix serialization of show_timezone to expect a bool 2013-05-23 14:24:36 -04:00
Calen Pennington
69beea854c Merge pull request #2045 from edx/feature/cale/jasmine-junit-reports 
Record junit reports of jasmine tests
 2013-05-23 11:06:34 -07:00
Brian Talbot
1371c8d0da revises alignment of advanced editor and cheatsheet toggle 2013-05-23 13:27:23 -04:00
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
cahrens
48703af234 Merge. 2013-05-23 11:41:26 -04:00
cahrens
c95b44d851 Merge branch 'master' into feature/christina/metadata-ui 
Conflicts:
	cms/envs/common.py
	cms/templates/base.html
	common/lib/xmodule/xmodule/combined_open_ended_module.py
 2013-05-23 11:41:12 -04: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
b2b6ca5f7b Record junit reports of jasmine tests 2013-05-22 22:01:44 -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
Chris Dodge
3fceb46953 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 20:44:22 -04:00
David Baumgold
350c5460af Revert "Update jasmine-jquery to 1.5.1" 
This reverts commit 90a9c386eb.
 2013-05-22 17:29:52 -04:00
David Baumgold
0a7222b123 Allow an AJAX call to specify that it should not notify on error 
Because there are some cases where it's OK to fail, and it's not the user's fault
 2013-05-22 15:55:56 -04:00
David Baumgold
525fe2d581 Expose a dummy gettext function in the Jasmine test env 2013-05-22 15:55:53 -04:00
David Baumgold
90a9c386eb Update jasmine-jquery to 1.5.1 2013-05-22 15:55:52 -04:00
David Baumgold
d10e644c6e Added sinon.js to project 2013-05-22 15:55:52 -04:00
David Baumgold
0c368011da Move underscore templates into separate files, included in Mako templates 2013-05-22 15:55:50 -04:00
Ned Batchelder
b9d134e3d1 Merge pull request #2101 from edx/ned/fix-code-import-for-check-functions 
Check functions need access to course-local code also, so we need to sav...
 2013-05-22 12:32:43 -07: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
Ned Batchelder
392de8d40e Check functions need access to course-local code also, so we need to save the python path from the problem setup, and use it for the check function. 2013-05-22 13:27:24 -04:00
Chris Dodge
9b88528b04 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-22 13:20:49 -04:00
VikParuchuri
f8e68216a7 Merge pull request #2096 from edx/fix/vik/oe-cache 
Fix/vik/oe cache
 2013-05-22 09:59:33 -07:00
e0d
e4c3f92372 Merge pull request #2100 from edx/hotfix/e0d/code-jail 
Sandbox-installed packages will be really installed instead of -e instal...
 2013-05-22 09:05:03 -07:00
Vik Paruchuri
3bd04290f5 Add tests, address review comments 2013-05-22 11:58:03 -04:00
Vik Paruchuri
a44eacd474 Make fields stringy, remove false dict 2013-05-22 10:54:52 -04:00
Ned Batchelder
ce005072b0 Sandbox-installed packages will be really installed instead of -e installed. 2013-05-21 19:21:39 -04:00
Ned Batchelder
e59d345917 Use a different arbitrary dotted module, which Christina doesn't already have imported 2013-05-21 14:27:50 -04:00
Chris Dodge
094e396556 Merge branch 'master' of github.com:edx/edx-platform into feature/cdodge/autoprovision-forums-master 2013-05-21 09:47:11 -04:00
cahrens
3dc9791382 Update xblock, start Selenium. 2013-05-21 09:38:56 -04:00
marco
3cf915005b Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 15:22:31 -04:00
marco
79c78cbccd made firefox input number increment objects positioned as % to respond to page size accordingly 2013-05-20 15:22:21 -04:00
Brian Talbot
31b5c4ab61 studio - adds back in older lh() Sass function/mixin and moves it to the inheritied/to-be-sunsetted mixins sheet 2013-05-20 15:20:17 -04:00
cahrens
4d7c7f866a Merge branch 'master' into feature/christina/metadata-ui 2013-05-20 15:06:40 -04:00
marco
7641e128de Merge branch 'feature/christina/metadata-ui' of github.com:edx/edx-platform into feature/christina/metadata-ui 2013-05-20 14:39:50 -04:00
marco
c0cff81e5e styled firefox number buttons 2013-05-20 14:39:37 -04:00
cahrens
2020923f2d Prevent invalid numeric entries. 2013-05-20 13:26:27 -04:00
marco
c356904027 css styles for firefox input number fields 2013-05-20 12:06:30 -04:00
marco
32f7691040 minor style changes for increment and decrement buttons on firefox number fields 2013-05-20 11:39:13 -04:00
cahrens
3229aaf503 Call polyfill at right time. 2013-05-20 11:16:20 -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
marco
aa41aed9d1 prototype for polyfill on number input fields, minimal styling to up down buttons 2013-05-20 09:45:33 -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