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 |
|
Ned Batchelder
|
26a4670cea
|
Update version of django-splash
|
2015-11-19 12:34:42 -05:00 |
|
John Eskew
|
e4d8b58412
|
Bump tag & version of edx-organizations
|
2015-11-19 11:56:32 -05:00 |
|
Ned Batchelder
|
a65d599fae
|
Update XBlock version
|
2015-11-19 11:43:12 -05:00 |
|
John Eskew
|
698cea3f87
|
Remove errant 'and is'
|
2015-11-19 11:27:07 -05:00 |
|
John Eskew
|
6a58a9c120
|
edx-organizations
|
2015-11-19 11:18:40 -05:00 |
|
Ned Batchelder
|
66cbc6a6d1
|
Update django-wiki reference
|
2015-11-19 11:17:09 -05:00 |
|
Muhammad Ammar
|
11a183855c
|
update submissions and ora2 versions
|
2015-11-19 20:56:52 +05:00 |
|
Brian Beggs
|
0eabdcbfde
|
reverting ora2 tag in github.txt
|
2015-11-19 10:24:55 -05:00 |
|
Usman Khalid
|
219a2083ad
|
Tag lettuce
|
2015-11-19 19:35:12 +05:00 |
|
Brian Beggs
|
705bdaaace
|
updated edx-proctoring tag
|
2015-11-19 09:31:59 -05:00 |
|
John Eskew
|
6eda0f3410
|
Change django-oauth2-provider to match version
|
2015-11-19 09:29:30 -05:00 |
|
Usman Khalid
|
2ab255a304
|
Tag event-tracking.
|
2015-11-19 18:07:06 +05:00 |
|
John Eskew
|
a160f10797
|
Add version back to django-oauth2-provider
|
2015-11-18 15:54:31 -05:00 |
|
John Eskew
|
2408c0f0c7
|
django-pyfs
|
2015-11-18 15:50:01 -05:00 |
|
John Eskew
|
73bf93eefd
|
django-openid-auth
|
2015-11-18 15:27:16 -05:00 |
|
Brian Beggs
|
2977419fa6
|
Updated edx-val tag
|
2015-11-18 14:57:35 -05:00 |
|
Brian Beggs
|
ece43db411
|
Updated edx-oauth2-provider tag
|
2015-11-18 14:55:43 -05:00 |
|
Brian Beggs
|
ecd0b5f244
|
set tag for edx-search
|
2015-11-18 14:41:32 -05:00 |
|
Brian Beggs
|
647c1257dd
|
updated edx-milestones to tag release-2015-11-17
|
2015-11-18 14:34:10 -05:00 |
|
John Eskew
|
41e9fd187b
|
django-oauth-provider take 2
|
2015-11-18 14:17:09 -05:00 |
|
Brian Beggs
|
8594896621
|
updated edx-reverification tag
|
2015-11-18 14:12:31 -05:00 |
|
John Eskew
|
e3bb5137ea
|
django-oauth2-provider
|
2015-11-18 13:57:29 -05:00 |
|
Brian Beggs
|
ceaff54fcb
|
updated edx-organizations with django 1.8 release tag
|
2015-11-18 13:54:37 -05:00 |
|
muhammad-ammar
|
29acc3acfc
|
resolve merge conflicts
test fixes
|
2015-11-18 19:13:54 +05:00 |
|
muhammad-ammar
|
8d5f153201
|
Merge remote-tracking branch 'origin/release' into dj18-release-merge
Conflicts:
common/djangoapps/util/testing.py
lms/djangoapps/instructor/views/api.py
lms/djangoapps/teams/tests/test_views.py
openedx/core/djangoapps/programs/models.py
openedx/core/djangoapps/user_api/accounts/tests/test_views.py
requirements/edx/github.txt
|
2015-11-18 17:53:44 +05:00 |
|
asadiqbal
|
290e577ea7
|
SOL-1380 release tag update in github.txt
|
2015-11-17 13:35:31 +05:00 |
|