Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
40,059 Commits 1 Branch 0 Tags
4b60f1339eecd54d77fd1080aecb4d21f969e84e
Commit Graph

40059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
stu
4b60f1339e pin astroid version 1.3.8 for pylint dep 2017-01-31 15:10:45 -05:00
Christina Roberts
255af25a32 Merge pull request #14432 from edx/christina/quality 
Fix safe template warning.
 2017-01-31 14:35:16 -05:00
cahrens
0f3eb6e94c Fix safe template warning. 2017-01-31 13:43:36 -05:00
Toby Lawrence
823a43166f Merge pull request #14416 from edx/feature/consistent-hashing 
Include django-memcached-hashring to support consistent hashing.
 2017-01-31 12:41:33 -05:00
Christina Roberts
feb1c82d4d Merge pull request #14415 from edx/christina/tnl-6357 
Show checkmarks when "Show Answer" is clicked.
 2017-01-31 10:57:18 -05:00
cahrens
55712d1148 Show checkmarks when "Show Answer" is clicked. 
TNL-6357
 2017-01-31 09:55:08 -05:00
Marko Jevtić
327ffa92a0 Merge pull request #14051 from edx/vkaracic/SOL-2133 
[SOL-2133] Add user deactivation endpoint.
 2017-01-31 14:46:48 +01:00
Vedran Karacic
7fe8e47554 [SOL-2133] Add user deactivation endpoint. 2017-01-31 11:34:26 +00:00
Saleem Latif
c2d7e4469a Merge pull request #14340 from edx/saleem-latif/ENT-112 
ENT-112: Update settings for edx-enterprise (v0.19.1) configurations.
 2017-01-31 15:33:15 +05:00
Saleem Latif
ab88da952b Update settings for edx-enterprise (v0.19.1) configurations. 2017-01-31 14:19:51 +05:00
Jeremy Bowman
576f6755f8 Merge pull request #14200 from edx/jmbowman/async_course_import 
PLAT-1104 Import courses asynchronously
 2017-01-30 16:50:55 -05:00
Eric Fischer
3546c26198 Merge pull request #14410 from edx/efischer/tnl-6408 
Allow null course_edited_timestamp
 2017-01-30 14:12:36 -05:00
Eric Fischer
6f8383199f Allow null edited_timestamp 
Some old mongo courses do not have this field, and the team has opted
to allow null values rather than inserting a default. This change
affects both course and subsection grades.

TNL-6408
 2017-01-30 13:19:36 -05:00
Eric Fischer
a78db97d26 Delay grades recalculation task 
As discovered in load testing, if this task is run too quickly it
can ask for a newly-recorded score prior to the active transaction
finishing and writing to the database.

TNL-6424
 2017-01-30 13:19:36 -05:00
Jeremy Bowman
831cd4b85b PLAT-1104 Import courses asynchronously 2017-01-30 12:19:33 -05:00
Robert Raposa
f308537818 Merge pull request #14420 from edx/robrap/reduce-thresholds 
Reduce thresholds.
 2017-01-30 12:05:31 -05:00
Robert Raposa
10e62c0404 Reduce thresholds. 2017-01-30 09:56:24 -05:00
Zia Fazal
a33f14bc81 Merge pull request #14378 from edx/ziafazal/feature-flag-for-library-creation 
show button new library in studio depending on flags and user staff s…
 2017-01-30 13:58:32 +05:00
jagonzalr
d112c0b81b show button new library in studio depending on flags and user staff status 
add flag DISABLE_LIBRARY_CREATION

add comma

use CourseCreatorRole to determine if user can create a library

add disable library creation feature flag

Conflicts:
	cms/djangoapps/contentstore/views/course.py

ENABLE_CONTENT_LIBRARIES flag

check for course creator role for library creation

Conflicts:
	cms/djangoapps/contentstore/views/course.py

add unit tests

make check of creation of library a true/false for forntend, add security in api call, clean tests

update tests

fix docstring of tests

fixed quality violation

fixed broken unit test and quality violations

Feedback changes and unit test to assert libraries are visible to non staff users too

fixed quality violation and feedback changes
 2017-01-30 12:51:35 +05:00
Renzo Lucioni
2adb03ec8d Merge pull request #14417 from edx/renzo/update-catalog-factories 
Update catalog factories
 2017-01-28 12:25:25 -05:00
Renzo Lucioni
1e929897f0 Merge pull request #14411 from edx/renzo/86-program-editor 
Remove the program admin tool from Studio
 2017-01-28 00:51:38 -05:00
Renzo Lucioni
87ff585ef9 Update catalog factories 
More accurately represent serialized catalog data. Also switch to using Faker.

ECOM-4422
 2017-01-28 00:50:01 -05:00
Renzo Lucioni
31f5c8ddcb Remove the program admin tool from Studio 
All programs are now managed using the Django admin on the catalog service. This is the first in a series of commits removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 19:33:06 -05:00
Toby Lawrence
b34b18653a Include django-memcached-hashring to support consistent hashing. 2017-01-27 15:32:28 -05:00
Gregory Martin
db99423cc8 Merge pull request #14414 from edx/yro_bump-ora2-version 
update ora2 version
 2017-01-27 14:59:18 -05:00
