Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

3684 Commits

Author SHA1 Message Date
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
Cliff Dyer
ce99ca63fa Merge pull request #10561 from edx/release 
Verify patched fix merge back into master.
 2015-11-10 14:10:05 -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
Ned Batchelder
10e8435b3a Bump coverage.py to 4.0.2 2015-11-08 21:32:11 -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
Eric Fischer
dbbc64ff88 CohortMembership Race Condition Test 
By using the before_after library, we can force a race condition to reliably
occur in the CohortMembership.save() method. This unit test will do just that,
and ensure that our race-condition-handling code functions as it should.
 2015-10-30 11:07:25 -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
zubair-arbi
7f96474d01 basic programs api setup and dashboard integration 
ECOM-2578
 2015-10-29 20:07:51 +05:00
Ben Patterson
2a5a29edf5 Upgrade flaky for multiprocessing nose support. 
Flaky's latest release includes support for multiprocessing in nose. Upgrading in
order to further the end-goal of providing multiprocessing capability in our
bok-choy test suite.
 2015-10-28 11:17:45 -04:00
Feanil Patel
d8eec000b7 Update newrelic plugin version. 
Changelog: https://docs.newrelic.com/docs/release-notes/agent-release-notes/python-release-notes
 2015-10-27 14:16:02 -04:00
Christine Lytwynec
03236cbfca Merge pull request #10116 from edx/clytwynec/custom-a11y-rules 
Update bok choy to v0.4.7
 2015-10-26 10:15:31 -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
Christine Lytwynec
7d24e5186b update bokchoy version 2015-10-23 09:17:20 -04:00
Braden MacDonald
0004df2084 Bump problem builder XBlock version to include PR 80 
See https://github.com/open-craft/problem-builder/pull/80
 2015-10-22 12:01:26 -07:00
Sarina Canelake
9abf255096 Merge pull request #10262 from edx/oppia 
Update Oppia XBlock
 2015-10-22 14:31:37 -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
Sarina Canelake
c25a92facb Update Oppia XBlock 2015-10-19 21:41:34 -04:00
Zia Fazal
e500963c6a ziafazal/updated-edx-milestones-hash: Bump to v0.1.3 
* mattdrayer: Changed github.txt reference to use release tag
* mattdrayer: Updated to edx-milestones v0.1.3 (find_packages)
 2015-10-19 21:18:20 -04:00
Piotr Mitros
ba3ac72c4a Add RateXBlock 2015-10-19 15:49:55 -04:00
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00