43658 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Matt Tuchfarber	c16d8db1dd	Merge pull request #16549 from edx/tuchfarber/program_marketing_tweaks_2 ... Fix URLs in program marketing page	2017-11-14 17:35:23 -05:00
Uzair Rasheed	aa1f3df369	Merge pull request #16513 from edx/uzairr/LEARNER-2981-program-detail-fragment ... Create program detail fragment for mobile app	2017-11-15 02:08:00 +05:00
Adam	9520fe0342	Merge pull request #16553 from edx/adam/fix-branch-versioning-issues-coursegraph ... addresses issue where branch information was not being stripped from …	2017-11-14 15:36:25 -05:00
Christopher Lee	c411b6b8f8	Merge pull request #16565 from edx/clee/LEARNER-2892 ... Make redundant course dashboard course link unfocusable	2017-11-14 14:29:06 -05:00
Anthony Mangano	52e0ab9201	Merge pull request #16564 from edx/amangano/update-spanish-translations ... Update Spanish translations	2017-11-14 14:16:10 -05:00
Sofiya Semenova	3b6e5f89c6	Merge pull request #16562 from edx/sofiya/wl-email-response-notifications ... White label support for email response notifications	2017-11-14 14:02:05 -05:00
Christopher Lee	6dcce5a80e	Merge pull request #16552 from edx/clee/LEARNER-2894 ... Remove aria-label for fields in Account Settings and Profile	2017-11-14 13:41:48 -05:00
christopher lee	b7ff46c325	Make redundant course dashboard course link unfocusable	2017-11-14 13:11:24 -05:00
Douglas Hall	4d58ee0b5e	Merge pull request #16551 from edx/douglashall/add_enterprise_logging ... Added logging to help debug Enterprise API throttling issue.	2017-11-14 13:03:02 -05:00
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
Anthony Mangano	84a3d47acb	update Spanish translations	2017-11-14 12:04:10 -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
Sofiya Semenova	a1692f2b7b	White label support for email response notifications	2017-11-14 10:22:59 -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
Douglas Hall	f3da3b241c	Added logging to help debug Enterprise API issue.	2017-11-14 10:00:48 -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
uzairr	fa6a5f99a5	Create program detail fragment for mobile app ... To extract the program detail information edX mobile team has to parse all the un-necassary details which takes time that ultimately slows down app.To avoid it,a detail fragment is created that will be used in the mobile app as well as on the web. LEARNER-2981	2017-11-14 07:53:12 +00: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
Adam Palay	25b4a6e207	addresses issue where branch information was not being stripped from child blocks when serializing courses (PLAT-1794)	2017-11-13 17:32:56 -05:00
christopher lee	629170d978	Remove aria-label for fields	2017-11-13 16:55:06 -05:00
Matt Tuchfarber	056c30b1b0	Fix URLs in program marketing page ... Change course about page to be dynamically built and change "Enroll Now" button on courses to use the upgrade url instead of the course about url.	2017-11-13 16:01:08 -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