Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
34,856 Commits 1 Branch 0 Tags
4f94b50cf24e2c5e2ea52a71f1ff447afbfd26de
Commit Graph

1045 Commits

Author SHA1 Message Date
Ahsan Ulhaq
4f94b50cf2 Update edx-organization version and organization URl 
ECOM-3486
 2016-01-22 19:35:59 +05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS 
ECOM-3419
 2016-01-22 13:00:36 +05:00
Eric Fischer
039e6cdfe6 Merge pull request #11300 from edx/efischer/ora2_release 
ORA2 Weekly Release
 2016-01-21 16:48:13 -05:00
Eric Fischer
71cb070a72 edx-ora2 weekly release version update 2016-01-21 15:53:36 -05:00
Kelketek
677eb9b0c9 Bump Problem Builder Hash 
Per https://github.com/open-craft/problem-builder/pull/94
 2016-01-21 10:31:28 -06:00
Tim Krones
b9ac4e8341 Bump xblock-utils hash. 2016-01-20 22:22:19 +01:00
Douglas Hall
73f311f1f6 Merge pull request #11270 from edx/douglashall/TNL-4046/fix_lti_consumer_due_date_comparison_bug 
TNL-4046 Updating xblock-lti-consumer requirement to pull in bug fix
 2016-01-20 13:59:16 -05:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param 
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
 2016-01-20 09:36:31 +07:00
Douglas Hall
c1efd13f86 Updating xblock-lti-consumer requirement to pull in bug fix for TNL-4046 2016-01-19 16:37:47 -05:00
Ned Batchelder
2c9783c881 Merge pull request #10937 from ubc/ubcpi-0.5 
Update Peer Instruction XBlock to 0.5
 2016-01-19 15:03:42 -05:00
Ned Batchelder
ffbbf37052 Use the latest i18n-tools to reduce bogus problem reports 2016-01-15 11:16:41 -05:00
Eric Fischer
c8ceb21e6d ORA staff grading release 2016-01-14 12:18:43 -05:00
Douglas Hall
2c00004d4b Updated edx-proctoring requirement to fix PHX-242 2016-01-12 09:36:35 -05:00
Pan Luo
5bcd5ae08f Update Peer Instruction XBlock to 0.5 2016-01-07 16:00:09 -08:00
Clinton Blackburn
3fe42db0b8 Using edx-search from PyPI 2016-01-05 15:46:57 -05:00
Douglas Hall
92d820de86 Upgrade xblock-lti-consumer to include accessibility improvements 2015-12-29 16:23:37 -05:00
Douglas Hall
1b3e73023d Merge pull request #11012 from edx/cdodge/edx-proctoring-0.12 
use edx-proctoring version 0.12.x
 2015-12-28 14:05:16 -05:00
Chris Dodge
45ce28961c use edx-proctoring version 0.12.x 2015-12-28 11:49:53 -05:00
Ned Batchelder
756941524c Update to latest edx-lint 2015-12-18 20:56:07 -05:00
Piotr Mitros
a543769994 Merge pull request #9733 from edx/pmitros/update-completion-xblock 
Bring DoneXBlock to production-level code
 2015-12-17 10:38:27 -05:00
Piotr Mitros
31da0483bd Moving completion XBlock to production, tweaking PEP8, analytics, etc. 2015-12-16 14:38:05 -05:00
Muhammad Shoaib
788cece45e PHX-161 
- added the new field review_rules for software secure
- added a new tab name "Additional Settings" for the proctored/timed exams
 2015-12-15 14:27:29 -05:00
Matt Drayer
d54ac1ebca Merge pull request #10948 from edx/ziafazal/SOL-1375 
ziafazal/SOL-1375: Create course to org link at the time of course creation
 2015-12-11 09:31:08 -05:00
Zia Fazal
2cb2233dde initial change set. add org autocomplete 
added unit tests and fixed JS tests

added bok choy tests

fixed broken botchoy tests

fixed course discovery broken test

removed monkey patch at class level

changes after feedback from matte
 2015-12-11 18:39:55 +05:00
