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

33604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
zubair-arbi
ab74f64e85 update credit eligibility ui text 
ECOM-1648
 2015-07-08 20:13:42 +05: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
christopher lee
1058c36d94 Merge branch 'rc/2015-07-08' into release 2015-07-08 10:50:18 -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
zubair-arbi
66e18eda56 add 'fulfillment_instructions' for 'CreditProvider' model + add api method to get credit provider data 
ECOM-1815
 2015-07-08 15:12:36 +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
Brandon DeRosier
58c7f43f61 Fix the Paver run_all_servers method. 
This command was broken by 85814f0b because multi-character short
options were introduced with `--asset_settings_lms` and
`--asset_settings_cms`.
 2015-07-07 23:08:29 -04: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
Sarina Canelake
0abc27eed8 Merge pull request #8814 from mitocw/bdero/revert-import-export 
Revert Import/Export changes
 2015-07-07 17:50:18 -04: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
Brandon DeRosier
ae6baf2ac3 Revert "edX Course/Library Import/Export API" 
This reverts commit c94abd2705.
 2015-07-07 16:53:35 -04:00
Brandon DeRosier
b4e8ab9084 Revert "Add feature flag for Import/Export API in LMS" 
This reverts commit 85b3bfe4f6.
 2015-07-07 16:51:49 -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
Will Daly
0158ebca1f Merge pull request #8810 from edx/cherrypick-hotfix-2015-07-07-to-rc 
Cherrypick hotfix-2015-07-07 into release candidate
 2015-07-07 13:05:14 -07:00
Will Daly
bd5c045102 Merge pull request #8801 from edx/awais786/ECOM-1829-regen-cert-link-bug 
ECOM-1829 Removing the regen link.
 2015-07-07 12:42:56 -07: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
Matt Drayer
a31ae128ff Merge pull request #8808 from edx/rc/2015-07-08-mattdrayer 
rc/2015-07-08-mattdrayer: Hide button behind feature flag
 2015-07-07 15:38:59 -04:00
Will Daly
407e7f432c 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-07 12:10:25 -07: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
Matt Drayer
ba7422da87 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-07 14:27:14 -04: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
mushtaqali
2ca9d4d070 Fix 'stuck in publish issue' when deleting an item after dicarding the changes 2015-07-07 21:52:39 +05:00
Clinton Blackburn
f9ce8264ed Merge pull request #8803 from edx/clintonb/commerce-api-fix 
Corrected path to Commerce API
 2015-07-07 12:32:44 -04:00
Will Daly
dab96c5243 Merge pull request #8791 from edx/hotfix/2015-07-06 
Feature flag credit provider messaging on the dashboard.
 2015-07-07 08:52:41 -07:00
Clinton Blackburn
5d356d29bd Corrected path to Commerce API 
XCOM-312
 2015-07-07 11:47:45 -04:00
Sarina Canelake
e9756a9bc7 Merge pull request #8799 from edx/revert-8722-utkjad/injecting_callstackmanager 
Revert "Adding entries of Call Stack Manager in StudentModule and Stu…
 2015-07-07 11:21:19 -04:00
Awais
cc5d972c7d ECOM-1829 Removing the regen link. 2015-07-07 19:53:53 +05:00
Christine Lytwynec
7af1a44d73 Merge pull request #8792 from edx/clytwynec/flaky-test 
flag test as flaky
 2015-07-07 10:08:25 -04:00
Daniel Friedman
c689cc40e0 Merge pull request #8766 from edx/dan-f/update-test-docs-common-requirejs 
Update docs for testing common requirejs tests
 2015-07-07 09:37:15 -04:00
Marko Jevtić
1c161ffc5f Merge pull request #8793 from edx/mjevtic/env-devstack-fix 
Fixed misordered settings for devstack environment
 2015-07-07 15:14:24 +02:00
Marko Jevtic
d09bfa5e99 Fixed misordered settings for devstack environment 2015-07-07 12:01:12 +02:00
aamir-khan
935da3a12c ECOM-1601: Added the help link of credit info 2015-07-07 09:58:48 +00:00
Sarina Canelake
b26f2af585 Revert "Adding entries of Call Stack Manager in StudentModule and StudentModuleHistory" 2015-07-07 05:45:23 -04:00
Clinton Blackburn
301a874c5c Enforcing lowercase currency for CourseMode 
- CourseMode.save() always lowercases the currency value
- CourseMode currency comparisons have been updated to be case-insensitive
 2015-07-06 23:38:25 -04:00
Clinton Blackburn
96ee90d567 Merge pull request #8772 from edx/clintonb/refund-notification 
Creating Zendesk refund notifications via API
 2015-07-06 20:26:01 -04:00