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
Kevin Falcone
98671a8aa6 Merge pull request #11399 from edx/jibsheet/dont-use-using 
Don't use using() in migrations
 2016-02-04 19:47:10 -05:00
Kelketek
1934ef1d11 Merge pull request #11312 from edx/kelketek/bump-pb 
Bump hash for problem builder
 2016-02-04 17:46:27 -06:00
John Eskew
e5bd60fac0 Merge pull request #11128 from edx/jeskew/upgrade_django_to_1.8.8 
Upgrade Django from 1.8.7 to 1.8.9
 2016-02-04 17:06:58 -05:00
Jonathan Piacenti
b4918f7f41 Bump problem builder hash. 2016-02-04 15:55:18 -06:00
Afzal Wali
79dd597557 Bump edx-proctoring to 0.12.8 2016-02-03 10:47:56 -05:00
Kevin Falcone
19843f5a14 Bump requirements on two external apps that also use using() 2016-02-02 12:35:22 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files 
Complete static i18n PR
 2016-02-01 17:13:43 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
John Eskew
1e460e72b1 Upgrade Django from 1.8.7 to 1.8.9 2016-02-01 15:22:28 -05:00
Andy Armstrong
30b5cebccd Merge pull request #11110 from edx/ormsbee/libsass 
Speed up Sass compilation with libsass
 2016-01-29 14:26:15 -05:00
Douglas Hall
a075ad86e1 Updating edx-milestones dependency to fix edx-opaque-keys install 2016-01-29 13:05:04 -05:00
David Ormsbee
c13e623067 Speed up SASS compilation with libsass 2016-01-29 12:30:55 -05:00
Douglas Hall
dce3d9ca81 Merge pull request #11014 from edx/douglashall/PHX-219/subsection_gating 
PHX-219 Subsection Gating
 2016-01-29 11:05:39 -05:00
Douglas Hall
22eda46e5f Merge pull request #11368 from edx/hotfix/2016-01-28_release_into_master 
Merging release into master
 2016-01-28 14:12:29 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Douglas Hall
22430f610b Merge branch 'release' into hotfix/2016-01-28_release_into_master 2016-01-28 12:40:00 -05:00
Ned Batchelder
a193fd0f5e Add a note to the top of edx-private.txt 2016-01-28 11:30:13 -05:00
Douglas Hall
2447540d5f Updated proctored/timed exam header bar text; Upgraded edx-proctoring to pull in additional text changes 2016-01-28 09:40:14 -05:00
Ahsan Ulhaq
9220420925 Add jwt auth in LMS 
ECOM-3419
 2016-01-28 14:00:58 +05:00
Clinton Blackburn
d6f7fa18c6 Updated edx-user-state-client dependency 
New version uses edx-opaque-keys instead of opaque-keys.
 2016-01-27 18:52:45 -05:00
Clinton Blackburn
0ddf46894a Resolved ccx-keys dependency on edx-opaque-keys 
ccx-keys has been updated to use the edx-opaque-keys library from PyPI, rather than simply expect the package to be pre-installed. The edx-opaque-keys version has been bumped as it was updated to export test packages needed by ccx-keys.
 2016-01-27 16:22:26 -05:00
Douglas Hall
349b83f072 Merge pull request #11344 from edx/douglashall/PHX-241/upgrade_xblock_lti_consumer 
PHX-241 Upgrade xblock_lti_consumer
 2016-01-27 09:25:53 -05:00
Ahsan Ulhaq
18c1f86a67 Add latest edx-organization version in the platform 2016-01-27 13:27:46 +05:00
Douglas Hall
8bc41cb3e2 Upgrade xblock_lti_consumer to pull in responsive modal launch improvements 2016-01-26 16:43:56 -05:00
Clinton Blackburn
341d00dbcd Installing edx-opaque-keys from PyPI 
The package formerly known as opaque-keys now lives on PyPI as edx-opaque-keys. Additionally, the zendesk requirement has been moved to the correct location.
 2016-01-26 15:46:40 -05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Cliff Dyer
