Commit Graph

369 Commits

Author SHA1 Message Date
Calen Pennington
3c2bfc70a3 Merge pull request #8259 from jazkarta/include-ccx-key-dependency
MIT CCX add ccx-keys as a dependency of edx
2015-06-10 09:57:45 -04:00
Sven Marnach
40b4bc65f6 Merge pull request #8411 from open-craft/smarnach/bump-submissions-hash
Bump edx-submissions hash to latest version.
2015-06-10 11:51:59 +02:00
cewing
a57cc930b6 add ccx-keys as a dependency of edx 2015-06-08 11:25:13 -07:00
Feanil Patel
e488896f2f Merge pull request #8409 from edx/dsego/SOL-875
Update edx-search dependency to reference latest edx-search
2015-06-08 13:08:50 -04:00
Feanil Patel
924bbe6b9f Update github.txt to use a tag instead of a commit 2015-06-08 13:07:14 -04:00
Sven Marnach
5cc599af3f Bump edx-submissions hash to latest version.
This will pull in the new get_all_submissions() interface method.
2015-06-08 15:48:18 +02:00
Davorin Sego
40e89e6cb8 update edx-search commit reference 2015-06-08 15:31:14 +02:00
Calen Pennington
faff5b1acd Update XBlock dependency to use the merged commit from the edx repo 2015-06-03 14:39:19 -04:00
zubair-arbi
38b859fd40 use 'name' field in 'CreditRequirement' model to save the location of xblocks 2015-06-03 18:54:33 +05:00
Ned Batchelder
5b6294fe23 Update edx_lint to latest, with range checker 2015-06-02 09:47:12 -04:00
swdanielli
49f378b2af handle more exceptions for file uploading 2015-06-01 11:44:51 -04:00
zubair-arbi
c6439b53d0 Merge pull request #8231 from edx/zub/story/ecom-1612-change-icrv-block-fields
use reverification xblock location as an identifier of reverification…
2015-06-01 20:41:47 +05:00
zubair-arbi
803bc5532d use reverification xblock location as an identifier of reverification checkpoint
ECOM-1612
2015-06-01 19:33:04 +05:00
Martyn James
7f633fc045 Course Discovery feature using edx-search 2015-06-01 10:33:45 +02:00
Sarina Canelake
e72d5d542b Add fake Arabic testing language 2015-05-29 10:16:30 -04:00
Christine Lytwynec
df758d7917 Add an explicit accessibility test TE-890 2015-05-26 11:55:27 -04:00
Sarina Canelake
b0b6967a43 Merge pull request #8148 from edx/xblock-utils-has-update
Bumped xblock-utils version
2015-05-22 09:05:57 -04:00
E. Kolpakov
57738de2a0 Bumped xblock-utils version 2015-05-21 18:08:06 +03:00
Calen Pennington
a2cbd16680 Merge pull request #7789 from cpennington/wrap-csm
Wrap access to CSM (inside FieldDataCache) to use the new interface
2015-05-20 16:11:07 -04:00
Calen Pennington
bd1e9aa129 Record valid scopes when raising InvalidScopeError 2015-05-20 15:33:30 -04:00
David Baumgold
fb777fa48f Update devops in requirement file comments 2015-05-19 15:34:26 -04:00
Nickersoft
5359ff9d71 Passing full name to E-Commerce API 2015-05-18 16:12:10 -04:00
Martyn James
20a32a7e4f Merge pull request #8043 from edx/dcikatic/SOL-487-filter-staff-view-rebase
Dcikatic/sol 487 filter staff view (rebase against master)
2015-05-18 10:40:57 -04:00
swdanielli
09b7fee38e update xml
the xml parsing was out-of-date and we fix it
2015-05-15 14:11:02 -04:00
jsa
31a232edc7 Update ecommerce-api-client and add regression test for XCOM-1606 2015-05-14 16:54:56 -04:00
Davorin Sego
a455d9d50a SOL-495 Cohort-Aware content search 2015-05-14 14:07:42 -04:00
Jesse Zoldak
e15590d28a Update bok-choy version to the latest release 2015-05-13 10:12:27 -04:00
Adam
9115960eac Merge pull request #8013 from edx/merge-release-into-master
Merge release into master
2015-05-13 08:39:23 -04:00
Adam Palay
42fb7bd6cb Merge remote-tracking branch 'origin/release' into merge-release-into-master
Conflicts:
	requirements/edx/github.txt