alisan617
69d002a1bf Merge pull request #14413 from edx/alisan/discussion-a11y-TNL-6363 
discussion all topics button in breadcrumbs markup change
 2017-01-27 14:52:46 -05:00
Renzo Lucioni
2545c67f94 Merge pull request #14412 from edx/renzo/remove-program-certification-view 
Remove program certification view from the support app
 2017-01-27 13:53:12 -05:00
Gregory Martin
ddc1d2bc98 update ora2 version 2017-01-27 13:49:42 -05:00
alisan617
ac93935486 discussion all topics in breadcrumbs moved away from h6 2017-01-27 13:45:20 -05:00
Brian Jacobel
9991024029 Merge pull request #14406 from edx/bjacobel/TNL-6364 
Visually indicate fields in new post form are required (TNL-6364)
 2017-01-27 13:26:53 -05:00
Renzo Lucioni
136e7f9b16 Remove program certification view from the support app 
This functionality hasn't been used since it was introduced. It is superseded by the backpopulate_program_credentials management command. This is another commit in a series removing use of the old programs service from edx-platform.

ECOM-4422
 2017-01-27 13:14:45 -05:00
David Ormsbee
41ea1383d4 Merge pull request #14399 from edx/ormsbee/csm_crawler_locking 
Disable student state writes for crawlers.
 2017-01-27 12:28:11 -05:00
Brian Jacobel
c407127db9 Use a capital letter where 'Required' is a separate sentence 2017-01-27 12:23:52 -05:00
Jesse Zoldak
1c8cf285d1 Merge pull request #14409 from edx/zoldak/fix-pep8 
Fix pep8 violation
 2017-01-27 09:50:17 -05:00
Ari Rizzitano
c79718be5b Merge pull request #14387 from open-craft/jill/bump-xblock-poll-v1.2.5 
Bumps the xblock-poll version to v1.2.5
 2017-01-27 09:17:18 -05:00
Jesse Zoldak
6f8b39807a Fix pep8 violation 2017-01-27 07:42:43 -05:00
Clinton Blackburn
4884678834 Merge pull request #14398 from edx/clintonb/docker-devstack-settings 
Updated Docker Devstack settings
 2017-01-27 02:44:01 -05:00
Clinton Blackburn
47ae3791e9 Added test settings for Docker-based devstack 
Fixes https://github.com/edx/devstack/issues/47
 2017-01-27 00:42:52 -05:00
Renzo Lucioni
379d789cf2 Merge pull request #14405 from edx/renzo/fix-backpopulation 
Fix program credential backpopulation command
 2017-01-26 22:15:54 -05:00
Renzo Lucioni
4391a577c2 Fix program credential backpopulation command 
This command was updated to request programs from the catalog, but it wasn't changed to deal with the new response structure. I'm updating all code in the LMS to deal with catalog service responses separately.

ECOM-6900.
 2017-01-26 20:40:37 -05:00
Jillian Vogel
f06be21f11 Merge pull request #14305 from open-craft/jill/bump-django-storage-swift 
Bumps django-storage-swift to 1.2.15
 2017-01-27 09:50:29 +10:30
Clinton Blackburn
576fc30e8e Corrected URLs for the E-Commerce Service when using Docker Devstack 
ECOM-6634
 2017-01-26 18:04:39 -05:00
Clinton Blackburn
5ff02315cc Merge pull request #14397 from edx/clintonb/update-edx-drf-extensions 
Updated edx-rest-api-client to 1.7.1
 2017-01-26 16:24:30 -05:00
Brian Jacobel
c67b8aa0bb Visually indicate fields in new post form are required 2017-01-26 15:48:35 -05:00
Dennis Jen
a107754ff4 Merge pull request #14386 from edx/dsjen/tracking 
Added user tracking id to profile scope in oauth2 handler.
 2017-01-26 15:20:42 -05:00
Clinton Blackburn
aec759fd65 Updated edx-rest-api-client to 1.7.1 
https://github.com/edx/edx-rest-api-client/compare/1.6.0...1.7.1

ECOM-6634
 2017-01-26 15:13:01 -05:00
Eric Fischer
d4df42687e Merge pull request #14381 from edx/efischer/xml_cache_logging 
Log course on no-retry update_course_in_cache errors
 2017-01-26 14:01:18 -05:00
David Ormsbee
608fceb0b5 Remove select_for_update option for FieldDataCache 
We've already been ignoring the param for a long time. This just
removes it entirely.
 2017-01-26 12:51:22 -05:00
Ned Batchelder
36d454fe6e Merge pull request #14403 from edx/nedbat/i18n-tools-from-pypi 
edx-i18n-tools is on PyPI, get it from there.
 2017-01-26 11:45:15 -05:00
Ned Batchelder
7f4ce79ca4 edx-i18n-tools is on PyPI, get it from there. 2017-01-26 10:52:45 -05:00