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
Andy Armstrong
fbbf3380b8
Use the latest ORA and submissions API
2015-11-24 00:41:12 -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
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
Ned Batchelder
707675d720
Use correct version of ora2
2015-11-13 12:06:52 -05:00
Ben Patterson
dcc9172e7b
Use upstream nose instead of a fork.
...
The multiprocessing issues we had seen previously do not appear
when we use our combination of plugin settings for multiprocessing.
This makes it unnecessary to use a fork.
2015-11-12 20:34:55 -05:00
Ned Batchelder
835eccaf67
Use corrected migrations from edx-submissions
2015-11-10 23:01:38 -05:00
Ned Batchelder
607f3bf43a
Use a branch instead of an unpushed tag for django-splash
2015-11-10 15:42:39 -05:00
Usman Khalid
6cb62f2697
Rebase upgrade Django to v1.8.5
...
Please note that this is a squshed commit and the work of:
Symbolist, macdiesel, nedbat, doctoryes, muzaffaryousaf and muhammad-ammar
2015-11-10 15:00:19 -05:00
Chris Dodge
eeb8c48922
Disable posting to LinkedIn feature for microsites until we can support multiple LinkedIn accounts
2015-11-10 09:41:43 -05:00
chrisndodge
6daa5a631f
Merge pull request #10489 from edx/cdodge/button-style-fixes
...
(WIP) Proctoring: fix sass and use updated edx-proctoring version
2015-11-05 07:19:40 -05:00
Ned Batchelder
68182b13d2
Merge pull request #10474 from edx/ned/django-pylint
...
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
2015-11-04 06:16:01 -05:00
Ned Batchelder
1f093eccfb
Use 0.3.2 of edx-lint, with pylint-django and C extensions read
2015-11-03 16:22:40 -05:00
Chris Dodge
cfbb24837e
fix sass and use updated edx-proctoring version
2015-11-03 13:21:37 -05:00
Ben Patterson
7eb9cecb9b
Ability to run bok-choy in multiprocess mode.
...
This includes:
* Ability to specify number of processes to run bok-choy tests in
* A forked nose commit to get the multiprocess plugin's logging to work
* A different plugin (xunitmp) must be used for pulling together xunit results
This works by:
* Starting the various servers that are needed for the acceptance test environment
* Running the tests themselves in multiprocess mode
2015-11-03 08:19:20 -05:00
Awais Jibran
6319142a86
Updating edx-platform for XBlock#323
2015-11-02 18:17:47 +05:00
Ned Batchelder
e79ff7b06d
Egg name needs to match setup(name=..) to get installed properly
2015-10-31 07:51:45 -04:00
chrisndodge
7868067879
Merge pull request #9744 from edx/cdodge/timed-exams
...
Timed Exams
2015-10-30 11:03:59 -04:00
Muhammad Shoaib
9476898df0
Add Timed Exams as a feature to edx-platform
2015-10-30 08:44:33 -04:00
Piotr Mitros
da709bbcb6
Merge pull request #8597 from edx/pmitros/RateXBlock
...
XBlock for rating course content
2015-10-26 10:06:36 -04:00
Jim Abramson
88bfeafe4c
Merge pull request #10274 from edx/jsa/update-erac
...
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
2015-10-21 14:20:53 -04:00
Ned Batchelder
1775076500
Update edx-lint to get updated pylintrc for Meta
...
It's silly to have to shut up pylint for "class Meta" all the time.
2015-10-21 07:34:15 -04:00
jsa
56b7b7007e
Update from ecommerce-api-client 1.1 to edx-rest-api-client 1.2
2015-10-20 17:44:19 -04:00
Zubair Afzal
7fe813e6a5
Merge pull request #10217 from edx/zub/update-icrv-version-to-0.0.2
...
update ICRV block version to 0.0.4
2015-10-20 19:36:42 +05:00