2015-05-12 15:13:28 -04:00
cahrens
19c6ae1a81 Update version of bok-choy. 2015-05-12 14:43:04 -04:00
Adam
4a8cd270a1 Merge pull request #7988 from edx/shr/bug/PLAT-612-video-component-missing-tests
edx-val-Fix VAL error on re-import
2015-05-11 13:25:43 -04:00
Syed Hassan Raza
103fa38860 edx-val-Fix VAL error on re-import 2015-05-11 20:00:55 +05:00
Awais Jibran
5e91c37b4e Configuration error on course re-run
TNL 2098
2015-05-11 16:19:21 +05:00
David Baumgold
e33d267e0a Update ease to 0.1.3 2015-05-08 14:39:35 -04:00
Feanil Patel
219b9a0cc6 Merge pull request #7842 from edx/feanil/update_celery
Update to the latest version of celery, and django-celery.
2015-05-08 13:41:18 -04:00
Feanil Patel
e0acd7151e Update ora2 to the latest release. 2015-05-08 12:19:40 -04:00
Will Daly
bd1e7a4167 Merge pull request #7969 from edx/will/update-icrv-sha
Update in-course reverification XBlock SHA in requirements.
2015-05-08 10:49:28 -04:00
David Ormsbee
e3e2284c94 Merge pull request #7967 from edx/ormsbee/update_djt_mongo
Update django-debug-toolbar-mongo to work with DJDT 1.x
2015-05-08 10:07:20 -04:00
Feanil Patel
dae643bee2 Update ora2 to match the new version of celery. 2015-05-08 09:01:43 -04:00
Waheed Ahmed
4270854ebc Updated ora release tag. 2015-05-08 11:59:44 +05:00
Will Daly
c86555266c Update in-course reverification XBlock SHA in requirements. 2015-05-07 22:02:39 -04:00
Martyn James
fb51c6abd3 Exclude filtering for micorosite orgs 2015-05-07 21:39:07 -04:00
David Ormsbee
c2b1c95322 Update django-debug-toolbar-mongo to work with DJDT 1.x
The version of django-debug-toolbar-mongo we have installed does
not support our version of Django Debug Toolbar. The author did
accept a patch that supports the latest version, but has not
published it to PyPI. This just grabs it from the github commit
instead.

Note: This will not uninstall your old version. If the MongoDB info
is not showing up for you in DJDT, try manually uninstalling with:

  pip uninstall django-debug-toolbar-mongo

Running "paver lms" after that should install the right thing.
2015-05-07 20:13:50 -04:00
Gabe Mulley
4a8b0c5ef5 Make user_track use eventtracking 2015-05-06 20:57:46 -04:00
Phil McGachey
a6afc29ced [LTI Provider] Updating submissions dependency to pull in new scoring signals 2015-05-06 07:02:46 -04:00
Clinton Blackburn
cd9c900b9a Corrected ecommerce-api-client dependency 2015-05-05 15:58:07 -04:00
jsa
26f9a5d76f Pass tracking context to ecommerce api client.
XCOM-208
2015-05-05 10:50:46 -04:00
Clinton Blackburn
bfb201ec7d Merge pull request #7822 from edx/clintonb/receipt-page-update
Updated Receipt Page for Oscar
2015-05-02 09:32:11 -04:00
Clinton Blackburn
1a1fe56b29 Added Oscar-Compatible Receipt Page 2015-05-02 00:18:05 -04:00
E. Kolpakov
6db974c8ee Fixes for course import-export:
* Updated XBlock hash - new version forces exposes force_dirty method on fields
* Includes Scope.children fields into xml_importer._update_module_location so that they are updated as well.
* Tests for mutable fields xml_importer._update_module_location with mutable fields and children
2015-05-01 18:36:14 +03:00