Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,527 Commits 1 Branch 0 Tags
e51dbc4db71a075d3b024f55c31deee9a3d72e30
Commit Graph

950 Commits

Author SHA1 Message Date
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
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
zubair-arbi
e0678c606a update ICRV block version to 0.0.4 2015-10-19 14:50:25 +05:00
Braden MacDonald
a144fddee5 Bump Problem Builder to include fix from pb PR 71 2015-10-15 10:47:36 -04:00
David Baumgold
a0f5a006b8 Merge pull request #10117 from edx/db/upgrade-paver 
Upgrade Paver to 1.2.4
 2015-10-13 11:11:41 -04:00
Sarina Canelake
a693feb836 Add Oppia XBlock 2015-10-09 14:41:27 -04:00
David Baumgold
6c68b19f70 Upgrade Paver to 1.2.4 2015-10-09 11:30:53 -04:00
Christine Lytwynec
b92d239e47 Merge pull request #10081 from edx/clytwynec/update-bokchoy-0.4.6 
Clytwynec/update bokchoy 0.4.6
 2015-10-08 15:45:22 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Christine Lytwynec
5e524594ba update bok-choy to version 0.4.6 2015-10-07 10:56:39 -04:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Clinton Blackburn
17f0193362 Merge pull request #10044 from edx/merge-release-into-master 
Merging changes for hotfix/2015-10-05
 2015-10-05 16:11:31 -04:00
Clinton Blackburn
f967cfce8b Merged release to master 
Resolved conflicts from hotfix-2015-10-05
 2015-10-05 14:46:32 -04:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
Chris Dodge
466064575b bump to edx-proctoring v. 0.9.16 2015-10-05 07:32:37 -04:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
David Baumgold
69bc10235e Merge remote-tracking branch 'remotes/origin/release' into release-2015-10-01-resolve-merge-conflicts 2015-10-01 15:28:55 -04:00
Muzaffar yousaf
e6068ec491 Merge pull request #9973 from edx/muzaffar/upgrade-django-filter 
Upgrade django-filter.
 2015-09-30 20:20:21 +05:00
Christine Lytwynec
d3fefa5978 Merge pull request #9866 from edx/clytwynec/update-bokchoy 
Update bok-choy version to v0.4.5
 2015-09-30 11:17:07 -04:00
Christine Lytwynec
b84f35349a update bok-choy version to v0.4.5 2015-09-30 10:12:54 -04:00
Chris Dodge
bf26b09265 update reference to edx-proctoring to account for requested iconography changes from UX team. Also update test to conform with changes 2015-09-30 10:10:23 -04:00
muzaffaryousaf
77cdf85c61 Upgrade django-filter. 
TNL-3445
 2015-09-30 18:25:32 +05:00
Sarina Canelake
be59984d06 Update transifex-client requirement to latest release version 2015-09-30 08:53:50 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Bill DeRusha
14e1ef13fe Merge pull request #9865 from edx/bderusha/segment-version-bump 
Bump version of segemnt's analytics-python package to 1.1.0
 2015-09-29 09:33:49 -04:00
Brian Beggs
d9de52751d Merge remote-tracking branch 'origin/release' into bbeggs/2015-09-22-release-to-master 2015-09-28 20:58:34 -04:00
Ben Patterson
2fd6add524 Revert "Merge DRF 3.1 in to master" 2015-09-28 17:12:43 -04:00
Will Daly
d11ccad0fc Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-28 11:52:30 -04:00
Chris Dodge
3b650133bf bump version of edx-proctoring to 0.9.11 2015-09-27 17:53:13 -04:00
Chris Dodge
8a796675c9 bump edx-proctoring to 0.9.10 2015-09-25 12:40:58 -04:00
Will Daly
8555630df7 Upgrade djangorestframework to v3.1 
* Upgrade edx-submissions
* Upgrade edx-ora2
* Upgrade edx-val
* Upgrade edx-proctoring
* Update all edx-platform code that depends on DRF, including:
  - auth_exchange
  - cors_csrf
  - embargo
  - enrollment
  - util
  - commerce
  - course_structure
  - discussion_api
  - mobile_api
  - notifier_api
  - teams
  - credit
  - profile_images
  - user_api
  - lib/api (OAuth2 and pagination)
 2015-09-25 12:40:57 -04:00
Bill DeRusha
c721ff5a82 Replace SEGMENT_IO_LMS & SEGMENT_IO_LMS_KEY with single key SEGMENT_KEY 2015-09-24 11:49:03 -04:00
Bill DeRusha
4f14d4f75b Bump version of segemnt's analytics-python package to 1.1.0 
Wrap 3rd Party Auth Pipeline with Segment enabled checks
 2015-09-24 11:27:24 -04:00