Commit Graph

1043 Commits

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
Matt Drayer
b0c1e962c7 rc/2015-07-08-mattdrayer: Hide button behind feature flag 2015-07-08 16:55:38 -04:00
Ben McMorran
6bd5eec18d TNL-2665 Prevent Taiwan from being translated 2015-07-08 14:12:56 +00: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
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
aamir-khan
935da3a12c ECOM-1601: Added the help link of credit info 2015-07-07 09:58:48 +00: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
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
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
asadiqbal
57d5de5d14 asadiqbal08/SOL-766: Add Facebook sharing to certificate view
* updated the flags for social media sharing
* added facebook feed ui to share public url
* update the condition logic
* update the code as per suggestion and added pick new style for share buttons
* update the css class reference
* update the bok-choy test
* updated description and some text touch-ups
* moved the JS related to facebook into separate location
* js formatting
* Add trailing comma per chrisndodge
* Add wait to fix flaky test...maybe
2015-07-02 18:52:15 -04:00
Brandon DeRosier
85b3bfe4f6 Add feature flag for Import/Export API in LMS
This feature flag gates the exposure of the Full course/library
Import/Export API URLs in the LMS. This allows openedX deployments
that operate without Studio to take advantage of the API, while
others may turn the feature off to reserve all content authoring for
Studio.
2015-07-02 15:32:00 -04:00
Brandon DeRosier
c94abd2705 edX Course/Library Import/Export API
This is a public, versioned, RESTful API for importing and
exporting full course content. The code was initially ripped from the
existing import/export API in the CMS contentstore djangoapp and wrapped
in Django Rest Framework view classes. It's a new djangoapp in
the openedx directory which is largely an abstraction off the CMS
Import/Export views.

This PR includes configuration changes. Most notably, Studio is
configured to serve the OAuth2 provider alongside the LMS.

This is the initial thread on the code list:
https://groups.google.com/forum/#!msg/edx-code/DmnHWmly25A/ZqjD1zb4o7oJ

And this thread contains another description of the changes:
https://groups.google.com/d/msg/edx-code/6dP9SEKsmqQ/Pvyn8fBDx68J

