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

126 Commits

Author SHA1 Message Date
Ned Batchelder
a1d464aed9 Update XBlock requirement to new XML code. 2013-09-30 21:09:43 -04:00
e0d
759a853464 Merge pull request #1063 from edx/e0d/django-1.4.8 
Upgrading to 1.4.8
 2013-09-27 12:54:44 -07:00
jkarni
f27af194bc Merge pull request #1056 from edx/jkarni/feature/update-preview-reqs 
Adding Pillow jpeg and tiff system libs
 2013-09-27 10:37:29 -07:00
Calen Pennington
f500b72290 Make sure that we have the right set of fields available during xml parsing 
We had a bug where mixins weren't being applied before `load_from_xml`
was called. This meant that not all of the fields were being loaded
correctly. To fix it, we used the mixoligist from the runtime to apply
the mixins earlier in the process. However, that caused the mixins to be
applied twice.

The included fixes to xblock resolved the multiply-applied mixins, and
the fixes to the parsing code make it simpler to understand, and add
some unit tests of the parsing to boot.
 2013-09-27 10:57:39 -04:00
Renzo Lucioni
c124a33036 Merge pull request #829 from edx/renzo/ab-testing 
Split Testing
 2013-09-25 13:29:46 -07:00
Calen Pennington
f4b37b28b1 Merge pull request #1060 from cpennington/lazy-textbooks 
Make Textbooks properly lazy
 2013-09-25 11:32:09 -07:00
Renzo Lucioni
f1ccf1c06b Integrate split testing and LMS tabs experiments 2013-09-25 00:27:36 -04:00
Julian Arni
ecddd932ca Adding Pillow jpeg and tiff system libs 2013-09-23 16:37:30 -04:00
Calen Pennington
ad2da44cb1 Make Textbooks properly lazy 2013-09-23 13:44:34 -04:00
e0d
93a9e28fc7 Upgrading to 1.4.8 2013-09-19 14:37:16 -04:00
Julian Arni
9d3395ea06 Bump diff-cover version 2013-09-12 15:48:00 -04:00
Carlos Andrés Rocha
87fcf1ab9e Merge pull request #905 from rocha/datadog-statsd 
Remove dogstatsd-python in favor of dogapi
 2013-09-12 06:53:02 -07:00
Carlos Andrés Rocha
ee0004e2f8 Remove dogstatsd-python in favor of dogapi 
Also added datadog application to commom django apps and set it to use
a local statsd server by default.
 2013-09-11 19:28:58 -04:00
David Baumgold
a1d3899a4d Use oauthlib directly for LTI module 2013-09-10 11:02:30 -04:00
David Baumgold
45f38ddf81 Update requests library to 1.2.3 2013-09-10 09:59:21 -04:00
David Ormsbee
48f867bd6b Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	lms/envs/common.py
 2013-09-09 10:18:25 -04:00
Don Mitchell
0848360436 Merge pull request #844 from edx/dhm/editable_metadata 
refactoring of platform to xblock 0.3 w/ refactoring of inheritance in the platform to a consistent representation.
 2013-09-06 11:58:36 -07:00
David Ormsbee
ed508f8400 Merge pull request #556 from edx/ormsbee/requirments_notice 
Dependency warning message on requirements files
 2013-09-06 08:35:36 -07:00
Calen Pennington
8201b1412e Use XBlock 0.3 2013-09-06 09:45:59 -04:00
David Ormsbee
78acd083be Merge branch 'master' into ormsbee/verifyuser3 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/djangoapps/shoppingcart/models.py
	lms/djangoapps/shoppingcart/processors/CyberSource.py
	lms/djangoapps/shoppingcart/processors/tests/test_CyberSource.py
	lms/djangoapps/shoppingcart/tests/test_models.py
	lms/djangoapps/shoppingcart/tests/test_views.py
	lms/djangoapps/shoppingcart/urls.py
	lms/djangoapps/shoppingcart/views.py
	lms/envs/common.py
	lms/envs/dev.py
	lms/static/sass/base/_variables.scss
 2013-09-04 10:58:30 -04:00
ichuang
00710f75d2 add CAS authentication via django_cas and mods to external_auth 2013-09-04 10:56:45 -04:00
Adam Palay
6078f4c67e add nltk to sandbox reqs 2013-09-04 10:12:44 -04:00
Adam Palay
a7159d8afd add pyparsing to edx requirements 2013-09-03 10:49:04 -04:00
Adam Palay
1ab59a2c3d add pyparsing explicitly to sandbox requirements 2013-09-03 10:00:46 -04:00
Will Daly
93656a253d Incremented diff cover version to fix 100% coverage bug. 2013-09-03 07:51:49 -04:00
Calen Pennington
b0cdbbc1fe Merge pull request #794 from cpennington/upgrade-newrelic 
Upgrade newrelic agent to the latest version
 2013-08-30 12:56:11 -07:00
