Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
30,917 Commits 1 Branch 0 Tags
54f62a85f6164545151c32a063916cbeec94de46
Commit Graph

705 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
Will Daly
36d1eb22cd Merge pull request #8338 from edx/will/credit-provider-integration 
Credit provider integration Python API (Part 1 of 3)
 2015-06-09 11:12:51 -04:00
cewing
a57cc930b6 add ccx-keys as a dependency of edx 2015-06-08 11:25:13 -07:00
Will Daly
e5a62aaaba Credit provider integration Python API 
* Add Python API functions for creating and updating requests for credit.
* Add Django models and migrations for tracking credit requests and status.
 2015-06-08 13:30:32 -04: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
Sven Marnach
0ce1da157a Update commit hash for problem-builder. 2015-05-22 10:38:54 +02: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
Awais
2599445190 ECOM-1590 adding models for credit eligibility. 2015-05-20 14:18:37 +05: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
muzaffaryousaf
cae5623fd9 Updating the django-countries version to support sorting. 
Adding the pyuca to support sorting in differnet languages.

TNL-2047
 2015-05-15 17:07:14 +05:00
muzaffaryousaf
378cf9bb7a Sending preferences and accounts data to template. 
Fixing the pencil icon issue.

TNL-2047
 2015-05-15 17:06:04 +05: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
Christina Roberts
53da306c00 Merge pull request #8010 from edx/christina/update-bok-choy 
Update version of bok-choy.
 2015-05-12 16:29:39 -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
John Lee
3887bf419b Update schoolyourself-xblock to the latest version, which contains 1 commit with a cosmetic change: 5e4d37716e 2015-05-12 14:20:08 -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
Feanil Patel
975f17968d Update to the latest version of celery, and django-celery. 
Changelog for 3.1 can be found here:
  http://celery.readthedocs.org/en/latest/whatsnew-3.1.html

Changelog from 3.1.0 to 3.1.18 can be found here:
  http://celery.readthedocs.org/en/latest/changelog.html
 2015-05-08 08:25:18 -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