31396 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Brandon DeRosier	2bfbda3c1e	Revert "edX Course/Library Import/Export API" ... This reverts commit c94abd2705.	2015-07-08 16:55:38 -04:00
Brandon DeRosier	783e83deb0	Revert "Add feature flag for Import/Export API in LMS" ... This reverts commit 85b3bfe4f6.	2015-07-08 16:55:38 -04:00
Will Daly	e60ae31d84	Cherrypick hotfix-2015-07-07 into release candidate ... Includes the changes from 897fddba3e. Those changes were introduced while resolving a merge conflict from release back into master.	2015-07-08 16:55:38 -04:00
Matt Drayer	b0c1e962c7	rc/2015-07-08-mattdrayer: Hide button behind feature flag	2015-07-08 16:55:38 -04:00
Clinton Blackburn	b3437b7278	Corrected path to Commerce API ... XCOM-312	2015-07-08 16:55:38 -04:00
Awais	db7dea118c	ECOM-1829 Removing the regen link.	2015-07-08 16:55:37 -04:00
Will Daly	4b64df74b1	Fix migrations 0012 and 0013 in the credit app ... Adds the "order" field that was introduced in 0011 to the "models" dictionary of migrations 0012 and 0013 so South knows that the field should exist after 0011 is run.	2015-07-08 16:55:37 -04:00
Will Daly	1ee782cefa	Merge pull request #8826 from edx/will/fix-progress-credit-typo ... Fix a small typo for credit requirements on the progress page.	2015-07-08 13:40:14 -07:00
David Baumgold	146742ba07	Merge pull request #8828 from edx/db/remove-unused-gems ... Remove unused Ruby gems	2015-07-08 16:18:25 -04:00
Will Daly	9056052b09	Fix a small typo for credit requirements on the progress page.	2015-07-08 11:56:43 -07:00
Mushtaq Ali	ab60b110af	Merge pull request #8735 from edx/mushtaq/plat633-delete-case ... Fix 'stuck in publish issue' when deleting a component	2015-07-08 23:07:46 +05:00
Braden MacDonald	d07a2798a1	Merge pull request #8815 from open-craft/hinted-login-fix ... Fix hinted login view to be compatible with secondary providers.	2015-07-08 10:57:08 -07:00
Christopher Lee	ea36fcacea	Merge pull request #8823 from edx/clee/add-better-email-message-in-release-script ... Added more descripted release script message	2015-07-08 14:49:46 -03:00
David Baumgold	ccd602343f	Remove unused Ruby gems ... These were only used by rake, and we haven't used rake in a year.	2015-07-08 13:27:06 -04:00
Ben McMorran	9e5290c1a7	Merge pull request #8822 from edx/benmcmorran/taiwan-fix ... TNL-2665 Prevent Taiwan from being translated	2015-07-08 13:26:17 -04:00
Kyle McCormick	afa77db944	Merge pull request #8642 from edx/mekkz/course-overviews-dashboard ... Update LMS student dashboard to use CourseOverview	2015-07-08 13:06:36 -04:00
Jesse Zoldak	7b33b73a8c	Merge pull request #8824 from edx/zoldak/TNL-1475 ... Disable flaky GroupConfigurationsPage JS test TNL-1475	2015-07-08 12:43:29 -04:00
Ben Patterson	25434a03e0	Merge pull request #8827 from edx/revert-8818-tasawer/story/ecom-1651-on-demand-cert-download ... Revert "Update copy for On Demand Cert Download"	2015-07-08 12:34:57 -04:00
christopher lee	080450d5b2	Added more descripted release script message	2015-07-08 12:19:10 -04:00
Kyle McCormick	1dfe9ed9e8	MA-779 Update student dashboard to use CourseOverview	2015-07-08 12:05:38 -04:00
Kyle McCormick	5b630a7704	MA-779 Make has_access work on CourseOverview objects	2015-07-08 12:05:38 -04:00
Jesse Zoldak	a11275ee0d	Disable flaky GroupConfigurationsPage JS test TNL-1475	2015-07-08 11:48:31 -04:00
tasawernawaz	c64d58f234	Merge pull request #8818 from edx/tasawer/story/ecom-1651-on-demand-cert-download ... Update copy for On Demand Cert Download	2015-07-08 20:18:08 +05:00
Jesse Zoldak	a118fd96c8	Merge pull request #8811 from edx/zoldak/fix-flaky-js-tests ... Fix flaky js tests caused by ajax requests TE-970	2015-07-08 11:16:30 -04:00
Ned Batchelder	658519d011	Merge branch 'master' of github.com:edx/edx-platform	2015-07-08 11:15:00 -04:00
Ned Batchelder	ac6ab5da6e	Fix a pep8 violation	2015-07-08 11:14:50 -04:00
David Ormsbee	a27865abb5	Merge pull request #8647 from mcgachey/lti-view-refactoring ... [LTI Provider] Refactoring to remove the lti_run method	2015-07-08 11:01:04 -04:00
Ned Batchelder	43ba78bad7	Merge pull request #8807 from edx/ned/use-primary-emails ... Make the release script use the primary email from people.yaml	2015-07-08 10:43:00 -04:00
Ben McMorran	6bd5eec18d	TNL-2665 Prevent Taiwan from being translated	2015-07-08 14:12:56 +00:00
Ned Batchelder	b7a90d6c7b	Make the release script use the primary email from people.yaml	2015-07-08 10:08:23 -04:00
Awais Jibran	375341b8a3	Merge pull request #8455 from edx/aj/tnl2165-play-video-emitted-with-wrong-params ... Fixed 'play_video' event which was emitting with wrong params.	2015-07-08 19:00:26 +05:00
Phil McGachey	99fbf4d6b2	[LTI Provider] Refactoring to remove the lti_run method ... This change is a follow-up to the chages in PR 8347, which removed the edX login page from the workflow for a new user. Where previously we redirected a user to the login page, PR 8347 instead creates a new user transparently and logs them in. The initial reason for splitting the LTI view between lti_launch and lti_run was so that there was a target for the GET request that followed the login page. Since we no longer use the login page, we no longer need the second view. We also don't need to store the LTI parameters in the session any more, since they are not persisting between calls. This simplifies the view logic significantly. The other change here is to fetch the LtiConsumer object early in the view, and pass it to the SignatureValidator and scoring system. When the views were split, this required multiple DB hits for the same data; we're now only fetching it once.	2015-07-08 09:45:24 -04:00
Jesse Zoldak	de25880c10	Disable test specs that use old flaky sinon pattern	2015-07-08 09:22:32 -04:00
Ben Patterson	cc7647571c	Revert "Update copy for On Demand Cert Download"	2015-07-08 07:59:39 -04:00
Tasawer	028ddefe4e	Update copy for On Demand Cert Download ... ECOM-1651	2015-07-08 16:01:10 +05:00
Awais Jibran	989091d1ed	TNL-2165 ... "play_video" event emitted after seeking forward in a video contains old position	2015-07-08 12:20:59 +05:00
Aamir	9f0b5ed2cd	Merge pull request #8720 from edx/ECOM-1601-credit-help-link ... ECOM-1601: Added the help link of credit info	2015-07-08 11:55:11 +05:00
Awais Jibran	ef89c662f3	Merge pull request #8742 from edx/aj/tnl2551-randomized-problems-failing ... [NEW] - Fixed randomized problems which were not appearing to work.	2015-07-08 11:49:23 +05:00
chrisndodge	8cde240dd8	Merge pull request #8805 from edx/cdodge/remove-profile-panel ... Remove the DjDT profiling panel from devstack.py. It appears to cause…	2015-07-07 22:38:15 -04:00
Braden MacDonald	f4c8d8fa86	Fix hinted login view to be compatible with secondary providers.	2015-07-07 16:42:12 -07:00
Matt Drayer	dbc470ab22	Merge pull request #8813 from edx/mattdrayer/num-queries-fix ... mattdrayer/num-queries-fix: Update query value to reflect new reality	2015-07-07 17:39:13 -04:00
Matt Drayer	fd7a99db0b	mattdrayer/num-queries-fix: Update query value to reflect new reality	2015-07-07 16:41:15 -04:00
Jesse Zoldak	1e5fe3a3a7	Use the correct sinon request pattern to avoid flaky tests	2015-07-07 16:12:42 -04:00
Chris	bd817bb41e	Merge pull request #8784 from edx/clrux/ux-2337-a11y-calculator-contrast ... Fixing aria values and contrast for accessibility	2015-07-07 16:07:14 -04:00
Jesse Zoldak	c219be5e75	Remove unused references to AjaxHelpers	2015-07-07 16:06:41 -04:00
Matt Drayer	c25e37ea93	Merge pull request #8734 from edx/ziafazal/SOL-1011 ... ziafazal:SOL-1011: Certificate URL should use 'download_url' field and not 'verify_uuid'	2015-07-07 15:40:34 -04:00
Will Daly	897fddba3e	Merge pull request #8804 from edx/merge-release-into-master ... Merge release into master	2015-07-07 12:06:25 -07:00
Chris Dodge	8c6939d521	Remove the DjDT profiling panel from devstack.py. It appears to cause horrendeous performance issues, while offering very little benefit.	2015-07-07 13:58:38 -04:00
Chris Rodriguez	3309581a36	Adding uniqueness to some elements	2015-07-07 13:54:49 -04:00
Will Daly	104bcd5143	Merge remote-tracking branch 'origin/release' into merge-release-into-master ... Conflicts: common/djangoapps/student/views.py openedx/core/djangoapps/credit/tests/test_api.py	2015-07-07 09:58:45 -07:00