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

11612 Commits

Author SHA1 Message Date
Clinton Blackburn
cd60dd5606 Merge pull request #8771 from edx/clintonb/currency-comparison-fix 
Comparing currencies with same case
 2015-07-09 01:45:39 -04:00
Alison Hodges
747c6b7413 Merge pull request #8716 from edx/ahodges/staff_labeling 
Ahodges/staff labeling
 2015-07-08 17:34:29 -04:00
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
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
9056052b09 Fix a small typo for credit requirements on the progress page. 2015-07-08 11:56:43 -07: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
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
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
Ben McMorran
6bd5eec18d TNL-2665 Prevent Taiwan from being translated 2015-07-08 14:12:56 +00:00
Ben Patterson
cc7647571c Revert "Update copy for On Demand Cert Download" 2015-07-08 07:59:39 -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
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
Tasawer
028ddefe4e Update copy for On Demand Cert Download 
ECOM-1651
 2015-07-08 16:01:10 +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
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
fd7a99db0b mattdrayer/num-queries-fix: Update query value to reflect new reality 2015-07-07 16:41:15 -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
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
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
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
Davorin Šego
ad5a98e40a Merge pull request #8282 from Stanford-Online/giulio/default-course-about-images 
Default "Course About" image
 2015-07-07 00:24:54 +02:00
Clinton Blackburn
40282316d0 Creating Zendesk refund notifications via API 
Refund notifications are now created using the Zendesk API. This ensures the correct requester information is set for the ticket, and allows for tagging of tickets.

XCOM-451
 2015-07-06 17:36:14 -04:00
Matt Drayer
a8f909fe77 Merge pull request #8659 from edx/ziafazal/SOL-1006 
ziafazal/SOL-1006: Disable course 'start date' for inactive web-enabled certificates
 2015-07-06 16:45:24 -04:00
utkjad
10a3863832 Enable CallStackManager on StudentModule and StudentModuleHistory to capture any use outside of DjangoXBlockUserStateClient 2015-07-06 18:11:05 +00:00
Chris Rodriguez
45c1f28d5f Fixing aria values and contrast for accessibility 2015-07-06 14:02:18 -04:00
Giulio Gratta
84f7aef917 Default "Course About" image 
Templates that display the image now check if courses specifies an image, if they don't the default image is displayed

Path set in both common.py and aws.py to allow for easy overriding in one place.

Addresses SOL-926

Some code provided by Davorin Sego
 2015-07-06 10:29:12 -07:00
Akiva Leffert
f0b52c698d Merge pull request #8739 from edx/aleffert/remove-chromeless-xblock-border 
Remove border from chromeless xblock
 2015-07-06 11:37:29 -04:00
Davorin Šego
e7f7bdaed9 Merge pull request #8738 from edx/dsego/SOL-734-addendum 
Fixes header styling issue introduced in SOL-734 (#8389) by reverting…
 2015-07-06 16:18:00 +02:00
Frances Botsford
b45b122c18 fixed pagination styles in teams and studio 2015-07-06 08:45:03 -04:00
Daniel Friedman
3b55d88283 Implement paginated Team Topics UI 
Authors:
  - Dan Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Ben McMorran
351e491c82 Add generic paging framework 
Authors:
  - Daniel Friedman
  - Ben McMorran
  - Peter Fogg

TNL-1892
 2015-07-06 08:45:03 -04:00
Usman Khalid
64ff890ff8 Disable ORA 1 tabs in LMS if combinedopeneded is disabled in LMS. 
TNL-2305
 2015-07-03 20:58:42 +05:00
Usman Khalid
fe54b085c6 Added ability to disable xblock types in LMS. 
TNL-2305
 2015-07-03 20:58:40 +05:00
Davorin Šego
83d920ecba Merge pull request #8759 from edx/dsego/SOL-958 
Add feature flag to skip enrollment start date filtering for course s…
 2015-07-03 16:20:21 +02:00
Davorin Sego
7374624b3c Add feature flag to skip enrollment start date filtering for course search 
add flag to lms/envs/common

update edx-search release tag
 2015-07-03 13:24:25 +02:00
zubair-arbi
8934818381 Merge pull request #8753 from edx/zub/bugfix/ecom-1734-change-login-redirect-url 
change redirect url from '/accounts/login' to '/login'
 2015-07-03 16:19:24 +05:00
Matt Drayer
b1e0ceb34f Merge pull request #8634 from edx/asadiqbal08/SOL-766 
asadiqbal08/SOL-766: Share web certificate on Facebook
 2015-07-03 06:47:58 -04:00
Ned Batchelder
514d85c183 Fix other temp dirs that are not cleaned up properly 2015-07-02 19:31:49 -04:00
Ned Batchelder
e6e5a8d812 Convert some try/finally to addCleanup 2015-07-02 19:31:48 -04:00
Ned Batchelder
cb0624bfa1 Correct parent references in one test. 2015-07-02 19:31:48 -04:00