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
Calen Pennington
545c9cbb95 Merge pull request #13232 from cpennington/upgrade-flaky 
Upgrade the flaky library, so that py.test (used by oep2 reporting) w…
 2016-08-16 09:39:48 -04:00
David Baumgold
307abcad5b Merge pull request #13225 from singingwolfboy/update-pa11ycrawler 
Use updated, simplifed version of pa11ycrawler
 2016-08-16 08:51:05 -04:00
David Baumgold
18500472c6 Use updated, simplifed version of pa11ycrawler 2016-08-15 14:24:17 -04:00
E. Kolpakov
b24ae0d61d Version update: Drag and Drop v2 2016-08-15 18:48:01 +03:00
Calen Pennington
38dfedca52 Upgrade the flaky library, so that py.test (used by oep2 reporting) works correctly 2016-08-12 12:07:59 -04:00
Asad Iqbal
09ae2fc0da Merge pull request #13226 from edx/asadiqbal08/update_release_tag_done_xblock 
asadiqbal08/SOL-2020- updated the release tag for DoneXblock in edX-platform
 2016-08-12 17:23:11 +05:00
asadiqbal
c3da31b343 updated the release tag for DoneXblock in edX-platform 2016-08-12 12:35:18 +05:00
John Eskew
10ff516fd9 Updating edx-django-release-util requirement to version 0.1.0 2016-08-11 13:55:05 -04:00
Brian Beggs
a3f8cafb1d Merge pull request #12998 from mitocw/bdero/cas-django-1.8 
Update django-cas dependency to support Django 1.8
 2016-08-10 11:29:29 -04:00
ssemenova
acc5133fa8 edx-ora2 1.1.7 2016-08-09 16:36:11 -04:00
Brian Beggs
1182ae6c54 Adding edx-django-release-util to LMS and CMS 2016-08-05 13:50:05 -04:00
sanfordstudent
095bae1a2c Merge pull request #13129 from edx/sstudent/TNL-5099 
WIP: initial re-add with no extra work beyond merge conflicts
 2016-08-05 09:47:27 -04:00
Ned Batchelder
791a65d6d5 Merge pull request #13137 from edx/ned/tweak-github-txt 
Minor improvements to the instructions in github.txt
 2016-08-05 07:10:54 -04:00
