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

35138 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Clinton Blackburn
e92802b382 Updated django-oauth2-provider 
New package includes support for client credentials grant.
 2016-02-08 21:48:22 -05:00
Ben Patterson
827dd1bdba Merge pull request #11456 from edx/benp/diff-cover-upgrade 
Upgrade diff-cover.
 2016-02-08 15:18:49 -05:00
Julian Arni
5be4d4b561 Change link text to include researchers 2016-02-08 14:32:32 -05:00
Mark L. Chang
90f561beef simple readme 2016-02-08 14:32:32 -05:00
Julian Arni
06c562b554 Add Mark's index page 2016-02-08 14:32:32 -05:00
Julian Arni
8ac03abd24 Use docs.edx cname 2016-02-08 14:32:32 -05:00
Julian Arni
d4b3f1efd2 New index page for documentation 2016-02-08 14:32:32 -05:00
Julian Arni
4955d02135 Docs index page 2016-02-08 14:32:32 -05:00
Brian Wilson
9201699b89 update docs from master 2016-02-08 14:32:32 -05:00
Mark L. Chang
2e585470f1 added CNAME file as per https://help.github.com/articles/setting-up-a-custom-domain-with-pages 2016-02-08 14:32:32 -05:00
David Ormsbee
013c81176d added xnojekyll file 2016-02-08 14:32:32 -05:00
David Ormsbee
17d3b261cf First public pages commit. 2016-02-08 14:32:32 -05:00
David Ormsbee
9ae0dada4c Merge pull request #11445 from edx/ormsbee/clear_cache_in_tests 
Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase
 2016-02-08 10:23:54 -05:00
John Eskew
07c542d8cb Merge pull request #11420 from edx/jeskew/ensure_indexes_fix 
Make ensure_indexes mgmt cmd semi-idempotent.
 2016-02-08 09:55:05 -05:00
Ben Patterson
5415f66d46 Upgrade diff-cover. 2016-02-08 09:17:21 -05:00
sanfordstudent
c51bcdbf91 Merge pull request #11418 from edx/sstudent/MA-1918-handle-no-handouts 
MA-1918 returning None for courses with no handouts
 2016-02-08 08:52:41 -05:00
David Ormsbee
8fa8b209a7 Remove query counts from Bookmarks HTTP API tests. 
Query counts already happen at the model and Python API test layers.
Having query counts in the HTTP API tests makes things more brittle
because that includes middleware that this code should not be aware
of. We don't want to have to revisit these tests every time
another piece of middleware is added or removed.
 2016-02-08 08:05:13 -05:00
Christina Roberts
74bdef1eca Merge pull request #11430 from edx/christina/tnl-4057 
Remove flaky decorator from test_cancel_comment_edit
 2016-02-08 07:32:29 -05:00
David Ormsbee
be25bb8aba Clear caches between tests for ModuleStoreTestCase/SharedModuleStoreTestCase 
Cached values were leaking across tests, causing difficult to debug errors,
particularly when using Config Models. As part of this work, certain tests
that had query counts that relied on those values being cached needed to
be adjusted up.
 2016-02-06 00:01:15 -05:00
cahrens
d8a63fbd93 Remove flaky decorator from test_cancel_comment_edit. 
Test passed over 100 times in Jenkins.
TNL-4057
 2016-02-05 21:22:39 -05:00
John Eskew
77d2456542 Make MongoDB index creation idempotent by catching errors about existing 
indexes with different options. Emit warning instead and continue.
 2016-02-05 14:04:41 -05:00
Jim Abramson
ba2c6b79fb Merge pull request #11341 from edx/jsa/ecom-3354 
Implement celery task to award program certs.
 2016-02-05 13:47:16 -05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Toby Lawrence
409a947c0d Merge pull request #11435 from edx/bugfix/add-admin-for-ext-exclusion 
Fix up the excluded extensions bit.
 2016-02-05 12:15:07 -05:00
Toby Lawrence
b03ee49a82 Fix up the excluded extensions bit. 
This adds the missing admin class, and registration of it, required to
actually change the value of the excluded extensions configuration.
 2016-02-05 12:14:15 -05:00
Sanford Student
f88e5bc1d8 MA-1918 returning None for courses with no handouts 2016-02-05 11:31:16 -05:00
Christina Roberts
481f3227dd Merge pull request #11429 from edx/christina/ora-release 
Bump ORA version to 0.2.7.
 2016-02-05 11:14:55 -05:00
Jesse Zoldak
68cf4af2b4 Merge pull request #11442 from jzoldak/zoldak/TE-1131 
Get tests running successfully on CircleCI
 2016-02-05 10:47:23 -05:00
Jesse Zoldak
855d410159 Update the Python version 
Other small changes:
* output the list of installed python packages
* tee the pylint output to the console so the build doesn't timeout when computing violations
 2016-02-05 10:15:43 -05:00
cahrens
4c938358f6 Bump ORA version to 0.2.7. 2016-02-05 09:31:37 -05:00
Jesse Zoldak
d23b021df6 Bump the version of edx-search 2016-02-05 09:15:32 -05:00
Robert Raposa
e6f64429d7 Merge pull request #11437 from edx/robrap/markup 
Move markup helpers to djangolib
 2016-02-05 09:14:12 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -05:00
Ned Batchelder
158c4e58a3 Merge pull request #11424 from edx/ned/make-i18n-more-foolproof 
Move JSON samples out of translated strings so translators can't make mistakes
 2016-02-04 20:31:42 -05:00
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
Peter Fogg
2ddf1f2e6f Merge pull request #11427 from edx/peter-fogg/fix-audit-cert-regen 
Correctly set certificate status for audit certs when regenerating.
 2016-02-04 18:56:40 -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
Peter Fogg
711e2e7f3c Correctly set certificate status for audit certs when regenerating. 
COR-2403
 2016-02-04 17:23:20 -05: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
328c84a2bb Update bok_choy database cache. 2016-02-04 15:55:18 -06:00
Jonathan Piacenti
b4918f7f41 Bump problem builder hash. 2016-02-04 15:55:18 -06:00
Ned Batchelder
aec1ed3992 Merge pull request #11423 from edx/ned/update_translations 
Update translations (autogenerated message)
 2016-02-04 16:50:35 -05:00
Peter Fogg
2d2913ef5d Merge pull request #11426 from edx/peter-fogg/fix-date-block-format 
Correctly format date block dates.
 2016-02-04 15:45:04 -05:00
Peter Fogg
22cb307961 Correctly format date block dates. 2016-02-04 14:34:08 -05:00
Ned Batchelder
21218ef989 Merge pull request #11372 from open-craft/omar/remove-multiple-enrollment-feature 
Remove unused MULTIPLE_ENROLLMENT_ROLES feature setting
 2016-02-04 13:42:48 -05:00
Muhammad Ammar
886d54dce9 Merge pull request #11320 from edx/ammar/boomark-button-requirejs-caching 
bookmark button js caching
 2016-02-04 21:07:45 +05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
clrux
9ef9bc6efb Merge pull request #11129 from edx/clrux/ac-201 
LMS: darkening a gray on the profile page
 2016-02-04 10:11:24 -05:00
Ned Batchelder
6f9fd5d357 Move JSON samples out of translated strings so translators can't make mistakes 2016-02-04 10:07:05 -05:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00