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

912 Commits

Author SHA1 Message Date
Chris Dodge
466064575b bump to edx-proctoring v. 0.9.16 2015-10-05 07:32:37 -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
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
Brian Beggs
e9fceb8bc2 Merge pull request #9891 from edx/release 
merge release in to master for release 2015-09-22
 2015-09-23 18:09:01 -04:00
Brian Beggs
c26bb9188a Revert "Upgrade django-pipeline and staticfiles" 2015-09-23 15:52:24 -04:00
Brian Beggs
4c05fa4f49 Merge pull request #9803 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles
 2015-09-23 15:50:39 -04:00
Feanil Patel
779861550f Upgrade to the latest version of requests. 
Changelog: https://pypi.python.org/pypi/requests
 2015-09-22 13:33:35 -04:00
Usman Khalid
158bdf4d09 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-09-22 20:39:44 +05:00
Usman Khalid
1e799eb508 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-09-22 20:39:43 +05:00
asadiqbal
396beadd97 SOL-1122 update github.txt reference 2015-09-22 17:35:22 +05:00
Chris Dodge
94377662fd Bump proctoring to 0.9.6e 2015-09-21 15:43:54 -04:00
Ned Batchelder
3c74219c3d Use coverage.py 4.0 final, and coveralls to match 2015-09-21 08:22:54 -04:00
Chris Dodge
3832144a41 bump edx-proctoring 0.9.6d 2015-09-20 09:56:21 -04:00
Feanil Patel
c0eccb0764 Merge pull request #9832 from edx/feanil/monitor_requirements 
Add requirements files that can be used with package monitorig tool.
 2015-09-18 15:59:27 -04:00
Brian Beggs
6ece587f43 Merge pull request #9623 from edx/ammar/update-django-debug-toolbar 
update django-debug-toolbar
 2015-09-18 10:39:58 -04:00
Feanil Patel
fca207d4ac Add requirements files that can be used with package monitorig tool. 2015-09-18 10:39:07 -04:00
Muhammad Ammar
edf88962b5 Merge pull request #9534 from edx/ammar/update-factory-boy 
Update factory_boy
 2015-09-18 19:04:48 +05:00
Muhammad Ammar
4ae62f370e Merge pull request #9673 from edx/ammar/update-python-social-auth 
update python-social-auth
 2015-09-18 18:10:55 +05:00
Sarina Canelake
07428c9ff6 Merge pull request #9247 from ubc/xcompass/pu/ubcpi 
Add Peer Instruction (PI) XBlock
 2015-09-18 09:06:30 -04:00
muhammad-ammar
6a5ce5d544 Upgrade factory_boy 
TNL-3179
 2015-09-18 18:02:38 +05:00
Kevin Falcone
81abdbe81b Merge pull request #9819 from edx/release 
Release
 2015-09-17 21:30:48 -04:00
Clinton Blackburn
394c2906e5 Updated edx-proctoring to 0.9.6b 
PHX-154
 2015-09-16 21:36:20 -04:00
Pan Luo
675d0e1413 Add Peer Instruction XBlock 2015-09-16 15:31:17 -07:00
John Eskew
7c0663f25e Merge remote-tracking branch 'origin/release' into jeskew/resolve_issues_with_release 2015-09-16 15:58:08 -04:00
Ned Batchelder
59e2f47947 Merge pull request #9722 from edx/ned/upgrade-coverage-40b3 
Upgrade coverage.py to 4.0b3
 2015-09-14 10:36:21 -04:00
Bill DeRusha
2b6781e7a1 Update edx-search release 2015-09-11 15:11:48 -04:00
Brian Beggs
60e4a9f31f Merge pull request #9653 from edx/ammar/remove-django-threaded-multihost 
remove django-threaded-multihost
 2015-09-11 14:08:30 -04:00
chrisndodge
987808261d Merge pull request #9699 from edx/cdodge/0.9-proctoring 
update edx-proctoring to 0.9.x
 2015-09-11 12:29:07 -04:00
Ned Batchelder
25449e9148 Upgrade coverage.py to 4.0b3 2015-09-11 11:35:52 -04:00
Chris Dodge
68ee28f8b0 update edx-proctoring to 0.9.x 2015-09-11 10:00:05 -04:00
Ahsan Ulhaq
3d2b6c40cb Update edX Reverification Block hash to the updated version 2015-09-10 19:04:54 +05:00
muhammad-ammar
2521e379b9 update python-social-auth 2015-09-09 15:04:30 +05:00
muzaffaryousaf
e33d1dc563 Upgrading django-sekizai 
TNL-2811
 2015-09-09 14:33:13 +05:00
muzaffaryousaf
86553c2f13 Upgrading django-ses 
TNL-2811
 2015-09-09 12:56:44 +05:00
muzaffaryousaf
0ed729b0ca Upgrading edx-search version in platform 
TNL-3136
 2015-09-09 11:49:15 +05:00
muzaffaryousaf
6be65f6595 Upgrade mock-django to 0.6.9. 2015-09-09 11:49:12 +05:00
Muzaffar yousaf
4c2dc816bb Merge pull request #9617 from edx/muzaffar/django-upgrade-simple-history 
Upgrading django-simple-history to 1.6.3
 2015-09-09 11:38:23 +05:00
Brian Beggs
b7006533a2 updating lettuce to work with Django 1.4 - 1.8 2015-09-08 15:42:11 -04:00
Brian Beggs
ef032e9ab4 Merge pull request #9652 from edx/ammar/remove-django-kombu 
Remove django-kombu
 2015-09-08 14:38:23 -04:00
Brian Beggs
2557e4714b Merge pull request #9644 from edx/ammar/remove-django-masquerade 
Remove django-masquerade
 2015-09-08 14:36:11 -04:00
Brian Beggs
c430422fca Merge pull request #9643 from edx/ammar/remove-django-settings-context-processor 
Remove django-settings-context-processor
 2015-09-08 14:30:14 -04:00