43642 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Alex Dusenbery	b35450decc	EDUCATOR-1729 | Control forum notifications with SiteConfiguration, too.	2017-11-14 12:59:46 -05:00
John Eskew	f790766c26	Merge pull request #16548 from edx/jeskew/more_mgmt_cmd_conv_from_optparse ... Move more mgmt commands from optparse to argparse.	2017-11-14 12:29:57 -05:00
Brian Mesick	dad73637aa	Merge pull request #16495 from edx/bmedx/django111_startup_fixes ... Changes necessary for Django 1.11 tests to start	2017-11-14 12:19:21 -05:00
Matt Drayer	d9970ef937	Merge pull request #16563 from edx/mattdrayer/ENT-686-4 ... Revise SuccessFactors OData exception logging	2017-11-14 12:12:00 -05:00
John Eskew	27315f442a	Move more mgmt commands from optparse to argparse.	2017-11-14 11:26:46 -05:00
sanfordstudent	4d0ce28fa9	Merge pull request #16560 from edx/sstudent/EDUCATOR-1624 ... EDUCATOR-1624 logging	2017-11-14 11:20:42 -05:00
Matt Drayer	8ee0366203	Revise OData exception logging	2017-11-14 11:16:17 -05:00
Brian Mesick	7ccc498800	Merge pull request #16561 from edx/bmedx/django111_select_related ... Remove use of non-relational fields in select_related queries	2017-11-14 11:04:41 -05:00
bmedx	09e5156543	Remove use of non-relational fields in select_related queries ... These changes should not change the actual queries at all, and those will throw errors in Django 1.11.	2017-11-14 10:10:08 -05:00
Sanford Student	898129b5c0	EDUCATOR-1624 logging	2017-11-14 10:07:24 -05:00
Mushtaq Ali	efd0381c67	Merge pull request #16543 from edx/mushtaq/video-pipeline-jwt-modifications ... Video pipeline jwt modifications	2017-11-14 20:02:09 +05:00
Uman Shahzad	5d80c8231a	Merge pull request #16558 from open-craft/uman/0.53.13 ... [ENT-752] Bump edx-enterprise to 0.53.13.	2017-11-14 19:28:17 +05:00
Clinton Blackburn	3a005c492f	Disabled anonymous access for tabs that require enrollment	2017-11-14 08:00:16 -05:00
Ayub khan	f826917536	Merge pull request #16555 from edx/update_translations_14_nov ... updated push files	2017-11-14 17:55:45 +05:00
Mushtaq Ali	40d74e77c9	Modify video pipleine client jwt settings - EDUCATOR-1733	2017-11-14 17:23:06 +05:00
Uman Shahzad	b46b65276a	Bump edx-enterprise to 0.53.13.	2017-11-14 16:41:19 +05:00
Noraiz Anwar	439e367dea	Merge pull request #16511 from edx/noraiz/EDUCATOR-1696 ... optimize libraries iter for studio dashboard	2017-11-14 15:41:39 +05:00
ayub-khan	cc98306f2b	updated push files	2017-11-14 14:38:12 +05:00
Rabia Iftikhar	08e6a069a9	Merge pull request #16542 from edx/ri/proctoring-update-version ... update edx-proctoring version	2017-11-14 13:06:21 +05:00
noraiz-anwar	73f9c02d6d	optimize libraries iter for studio dashboard	2017-11-14 12:52:36 +05:00
rabiaiftikhar	e8a2629cfc	update edx-proctoring version	2017-11-14 11:35:33 +05:00
Troy Sankey	73318eccf7	Merge pull request #16526 from edx/pwnage101/teams_mgmt_commands ... teams and student management commands cleanup for django 1.11	2017-11-13 18:11:56 -05:00
bmedx	d3bbb86fe3	Shims to fix test collection errors	2017-11-13 15:45:34 -05:00
bmedx	f3f8d8ec96	Changes necessary for Django 1.11 tests to start ... - Certificates management commands updates - Moving reverse calls in tests into setUp from class definition - Import shuffling - Consolidating cryptograhpy version to 1.9	2017-11-13 15:45:32 -05:00
Muzaffar yousaf	c1c8c20b76	Merge pull request #16517 from edx/subtitle-migrations ... Clean makemigration test and bump the val version.	2017-11-14 01:09:04 +05:00
Troy Sankey	3685b1ada8	More student management commands cleanup for Django 1.11 ... Seems like transfer_students.py was missed in the last attempt to cleanup commands in this app.	2017-11-13 14:09:39 -05:00
Michael Youngstrom	1e6c72c5b6	Merge pull request #16478 from edx/youngstrom/remove_a11y_coverage ... Remove coverage reports for a11y and bok-choy tests	2017-11-13 13:34:09 -05:00
Ned Batchelder	e8622f0415	Merge pull request #16534 from kaizoku/remove-unreachable-return ... Remove unreachable return in contentstore course listing	2017-11-13 12:47:34 -05:00
David Ormsbee	fc0dab4c4f	Merge pull request #16529 from edx/ormsbee/consolidate_xblock_assets ... Consolidate collected XBlock static assets.	2017-11-13 12:46:20 -05:00
Michael Youngstrom	a6b55c2d17	Remove coverage reports for a11y and bokchoy tests by default	2017-11-13 12:28:07 -05:00
David Ormsbee	a6752b7c4d	Consolidate collected XBlock static assets. ... Before this commit, XBlock static assets were extracted during the collectstatic process by iterating through all installed XBlock classes and creating a separate directory for each. However, some packages install many XBlocks that actually share the same static assets. The most notable example is problem_builder, though we also see this with schoolyourself and google_drive. This commit uses the parent module name to do package asset lookup, collapsing those cases down and eliminating duplicates. For a default install of edx-platform XBlocks, this reduces assets generated from 31M to 14M.	2017-11-13 11:09:09 -05:00
Alex Dusenbery	8eb1900299	EDUCATOR-1571 | Send discussion notification on first response; add a CourseWaffleFlag for discussion notifications.	2017-11-13 10:45:45 -05:00
David Ormsbee	3054ae43fd	Merge pull request #16532 from edx/ormsbee/remove_fonts_shortcut ... Remove unused OS X shortcut to fonts.	2017-11-13 08:57:45 -05:00
Ayub khan	a1f30644d9	Merge pull request #16541 from edx/LEARNER-2653-minor-code-refactor ... Minor Code Refactor	2017-11-13 18:54:15 +05:00
Tasawer Nawaz	34d8b1fb16	Merge pull request #16515 from edx/tasawer/learner-3097/fix-certificates-visibility-on-profile-page ... Fix certificates visibility to students on the profile page before the available date	2017-11-13 18:15:31 +05:00
ayub-khan	e0d96abf1c	Minor Code Refactor ... LEARNER-2653 Jenkins translation job pybabel process was not able to interpret this line and causing syntax error.	2017-11-13 18:00:00 +05:00
Muhammad Ammar	947b87230e	Merge pull request #16539 from edx/ammar/pass-course-id-as-string ... pass course id as string to edxval api method	2017-11-13 14:35:34 +05:00
muhammad-ammar	d78557a40b	pass course id as string to edxval api method	2017-11-13 12:28:19 +05:00
edx-pipeline-bot	230b18db16	Merge pull request #16531 from edx/release-mergeback-to-master ... Merge release back to master	2017-11-10 22:39:41 -05:00
adeel khan	4fd43029df	Merge pull request #16518 from edx/adeel/LEARNER_2571_studentaccountview_error_handle ... Adds error handling for password reset	2017-11-10 16:21:10 +05:00
Adeel Khan	3f61f50de0	Adds error handling for password reset ... This patch enables handling of UserAPIInternalError on password reset , instead of throwing 500 to user. We are showing user a message if UserAPIInternalError is raised. LEARNER-2571	2017-11-10 14:41:15 +05:00
Josh	b8893cbbd1	Remove unreachable return in contentstore course listing	2017-11-10 18:20:23 +09:00
David Ormsbee	5f866c265b	Remove unused OS X shortcut to fonts. ... Based on the header, it looks like this was a large OS X Alias file, checked in accidentally.	2017-11-09 17:34:16 -05:00
Gabe Mulley	4c64343806	Merge pull request #16519 from edx/pacing/studio-modal ... Studio Section Highlights: add doc and preview text to modal	2017-11-09 16:51:29 -05:00
Eric Fischer	25b08981e5	Revert "Merge pull request #16447 from appsembler/omar/hide-library-button" ... This reverts commit 9a9ef198b2, reversing changes made to f61cbe75b5.	2017-11-09 16:11:55 -05:00
Troy Sankey	877c9fafc3	teams management commands cleanup for django 1.11	2017-11-09 15:39:04 -05:00
Troy Sankey	b07402e751	remove unused optparse imports	2017-11-09 15:38:54 -05:00
Matt Tuchfarber	5ca2ea9aad	Merge pull request #16523 from edx/tuchfarber/program_marketing_tweaks ... Make FAQ responses allow HTML and fix banner image sizing.	2017-11-09 15:29:08 -05:00
Douglas Hall	5c3f509807	Merge pull request #16525 from edx/uman/0.53.12 ... [ENT-633] Upgrade edx-enterprise to 0.53.12.	2017-11-09 15:25:50 -05:00
Eric Fischer	801a948d71	Merge pull request #16524 from edx/efischer/revert_library ... Revert "Merge pull request #16447 from appsembler/omar/hide-library-b…	2017-11-09 15:00:11 -05:00