Kevin Luo
907bf6e1b7 Add bulk email feature for instructors, with optout option 
Adds a new Email link to the instructor dashboard for frontend interface to send
email to course members. Adds a feature flag ENABLE_INSTRUCTOR_EMAIL to toggle this.
Creates a new djangoapp bulk_email that handles this action by getting the recipient
list and batching the emails to different celery tasks to do the actual sending.
Requires lynx package to convert HTML email to plaintext. Handles SMTP errors by
retrying or falling through to the next email. Adds the option to opt out of course
specific emails in the user dashboard with an Email Settings link for each course.
Uses severable configurable settings with defaults. DEFAULT_BULK_FROM_EMAIL
specifies the from address for email. EMAILS_PER_TASK specifies the number of emails
each celery task takes on. EMAIL_HOST, EMAIL_PORT, EMAIL_HOST_USER,
EMAIL_HOST_PASSWORD, and EMAIL_USE_TLS for the SMTP email backend settings.

Co-authored-by: Akshay Jagadeesh <akjags@gmail.com>
 2013-08-29 12:40:31 -04:00
Will Daly
4e7c309d56 Merge pull request #798 from edx/will/js-test-tool-squashed 
Integrate js-test-tool into testing infrastructure
 2013-08-27 14:09:13 -07:00
Calen Pennington
e7626d2d84 Teach rake test tasks how to re-run failed tests 2013-08-27 09:43:30 -04:00
Will Daly
fe72730969 Integrate js-test-tool into testing infrastructure 2013-08-26 20:21:18 -04:00
Calen Pennington
bf331c9d7e Upgrade newrelic agent to the latest version 2013-08-26 12:41:04 -04:00
Diana Huang
6f3e83b86c Major cleanup work on ShoppingCart models 
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
 2013-08-22 15:39:55 -04:00
David Ormsbee
247c3ade70 Fix double requirement specification (django-model-utils) 2013-08-22 15:00:56 -04:00
David Ormsbee
91fab4579b Merge branch 'diana/verified-certs-payment' into ormsbee/verifyuser_func 
Conflicts:
	common/djangoapps/course_modes/models.py
	lms/envs/common.py
	lms/envs/dev.py
 2013-08-22 14:57:34 -04:00
David Ormsbee
0db7884354 Basic first commit of Photo ID Verification model and test code 2013-08-21 16:21:52 -04:00
Diana Huang
c5f353ec05 Major cleanup work on ShoppingCart models 
* Make currency a property of the Order (for validation purposes)
* Remove null=True from Char fields
* Use InheritanceManager for subclassing OrderItem
* Change VerifiedCertificate to better handle some new use cases
* Cleaned out old migrations
* Tests!
 2013-08-21 13:14:21 -04:00
Sarina Canelake
d6e06e441f Upgrade diff-cover to newest version 2013-08-09 15:55:43 -04:00
Sarina Canelake
2401fa2e65 Update the XBlock version to fix save bugs 2013-08-08 16:53:13 -04:00
JonahStanley
83854643a2 Upgraded selenium requirements to run with the latest firefox 2013-08-08 13:24:28 -04:00
Sarina Canelake
b6bab0a121 Update XBlock version 2013-08-07 13:14:30 -04:00
jkarni
7ba6d191aa Merge pull request #577 from edx/jkarni/feature/pip-upgrade 
Bump up pip requirement to latest.
 2013-08-06 11:17:14 -07:00
Julian Arni
3893ac6656 Bump up pip requirement to latest. 
Solves an issue with using git > 1.8.1 for github based pip requirements.
 2013-08-05 12:59:16 -04:00
David Baumgold
cca94c62e9 Update Babel and Transifex libraries 2013-08-02 15:19:35 -04:00
Diana Huang
c867be7961 Limit the rate of logins. 2013-08-02 11:23:59 -04:00
David Ormsbee
b6b4f0f987 Dependency warning message on requirements files 2013-08-01 14:49:49 -04:00
Calen Pennington
8f97608200 Merge pull request #527 from edx/cale/restrict-us-to-less-than-distribute-0.7,-which-breaks-setuptools 
Restrict us to less than distribute 0.7, which breaks setuptools
 2013-07-31 14:00:31 -07:00
Calen Pennington
df18c6e186 Restrict us to less than distribute 0.7, which breaks setuptools 2013-07-30 14:13:40 -04:00
David Ormsbee
3d8b32bb69 Reverting 89c48f4a30 to unbreak codejail for this release. 2013-07-29 17:18:52 -04:00
David Baumgold
f9387506b4 Merge pull request #495 from dangtrinh/vi_branch 
Change git clone protocal to https
 2013-07-29 12:00:17 -07:00
David Baumgold
df1252901f Misc improvements to make lettuce testing a bit saner 2013-07-25 13:19:39 -04:00