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

40075 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
b0647e7d83 Revert "Fix mongo query count for Grades API" 2017-02-01 11:09:43 -05:00
Nimisha Asthagiri
0f89af8af1 Merge pull request #14439 from edx/beryl/grades-mongo-query 
Fix mongo query count for Grades API
 2017-02-01 10:27:43 -05:00
Brian Jacobel
e8a60f7da8 Merge pull request #14437 from edx/bjacobel/wmd-disabled-undo-redo 
Add aria-disabled to WMD undo/redo buttons
 2017-02-01 10:11:00 -05:00
Clinton Blackburn
62241b2b66 Merge pull request #14408 from edx/clintonb/automated-refunds 
Automating Refund Approvals
 2017-02-01 09:33:06 -05:00
Nimisha Asthagiri
704a16ad3f Fix mongo query count for Grades API 2017-02-01 09:32:27 -05:00
Stu Young
c0a64c2b1e Merge pull request #14436 from edx/estute/pin-astroid-for-pylint-dependency 
pin astroid version 1.3.8 for pylint dep
 2017-02-01 08:49:02 -05:00
Zia Fazal
4a41b6f0f9 Merge pull request #14427 from edx/ziafazal/TNL-6400 
updated lti_consumer xblock to latest version
 2017-02-01 14:33:57 +05:00
Clinton Blackburn
7c39978b06 Automated refund approval process 
Refunds are now processed automatically. If the automated processing fails, the system falls back to the previous behavior of notifying the Support Team. Additionally, these calls are all made by the service user rather than the learner.

ECOM-6541
 2017-02-01 01:51:21 -05:00
Clinton Blackburn
1189867dd2 Removed references to ECOMMERCE_API_SIGNING_KEY 
We should not be using custom signing keys for each service at this time. We may want to return to this strategy in the future; but, this is not the direction any of our other services are going in.

ECOM-6541
 2017-02-01 01:51:21 -05:00
stu
43329adeaf comment astroid dependency 2017-01-31 22:59:54 -05:00
Clinton Blackburn
e5112bd3a3 Merge pull request #14433 from edx/clintonb/docker-devstack-test 
Simplified Docker Devstack test settings
 2017-01-31 17:55:29 -05:00
Brian Jacobel
ecc9afa19c Add aria-disabled to WMD undo/redo buttons 2017-01-31 17:11:28 -05:00
Clinton Blackburn
6b2ca06544 Simplified Docker Devstack test settings 
The only value that needs to be overridden is the Mongo host. The duplicated values can be imported.
 2017-01-31 16:59:24 -05:00
Renzo Lucioni
8a53f3b6c7 Merge pull request #14430 from edx/renzo/backpopulation-from-catalog 
Use the catalog for program certificate backpopulation
 2017-01-31 15:23:20 -05:00
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
Renzo Lucioni
4027dd8444 Use the catalog for program certificate backpopulation 
This command is used to backfill missing program certificates. Formerly, it used the programs service. It now uses the catalog service exclusively.

ECOM-4422
 2017-01-31 14:20:49 -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
dd3d32655f updated lti_consumer xblock to latest version 2017-01-30 19:37:09 +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