f0908249ca Merge pull request #11301 from edx/cdyer/exif-rotation 
Preserve EXIF orientation data for profile images. (MA-1559)
 2016-01-25 15:27:17 -05:00
Adam Palay
cfab793cd3 Revert "Merge pull request #11302 from edx/ahsan/ECOM-3486-add-organization-api" 
This reverts commit 8bc8b6cafd, reversing
changes made to c2255ef0d6.
 2016-01-25 13:36:26 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Ben Patterson
9a23bb6050 edx-user-state-client is still needed. 2016-01-25 12:08:15 -05:00
J. Cliff Dyer
d5a96ee0ff Preserve EXIF orientation data for profile images. 
When creating profile images from an uploaded file, ensure that EXIF
orientation information is preserved, so profile images appear
right-side-up.

https://openedx.atlassian.net/browse/MA-1559
 2016-01-25 15:23:23 +00:00
Douglas Hall
45db325aa4 Merge pull request #11306 from edx/douglashall/PHX-224/new_proctoring_release 
PHX-224 Upgrading edx-proctoring package to 0.12.6
 2016-01-22 14:09:39 -05:00
Clinton Blackburn
3429453d4b Merge pull request #11251 from edx/clintonb/zendesk-update 
Install Zendesk package from PyPI
 2016-01-22 13:21:33 -05:00
Clinton Blackburn
b29cb5e7fe Install Zendesk package from PyPI 2016-01-22 11:49:21 -05:00
Adam
d2eaa63353 Merge pull request #11308 from edx/revert-11295-bump-problem-builder 
Revert "Bump Problem Builder Hash"
 2016-01-22 11:45:13 -05:00
Douglas Hall
abf82c1fce Upgrading edx-proctoring package to 0.12.6 to help resolve PHX-224 2016-01-22 11:25:15 -05:00
Ben Patterson
15ff497f75 Merge pull request #11298 from edx/benp/bok-choy-0410 
Upgrade to bok-choy 0.4.10
 2016-01-22 11:15:01 -05:00
Adam
f3159e40e5 Revert "Bump Problem Builder Hash" 2016-01-22 10:47:39 -05:00
Ahsan Ulhaq
4f94b50cf2 Update edx-organization version and organization URl 
ECOM-3486
 2016-01-22 19:35:59 +05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Ahsan Ulhaq
bcb8afb2c4 Add jwt auth in LMS 
ECOM-3419
 2016-01-22 13:00:36 +05:00
Eric Fischer
039e6cdfe6 Merge pull request #11300 from edx/efischer/ora2_release 
ORA2 Weekly Release
 2016-01-21 16:48:13 -05:00
Eric Fischer
71cb070a72 edx-ora2 weekly release version update 2016-01-21 15:53:36 -05:00
Ben Patterson
3c3f929614 Upgrade to bok-choy 0.4.10 
This will provide us with backwards-compatibility options for an upcoming browser upgrade. See changelog for more.
 2016-01-21 15:04:43 -05:00
Kelketek
677eb9b0c9 Bump Problem Builder Hash 
Per https://github.com/open-craft/problem-builder/pull/94
 2016-01-21 10:31:28 -06:00
Tim Krones
b9ac4e8341 Bump xblock-utils hash. 2016-01-20 22:22:19 +01:00
Douglas Hall
73f311f1f6 Merge pull request #11270 from edx/douglashall/TNL-4046/fix_lti_consumer_due_date_comparison_bug 
TNL-4046 Updating xblock-lti-consumer requirement to pull in bug fix
 2016-01-20 13:59:16 -05:00
Omar Khan
ab688e63ea Redirect to login when SAML accessed without idp param 
The python social auth SAML page returns a 500 response when accessed
without the 'idp' query param. It should redirect to the login page if
the param is missing.

SOL-1550
 2016-01-20 09:36:31 +07:00
Douglas Hall
c1efd13f86 Updating xblock-lti-consumer requirement to pull in bug fix for TNL-4046 2016-01-19 16:37:47 -05:00
Ned Batchelder
2c9783c881 Merge pull request #10937 from ubc/ubcpi-0.5 
Update Peer Instruction XBlock to 0.5
 2016-01-19 15:03:42 -05:00