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

3684 Commits

Author SHA1 Message Date
Renzo Lucioni
9239253614 Remove Django Waffle 2014-09-12 16:22:03 -04:00
Feanil Patel
8b92bd159b Merge pull request #5198 from edx/feanil/sandbox_matplotlib 
Add matplotlib to the sandbox requirements.
 2014-09-12 14:16:50 -04:00
Feanil Patel
45b2e5033e Add matplotlib to the sandbox requirements. 
Used by MITx/6.341x
 2014-09-12 13:26:01 -04:00
Don Mitchell
218611c878 Merge pull request #5196 from edx/release 
hotfix-2014-09-12
 2014-09-12 12:32:40 -04:00
Andy Armstrong
04595a7b3d Update platform to use the latest ORA release 2014-09-12 10:32:29 -04:00
Adam
d9567c3537 Merge pull request #5178 from edx/release 
Release
 2014-09-11 15:15:13 -04:00
Usman Khalid
fc895fe8bf Moved imports to startup.py. 2014-09-11 20:14:37 +05:00
Calen Pennington
b033a214cf Merge pull request #5131 from cpennington/split/prod-import-export-tests 
Split-mongo block uniqueness constraint [LMS-11364]
 2014-09-11 10:43:43 -04:00
Don Mitchell
4ebe26696e Merge branch 'release' 
Conflicts:
	common/djangoapps/student/views.py
 2014-09-11 10:31:53 -04:00
Calen Pennington
7b81dcc3ea Make split_mongo assert block identity uniqueness only over (block_type, block_id) tuples [LMS-11364] 2014-09-11 09:38:13 -04:00
Feanil Patel
8f1a285c33 Downgrade gunicorn. 2014-09-10 14:44:49 -04:00
Sarina Canelake
4596e8c212 Merge pull request #5151 from open-craft/mentoring-enforce 
mentoring: Allow partial answers when dependency isn't enforced
 2014-09-10 14:22:11 -04:00
Tim Babych
c34fb143ba Merge pull request #5093 from edx/tim/update-django-1.4.14 
Update Django version to release 1.4.14
 2014-09-10 20:09:28 +03:00
Xavier Antoviaque
15319925ed mentoring: Allow partial answers when dependency isn't enforced 2014-09-10 11:11:21 +02:00
Piotr Mitros
6d914e2b0a AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-09 08:43:18 -04:00
Piotr Mitros
31176aeb37 AWS settings for XBlocks to have filesystem-like storage 
Upgrades to latest pyfs to support auth not through environment variables
 2014-09-08 10:46:18 -04:00
Piotr Mitros
5364508e48 Merge pull request #5108 from edx/pmitros/retrofix-xargs 
XBlock argument passing support backport from SDK
 2014-09-07 12:51:56 -04:00
Piotr Mitros
167f4171c4 XBlock argument passing support 2014-09-07 12:01:25 -04:00
Carson Gee
d640b53760 Merge pull request #5000 from mitocw/cg/upgrade_gunicorn 
Upgrading gunicorn to latest
 2014-09-05 15:58:02 -04:00
Tim Babych
496d714879 Update Django version to release 1.4.14 2014-09-05 14:49:59 +03:00
Piotr Mitros
520fc2b09d New XBlock with final/tested/non-prototype scope_key 2014-08-29 16:00:10 -04:00
Stephen Sanchez
cd683cecd2 Updated ORA2 tag for release for August 29th, 2014 2014-08-29 18:14:39 +00:00
clytwynec
118baafb1f Merge pull request #4943 from edx/mvo/bumping_bok_choy_version 
bumping bok choy version
 2014-08-29 10:08:51 -04:00
Minh Tue Vo
688909eb76 bumping bok choy version 
check firefox version, raise exception with instructions for updating
 2014-08-28 16:58:55 -04:00