There are a numerous non-covered lines, all of which are missing
coverage in the CMS API this was ported from. They're mostly error
conditions, such as handling of multipart file upload errors.
2015-07-02 15:32:00 -04:00
zubair-arbi
e369939b4b change redirect url from '/accounts/login' to '/login'
ECOM-1734
2015-07-02 18:44:10 +05:00
Zia Fazal
ad1f4951fc get_certificate_url should return certificate download_url in case of non html certificates 2015-07-01 16:14:37 +05:00
cahrens
a4da143ca6 Delete unused student_profile code (WIP profile). 2015-06-29 08:56:11 -04:00
Braden MacDonald
072ae99d12 Merge pull request #8140 from edx/feature/shibboleth-tpa
Feature: Shibboleth/SAML SSO
2015-06-26 14:17:24 -07:00
David Ormsbee
936256715d Merge pull request #8620 from mcgachey/lti-deployment
[LTI Provider] Added an authentication backend to log in LTI users
2015-06-26 17:16:52 -04:00
Braden MacDonald
cf308d87b9 New Hinted Login View - PR 8591 2015-06-26 13:24:01 -07:00
Braden MacDonald
7437bcfe12 New provider config options, New Institution Login Menu - PR 8603 2015-06-26 13:24:01 -07:00
Braden MacDonald
b4904adc1e Use ConfigurationModels for third_party_auth, new metadata fetching - PR 8155 2015-06-26 13:23:59 -07:00
Phil McGachey
18734cf0a1 [LTI Provider] Added an authentication backend to log in LTI users
This change adds a Django authentication backend which, when installed
will authenticate users based on their LTI identity rather than using
a username/password combination. The authentication method determines
first whether a user with the given username exists and, if so, whether
that user is associated with an LTI identity. It also verifies that
the LTI consumer and user ID passed to the LTI launch match those
stored in the LtiUser table. This will always be the case if the
authentication backend is reached through the LTI code, but it
provides an extra guarantee if the backend is called from elsewhere.
2015-06-26 13:25:13 -04:00
Sarina Canelake
91a7df8832 Replace deprecated 'django_language' key with LANGUAGE_SESSION_KEY
LOC-87
2015-06-26 13:15:43 -04:00
Sarina Canelake
df0c56dde3 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-26 13:15:40 -04:00
Will Daly
754eb9af18 Merge pull request #8655 from edx/will/more-login-cookie-info
User info cookie
2015-06-26 07:34:07 -07:00
Nimisha Asthagiri
8b5e5c5910 Merge branch 'release' 2015-06-25 13:11:41 -04:00
Christina Roberts
5b91a97e4e Merge pull request #8654 from edx/christina/delete-dead-lms-code
Delete LMS JS files that have no references to them.
2015-06-24 16:04:45 -04:00
Will Daly
5e86a64729 User info cookie
* Add a new cookie for user information
* Make marketing cookie names configurable.
* Handle URL reversal when URLs don't exist (in Studio)
* Move cookie code from student/helpers.py into its own module.
2015-06-24 09:44:50 -07:00
aamir-khan
987889fc37 ECOM-1524: Display credit availability on the dashboard 2015-06-24 16:50:38 +05:00
cahrens
ead3cefa5f Remove unused setting. 2015-06-23 16:36:25 -04:00
Kyle McCormick
1726c136fa MA-772 create app course_overviews for caching course metadata 2015-06-22 18:33:12 -04:00
Sarina Canelake
e7cbcfff20 Merge pull request #8618 from edx/sarina/revert-8402
Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
2015-06-22 16:05:49 -04:00
Matt Drayer
f0f3766443 mattdrayer/ECOM-1773: Fixed invalid URL reversal 2015-06-22 14:04:43 -04:00
Sarina Canelake
1e21945e22 Revert "Merge pull request #8402 from edx/sarina/annotate-middleware"
This reverts commit 09425c3d8f, reversing
changes made to 410b9282af.
2015-06-22 13:55:53 -04:00
Will Daly
8c52c92bcb Reverification iOS support and refactor
* Delete reverification templates
* Delete photocapture.js
* Delete unused "name change" end-points
* Rebuild the reverification views using Backbone sub-views
* Stop passing template names to the JavaScript code
* Avoid hard-coding the parent view ID in the webcam view (for getting the capture click sound URL)
2015-06-22 08:45:12 -07:00
Ahsan Ulhaq
6fdff766bc Credit eligibility requirements display on student progress page
ECOM-1523
2015-06-22 18:36:54 +05:00
Braden MacDonald
345fcabd05 Fix CRI-9 so third_party_auth pipeline always completes, and consolidate auto-enrollment code 2015-06-18 20:57:19 -07:00
Dino Cikatic
af7521b240 SOL-994 fix js loading if search features disabled 2015-06-17 14:53:45 +02:00
Matt Drayer
c3b78ea90a Merge pull request #8448 from edx/ziafazal/SOL-886
certificates event tracking SOL-886
2015-06-15 15:09:35 -04:00
Andy Armstrong
c28003b50d Merge pull request #8416 from edx/andya/common-list-component
Create a common paginated list view
2015-06-15 14:55:20 -04:00
Andy Armstrong
1689004189 Create a common paginated list view
TNL-2384

Refactored Studio's PagingView to use RequireJS Text and moved it
to common so that it can also be used by LMS.
2015-06-15 13:51:09 -04:00
Will Daly
2175b5baa4 Merge pull request #8509 from edx/will/deprecate-course-about-v0
Deprecate course details API v0
2015-06-15 13:14:32 -04:00
Zia Fazal
6afaa3cce3 certificates event tracking
some optimisations

refactored code and added created event

added test to make sure generate event is emitted

changes based on feedback on 6/11

added certificate web page and tests

fixed quality violations
2015-06-15 19:53:47 +05:00
Sarina Canelake
d312d0e152 Port django.middleware.locale.LocaleMiddleware from Django 1.8 2015-06-12 18:14:24 -04:00
Will Daly
c31a510607 Deprecate course details API v0 2015-06-12 15:59:20 -04:00
Will Daly
7a3c1f04dd Merge pull request #8502 from edx/alasdair/ECOM-1724-footer-a11y-update
ECOM-1724 a11y footer updates
2015-06-12 13:22:11 -04:00
Will Daly
2fd68dc983 ECOM-1724 a11y footer updates
* Add action text to social media links.
* Make the alt text for mobile links more descriptive.
2015-06-12 11:34:39 -04:00