Sanford Student
fc943ff539 moving milestones check to access.py and upgrading milestones version 2016-08-04 14:47:15 -04:00
Ned Batchelder
494994feb9 Minor improvements to the instructions in github.txt 2016-07-30 07:20:33 -04:00
Brian Jacobel
af76273393 Install and configure eslint and eslint-config-edx (alongside JSHint for now) 2016-07-29 13:27:55 -04:00
Kevin Kim
a39d6c2e94 Add gated content banner for staff in lms 2016-07-27 14:03:08 +00:00
David Ormsbee
5d150a39eb Bump opaque-keys version to 0.3.2 2016-07-26 17:31:15 -04:00
wajeeha-khalid
03cee389e0 update oauthlib version to 1.0.3 2016-07-25 10:59:42 +05:00
Eric Fischer
b040801476 edx-ora2 1.1.6 (#13051) 2016-07-21 12:24:02 -04:00
Brandon DeRosier
028dab1500 Update django-cas dependency to support Django 1.8 2016-07-21 11:12:23 -04:00
Brian Beggs
7278102871 updating to Django 1.8.14 for XSS security fix 2016-07-19 11:47:43 -04:00
John Eskew
ffcd3440de Bump XBlock version to 0.4.12 2016-07-18 11:06:31 -04:00
Braden MacDonald
c0f608e638 Bump problem-builder on edx.org to edx-release 2.0.4 2016-07-13 10:37:49 -07:00
John Eskew
4fca1d9d98 Merge pull request #12893 from edx/jeskew/control_chars_in_string_fields 
Update version of XBlock repo.
 2016-07-11 13:29:51 -04:00
John Eskew
ea6812e954 Update version of XBlock repo. 2016-07-08 14:04:37 -04:00
Braden MacDonald
7c3d902ff6 Merge pull request #11286 from open-craft/omar/remove-s3 
Add OpenStack Swift support
 2016-07-07 11:05:28 -07:00
John Eskew
d7db6e9d22 Bump the django-wiki version number. 2016-07-06 15:48:04 -04:00
E. Kolpakov
0dddc2e3d4 Bumped Django SWIFT storage version 2016-07-06 11:50:38 +03:00
Omar Khan
2faab97eea Add OpenStack Swift support 
Refactor all S3 code to use the django storage API and add swift
settings for openstack deployments
 2016-07-05 17:31:59 +03:00
Matt Drayer
68312bdd2d Revert "Revert "saleem-latif/WL-328: Multi-Site Comprehensive Theming"" 
2. Update COMPREHNSIVE_THEME_DIR to COMPREHENSIVE_THEME_DIRS
3. Update paver commands to support multi theme dirs
4. Updating template loaders
5. Add ENABLE_COMPREHENSIVE_THEMING flag to enable or disable theming via settings
6. Update tests
7. Add backward compatibility for COMPREHEHNSIVE_THEME_DIR
 2016-06-30 15:19:51 +05:00
E. Kolpakov
33b3dfcc92 Converts Discussion XModule to Discussion XBlock 
* Renames discussion_module to discussion_xblock
* Moves common/lib/xmodule/xmodule_discussion to openedx/core/lib/xblock_builtin/xblock_discussion
 2016-06-29 06:47:04 +12:00
Douglas Hall
56055cc47e Merge branch 'release' into douglashall/merge_patch_2016_06_22_to_master 2016-06-24 11:07:43 -04:00
Christopher Lee
d794fc5c4d Merge pull request #12842 from edx/clee/update-oauth 
Upgrade edx-oauth2-provider to v1.1.3
 2016-06-24 10:58:47 -04:00
christopher lee
084a5bdddd Upgrade edx-oauth2-provider to v1.1.3 2016-06-24 08:15:22 -04:00
Douglas Hall
e2fd776aab Upgrading edx-proctoring to 0.12.21 to pull in additional fix 2016-06-23 15:27:36 -04:00
Kevin Falcone
dbc4eccf8e Convert to tag syntax for version 2016-06-23 14:34:11 -04:00
christopher lee
141276e925 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:19:57 -04:00
christopher lee
92a48dfe71 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 14:13:21 -04:00
Jesse Zoldak
bbd0a82920 Revert "Upgrade edx-oauth2-provider to v1.1.2" 2016-06-23 12:46:45 -04:00
christopher lee
76bdacdde8 Upgrade edx-oauth2-provider to v1.1.2 2016-06-23 12:34:20 -04:00
Douglas Hall
40543ca0de Upgrade edx-proctoring to 0.12.20 2016-06-22 13:54:56 -04:00
Ned Batchelder
0d8cf05d17 Merge pull request #12788 from edx/ned/update-transifex-client 
Use the latest version of the transifex client
 2016-06-22 09:36:54 -04:00
Douglas Hall
f8ac8c1aaa Merge pull request #12815 from edx/douglashall/SOL-1844 
SOL-1844 Upgrade edx-proctoring to 0.12.20
 2016-06-21 15:24:26 -04:00
Eric Fischer
49add6c963 edx-submissions version bump (#12812) 2016-06-21 14:44:34 -04:00
Douglas Hall
697821e570 Upgrade edx-proctoring to 0.12.20 2016-06-21 10:47:46 -04:00
Chris
a7bd52952e Merge pull request #12729 from edx/clrux/bumping-bokchoy 
Bumping bok-choy to pick up a11y changes
 2016-06-17 14:43:21 -04:00
Ned Batchelder
cd7e79cdcb Use the latest version of the transifex client 2016-06-16 21:28:57 -04:00
Clinton Blackburn
8fa3bf327f Merge pull request #12651 from edx/clintonb/single-logout 
Added support for OpenID Connect single logout
 2016-06-15 12:56:50 -04:00
Clinton Blackburn
3f19cc0265 Updated logout view 
In addition to logging the user out of LMS, the logout view also logs users out of the IDAs to which they previously authenticated.

ECOM-4610
 2016-06-15 11:11:49 -04:00