Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,147 Commits 1 Branch 0 Tags
8bd686d63cbd46775f35faddddcf0baaffcba310
Commit Graph

81 Commits

Author SHA1 Message Date
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
Ned Batchelder
413202e7d6 Merged ned/whitelistable-sandbox 2013-06-11 16:49:45 -04:00
cahrens
17c9c104d9 Update version of xblock. 2013-06-10 12:29:49 -04:00
Will Daly
13fc113282 Updated to latest version of diff-cover (now compares 
to `origin/master` instead of `master`)
 2013-06-10 10:17:56 -04:00
cahrens
1273bc22b3 Additional test coverage. 2013-06-07 17:24:07 -04:00
cahrens
0baec0a164 Move string fields, get rid of hard-coded list of booleans. 2013-06-07 15:45:34 -04:00
Ned Batchelder
cab49716b5 Whitelisted courses now run Python code outside the sandbox. 2013-06-06 14:27:12 -04:00
Will Daly
ee0115971b Merge pull request #68 from edx/will/diff-cover-integration 
Will/diff cover integration
 2013-06-05 12:00:16 -07:00
Will Daly
a5fc721922 Merge branch 'master' into will/diff-cover-integration 2013-06-04 18:19:07 -04:00
Will Daly
5662ecfde9 Updated to current tag of diff-cover 2013-06-04 18:13:42 -04:00
e0d
39ee489460 adding sympy and networkx 2013-06-04 13:27:57 -04:00
Ned Batchelder
c865641f13 Merge pull request #23 from edx/ned/move-loncapa-etc-into-sandbox 
Ned/move loncapa etc into sandbox
 2013-06-03 11:27:16 -07:00
Will Daly
afa6f485fd Added diff-cover as a requirement (installed from github) 2013-06-03 13:31:07 -04:00
Will Daly
900dca9ef4 Merge branch 'master' into fix/will/pip-version 2013-06-03 12:25:56 -04:00
Xavier Antoviaque
a06e34e2f9 Install steps - Fixes mysql package name dependency for Debian/Ubuntu 
There is no package called `mysql` in Debian/Ubuntu - instead, MySQL is
split into `mysql-client` and `mysql-server`.

Also deeted duplicate package name.
 2013-06-01 17:03:21 -03:00
Slater-Victoroff
04842087fc Merge pull request #25 from edx/slater/new_mac_dev_script 
Slater/new mac dev script
 2013-05-31 15:14:53 -07:00
Slater-Victoroff
3fc7bb6e42 Last requirement that was needed on Jonah's machine. Now working on the fresh Ubuntu install there 2013-05-31 16:52:55 -04:00
Slater-Victoroff
0b0b36028c Added ubuntu requirements for better mysql support 2013-05-31 16:10:11 -04:00
Ned Batchelder
88d3f253b6 Move symmath to be its own directory, and install it into the sandbox. 2013-05-31 15:22:16 -04:00
Jay Zoldak
cd82bd054d Merge pull request #20 from edx/zoldak/distribute-version 
require distribute >= because there is an old branch out there that messes up the build server
 2013-05-31 12:09:17 -07:00
Slater-Victoroff
3b3b5d97e9 Removed npm requirement due to node version conflicts 2013-05-31 14:58:40 -04:00
Slater-Victoroff
6272e89014 Down to node errors on Ubuntu 2013-05-31 14:30:56 -04:00
Slater-Victoroff
6f1f0e115c changed ubuntu strategy for numpy and scipy 2013-05-31 12:46:44 -04:00