Sven Marnach
252554c9f3 Make xblock-activetable available on edx.org. 2015-12-10 19:18:46 +01:00
Tim Krones
0ea255bd05 Add xblock-vectordraw to requirements. 2015-12-10 17:12:09 +01:00
Ned Batchelder
586dab51f5 Update XBlock to 0.4.4 (just a packaging change) 2015-12-08 17:09:46 -05:00
E. Kolpakov
bed4babb5e Bumped XBlock version 2015-12-04 14:43:42 +07:00
David Baumgold
c681000975 Merge pull request #10717 from nikolas/patch-2 
Upgrade pip to 7.1.2
 2015-12-03 09:30:18 -05:00
Robert Raposa
38bee4f794 Merge branch 'rc/2015-11-24' into release-2015-12-01-conflict 
# Conflicts:
#	requirements/edx/github.txt
 2015-12-01 15:38:31 -05:00
Douglas Hall
b43c2b23e9 Do not install xblock-utils in editable mode 2015-11-30 19:15:18 -05:00
Douglas Hall
63bee2a8ad Merge pull request #10600 from edx/task/douglashall/PHX-201/xblock_lti_consumer 
Sprint Solutions:Zug PHX-200 PHX-201 Adding LTI consumer XBlock to requirements
 2015-11-30 16:18:14 -05:00
Kevin Falcone
bd0fc0a55c Merge pull request #10743 from edx/jibsheet/requirements-devops 
Suggest the devops group alias, rather than individual names
 2015-11-30 12:54:29 -05:00
Douglas Hall
74c19c2854 Adding LTI consumer XBlock to requirements; Updating xblock-utils requirement 2015-11-30 11:58:51 -05:00
Andy Armstrong
464ce73ca5 Upgrade ORA version to fix staff tools styling 2015-11-30 10:11:22 -05:00
Brian Beggs
1354a0c338 Updated edx-organizations version to fix migration related issues 2015-11-25 14:59:47 -05:00
Kevin Falcone
bd515185f8 Instead of listing devops, use our group 2015-11-25 13:47:56 -05:00
Kevin Falcone
fba6b4db7d Merge pull request #10726 from edx/jibsheet/bump-django-version 
Upgrade to Django 1.8.7
 2015-11-24 16:31:15 -05:00
Ned Batchelder
fc875b1cc5 Add instructions to github.txt 2015-11-24 16:25:05 -05:00
chrisndodge
dd1d680d4f Use edx-proctoring 0.11.6 2015-11-24 13:55:51 -05:00
Kevin Falcone
e33a446cc7 Ugrade to 1.8.7 2015-11-24 13:44:16 -05:00
Andy Armstrong
7731f3d8f8 Merge pull request #10718 from edx/andya/new-ora-release 
Use the latest ORA and submissions API
 2015-11-24 10:31:22 -05:00
Ned Batchelder
e16fad3540 Add the Microsoft Office Mix XBlock 2015-11-24 09:04:12 -05:00
Andy Armstrong
fbbf3380b8 Use the latest ORA and submissions API 2015-11-24 00:41:12 -05:00
Nik Nyby
05a1071dbf Upgrade pip to 7.1.2 
re-opening an old PR. See discussion at https://github.com/edx/edx-platform/pull/9356
 2015-11-23 22:58:20 -05:00
Ned Batchelder
3ae92b9f02 Use 0.1.4 of i18n-tools so Django 1.8 will work 2015-11-23 21:59:26 -05:00
Feanil Patel
995a214c95 Merge pull request #10710 from edx/feanil/upgrade_pymongo 
Upgrade to latest 2.x version of pymongo.
 2015-11-23 15:50:23 -05:00
Feanil Patel
6f0e7c5116 Upgrade to latest 2.x version of pymongo. 
Release Notes: https://jira.mongodb.org/secure/ReleaseNote.jspa?projectId=10004&version=14795
Mostly backports to prep for moving to 3.0
 2015-11-23 12:26:03 -05:00
Ned Batchelder
68e30f5dee Update the django-wiki reference 
Django-wiki had an incorrect migration. This gets the right one.
 2015-11-23 10:01:08 -05:00