Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3583 Commits

Author SHA1 Message Date
ichuang
00710f75d2 add CAS authentication via django_cas and mods to external_auth 2013-09-04 10:56:45 -04:00
Adam Palay
a7159d8afd add pyparsing to edx requirements 2013-09-03 10:49:04 -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
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
Sarina Canelake
6923687c8e Merge pull request #460 from edx/sarina/update-diffcover 
Update diff-cover to latest version
 2013-07-24 20:18:15 -07:00
Trinh Nguyen
fd304c4681 Change git clone protocal to https 2013-07-25 07:49:31 +07:00
Sarina Canelake
4cd99c192c Update diff-cover to latest version 2013-07-22 12:02:31 -04:00
Greg Price
47b51e9329 Add endpoints to set user notification preference 
Two endpoints are intended to be used by AJAX calls from the web UI with an
authenticated user. When enabled, the value of the preference is an encryption
of the username, to be used as a token for one-click unsubscribe links. The
third endpoint is the target of unsubscribe links, which displays a page with
an appropriate message to the user.
 2013-07-22 11:50:26 -04:00
Greg Price
6a97ddf53c Add an API to interact with users and preferences 
The new API uses Django REST Framework. For now, it is designed specifically
to support the use cases required by the forum digest notifier (not yet built),
with a goal of making it more generally useful over time.
 2013-07-22 10:57:18 -04:00
Calen Pennington
679b118ed3 Merge pull request #271 from edx/dhm/next-gen-modulestore 
Next gen modulestore
 2013-07-20 04:51:11 -07:00
Don Mitchell
913c601ac1 Move default set_many impl to xblock 2013-07-19 15:08:24 -04:00
Adam Palay
7165acc499 set django-wiki to its most recent version 2013-07-19 14:40:41 -04:00
Alexander Kryklia
67f6d6c4d1 Fixes code_jail imports and draganddrop yaml 2013-07-19 12:05:17 +03:00
Ned Batchelder
89c48f4a30 Use CodeJail with FSIZE support, and default to 50k 2013-07-18 17:25:05 -04:00
Diana Huang
3f9431e8cf Provide implicit saves for XBlocks and XModules. 
Update existing tests and provide new ones to test new paradigm.
 2013-07-18 16:37:34 -04:00
Sarina Canelake
f0c9aa3916 Provide set_many methods for Lms and Mongo KeyValueStores 
Refactor new set_many and update XBlock version number.
 2013-07-18 15:30:13 -04:00
David Baumgold
4bc109708f Use django-method-override module 
Replacing the get_request_method function everywhere
 2013-07-09 19:16:09 -04:00
Ned Batchelder
6a7e291f96 Don't display docstrings when talking about tests, use real test names. 2013-07-09 13:53:46 -04:00
Will Daly
c0805c334d Updated diff-cover to version 0.1.3 to fix a bug 2013-06-25 13:23:13 -04:00
Will Daly
b82eedbefd Merge pull request #184 from edx/will/fix-diff-cover-bug 
Fix a bug in diff-cover
 2013-06-18 14:32:46 -07:00
Calen Pennington
c5dc404b01 Merge pull request #150 from edx/fix/cale/update-django-wiki 
Cherry pick change to url matching regular expression. Fixes LMS-37
 2013-06-18 10:29:33 -07:00
Will Daly
b2bc39fa09 Updated diff-cover to version 0.1.2, which fixes a bug 
in which missing lines were over-reported
 2013-06-17 11:17:58 -04:00
cahrens
c01041938c Upgrade xblock version to get strict ModelTypes. 2013-06-13 13:33:30 -04:00
cahrens
dac174e448 Merge cleanup. 2013-06-13 11:31:18 -04:00
Calen Pennington
2fab945340 Cherry pick change to url matching regular expression. Fixes LMS-37 2013-06-13 10:20:43 -04:00
cahrens
89d0003603 Be strict about ModelType expected types, rename Object as Dict. 2013-06-12 14:59:17 -04:00
cahrens
86d952bf91 Change to putting serialize/de-serialize directly in xml_module. 2013-06-12 13:34:38 -04:00