Carson Gee
a0ccb942ee Upgrading gunicorn to latest 2014-08-27 16:38:01 -04:00
Calen Pennington
7d8088d26b Add memcache as a requirement for running paver, because it's imported in pavelib/utils/envs.py 2014-08-27 16:29:47 -04:00
Don Mitchell
a0e697235d Merge pull request #4966 from edx/split/html_id 
Update opaque-keys library to use block_id for html_id for new keys.
 2014-08-25 18:06:02 -04:00
Nimisha Asthagiri
e42a3f15db Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 17:41:57 -04:00
Jesse Zoldak
b90e947b8d Revert "Update opaque-keys library to use block_id for html_id for new keys." 2014-08-25 17:11:39 -04:00
Piotr Mitros
b166503749 Merge pull request #4889 from edx/danielli/pyfs 
Adds pyfilesystem service from XBlocks to edx-platform
 2014-08-25 16:37:46 -04:00
Nimisha Asthagiri
f7efb50ffb Update opaque-keys library to use block_id for html_id for new keys. 
Catch more places where get_children was giving us version aware references.
LMS-11237
 2014-08-25 14:21:49 -04:00
swdanielli
504a7a21ba add pyfs service 2014-08-25 12:25:03 -04:00
Piotr Mitros
d0ac4c375e Update to latest XBlock 2014-08-25 10:24:55 -04:00
Ben McMorran
30fc0441d1 Merge pull request #4782 from edx/reruns/ui 
Reruns/ui
 2014-08-21 16:57:00 -04:00
Jesse Zoldak
337a75598f Update bok-choy version 2014-08-21 12:16:42 -04:00
Ben McMorran
46932ee0f9 Replace data-test-course and data-test-unsucceeded with data-course-key 2014-08-21 12:11:26 -04:00
Don Mitchell
0d1669c612 DateTime fields can support datetime values. 
LMS-11209
 2014-08-21 12:11:26 -04:00
Justin Helbert
dd7f09d36a This confirms the data api upgrade 2014-08-19 19:03:58 +00:00
Sarina Canelake
5f14959231 Merge pull request #4846 from edx/db/update-i18n-tools 
Update i18n-tools
 2014-08-15 11:02:11 -04:00
Calen Pennington
d54b347c86 Merge pull request #4755 from FiloSottile/mentoring_studio 
Update the reference to gsehub/xblock-mentoring#4
 2014-08-15 08:50:11 -04:00
David Baumgold
79f3526c6f Update i18n-tools 2014-08-14 17:05:10 -04:00
Matjaz Gregoric
16a2940977 Update django-splash. 
The new release supports wildcards in path exclusion rules.
 2014-08-14 19:03:41 +02:00
Sarina Canelake
6dd9d9ec3f Merge pull request #4586 from jazkarta/edx-jsme-1.0 
Release edx-jsme 1.0
 2014-08-14 10:02:55 -04:00
Filippo Valsorda
422a6e20db Update the reference to gsehub/xblock-mentoring#4 and gsehub/xblock-mentoring#5 
Port the Studio editor and remove the dataexport functionality
Use the enforce_type feature to parse the bools
 2014-08-13 09:25:09 +02:00
Calen Pennington
25963797c6 Merge pull request #3227 from FiloSottile/enforce_type 
Enforce type of the XBlocks Fields when set
 2014-08-11 16:13:53 -04:00
Chris Rossi
88af00904f Release edx-jsme 1.0 2014-08-11 09:04:27 -04:00
Feanil Patel
2a9c9ee7c8 Merge pull request #3894 from mtyaka/patch-3 
Update xblock-mentoring.
 2014-08-08 16:23:22 -04:00
Filippo Valsorda
6378c01a47 enforce-type: set the edx/XBlock#200 merge hash 2014-08-08 09:14:10 -07:00
Filippo Valsorda
a9930bf34a Make enforce_type an optional flag, to avoid conflicts 2014-08-08 09:14:10 -07:00
Filippo Valsorda
0482038756 Enforce type of the XBlocks Fields when set 
This updates the XBlock dependency to edX/XBlock@***
and add the newly introduced enforce_type methods
 2014-08-08 09:14:10 -07:00