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

3585 Commits

Author SHA1 Message Date
Ivan Ivic
b682c43d48 Update Order History page to reflect bundled purchase 
LEARNER-381
 2017-04-20 12:24:34 +00:00
sanfordstudent
bd2025d60d Merge pull request #14912 from edx/sstudent/TNL-6833 
use higher of two available grades
 2017-04-19 14:27:51 -04:00
Jesse Shapiro
3f05d2e64d Merge pull request #14900 from open-craft/haikuginger/sso-provider-session-expiry 
[ENT-327] Allow per-SSO-provider session expiration limits
 2017-04-19 13:52:41 -04:00
Sanford Student
a1a8023b4e use higher of two available grades for TNL-6833 2017-04-19 11:39:55 -04:00
Brandon DeRosier
bed65b2a91 Merge pull request #14904 from open-craft/bdero/ent-320 
ENT-320: Fix OAuth2ProviderConfig to be keyed by `provider_slug`
 2017-04-18 14:05:30 -04:00
Brandon DeRosier
d8e1b917ef ENT-320: Fix OAuth2ProviderConfig to be keyed by provider_slug 
This change fixes a bug where OAuth2 Provider Configs only show
up on logistration if the provider's `provider_slug` matches a
valid OAuth2 backend name.

Closes ENT-320.
 2017-04-18 09:21:04 -04:00
Jesse Shapiro
ee9f632a3d Allow per-SSO-provider session expiration limits 2017-04-18 09:07:53 -04:00
Jesse Shapiro
3f6e690827 When visiting track selection page with a TPA hint, logout the existing session 2017-04-17 23:09:01 -04:00
Brittney Exline
72b049bf9d ENT-325 Create a LogoutView that can redirect to a specified target 2017-04-16 17:11:24 +00:00
Ahsan Ulhaq
da9d7b2e89 Merge pull request #14796 from edx/ahsan/ECOM-4776-Account-settings-page-load-and-create-user-profile 
Account settings page should load and create student user profile
 2017-04-14 14:43:09 +05:00
Diana Huang
9e734442c2 Initial version of new transformer. 2017-04-13 14:38:13 -04:00
Ahsan Ulhaq
04ca94eaef Account settings page should load and create student user profile 
ECOM-4776
 2017-04-13 11:47:38 +05:00
Douglas Hall
9bb4ca5525 Fix bulk_change_enrollment command bug 
When using the `org` option with the bulk_change_enrollment command,
the command should not exit if it encounters a course which does not
have the given `to_mode`.

WL-1033
 2017-04-12 07:35:17 -04:00
Nimisha Asthagiri
1503e5f768 Grade only engaged learners 
Add a new waffle switch that allows us to assume zero grades for
learners who have no entry previously recorded, and another to
disable persisting grades for unengaged learners.

TNL-6691
 2017-04-11 10:41:57 -04:00
Jesse Shapiro
da3867e870 Enable direct calls to SAP SuccessFactors OData API to fetch user data during SSO process 2017-04-06 10:31:01 -04:00
Carol Tong
b7c4507055 Merge pull request #14812 from edx/carol/HelpLinkFixes 
Fix broken LMS Help Links
 2017-04-04 11:30:55 -04:00
Carol Tong
8ee34ab3ba Fix broken LMS Help Links 2017-04-04 09:22:03 -04:00
Afzal Wali
0c3e6b6e5e WL-1016 | Added org argument for bulk_change_enrollment management command. 2017-04-04 16:25:07 +05:00
Matt Drayer
b64503848c Add SAML metadata refresh control flag 
mattdrayer: Change model fieldname, revise code, fix bad tests.
 2017-04-02 16:47:20 -04:00
Andy Armstrong
0325425c8c Add data sharing consent redirect for more course tabs 
LEARNER-394
 2017-03-31 19:12:13 -04:00
Robert Raposa
77f111b2b1 Moves and rename common/djangoapps/newrelic_custom_metrics. 2017-03-31 15:19:53 -04:00
asadiqbal
ed33d3b09f ENT-287 Track Selection: Enterprise messaging only for catalog courses 2017-03-31 16:54:16 +05:00
Matt Drayer
e2610a31fb Enroll learner in Audit track on postback 2017-03-30 14:29:31 -04:00
cahrens
e5035746bf Introduce EnrollmentTrackUserPartition. 
TNL-6674
 2017-03-30 12:24:48 -04:00
Nimisha Asthagiri
b1b950c6e6 Merge pull request #14770 from edx/neem/waffle-utils 
Waffle Switch with namespacing and request caching
 2017-03-28 20:07:50 -04:00
Nimisha Asthagiri
4ac78706a3 Waffle Switch with namespacing and request caching 2017-03-28 17:49:20 -04:00
Jesse Shapiro
1106746fd4 Add consent declined banner to dashboard 2017-03-23 16:44:24 -04:00
Ned Batchelder
f7b08b16fc Adapt the tests to openedx.core.release.doc_version() 2017-03-22 12:25:46 -04:00
Ned Batchelder
60221dcc13 Get the doc version from openedx.core.release, instead of an ini file 2017-03-22 12:25:46 -04:00
Asad Iqbal
557b4edd80 Merge pull request #14711 from edx/asadiqbal08/ENT-251 
ENT-251 Updated track selection UI for Enterprise context
 2017-03-22 18:42:30 +05:00
asadiqbal
bfde6d63c5 ENT-251 Updated track selection UI for Enterprise context 2017-03-22 17:32:58 +05:00
Hasnain Naveed
2105213c5a Merge pull request #14740 from edx/hasnain-naveed/WL-1011 
WL-1011 | Added SiteConfiguration flag 'ENABLE_DONATIONS' to enable t…
 2017-03-22 14:59:09 +05:00
Hasnain
5e5f4f7360 WL-1011 | Added SiteConfiguration flag 'ENABLE_DONATIONS' to enable the donation message. 2017-03-22 12:38:16 +05:00
Joel Barciauskas
6a55ef7920 Merge pull request #14633 from edx/jbarciauskas/remove-newrelic-dep 
Wrap all newrelic dependencies in a check to see if the module is loaded
 2017-03-21 16:28:24 -04:00
muhammad-ammar
3461a6983e video stub server changes for hls 
TNL-6543
 2017-03-20 18:06:25 +05:00
Ned Batchelder
5e5f0c170e The exact version differs by open edx release 
(cherry picked from commit 1c7f35d44a68010f3dd9110061e9ecc55a641043)
 2017-03-13 14:13:55 -04:00
Ned Batchelder
fa5e286236 Simplify HelpContextProcessorTest a little 
(cherry picked from commit acee7b55aff0c73c08552199c536d84555bcaae4)
 2017-03-13 13:21:46 -04:00
Clinton Blackburn
4cc7628696 Upgraded to Python Social Auth 0.2.21 to resolve migration issue 2017-03-10 23:06:02 -05:00
Joel Barciauskas
630985b3cc Wrap all newrelic dependencies in a check to see if the module is loaded 2017-03-10 12:22:08 -05:00
Jillian Vogel
25383a603e Ensure Enterprise-integrated courses require user consent before granting access to Wiki and Discussion forum. 
* User-facing links are gated; internal services are not.
* Adds view decorator data_sharing_consent_required
* Renames `get_course_specific_consent_url` to `get_enterprise_consent_url`,
  which now checks `consent_needed_for_course` before returning a consent URL.
 2017-03-10 09:29:24 +10:30
Noraiz Anwar
b69b586401 Merge pull request #14601 from edx/noraiz/ECOM-6939 
ECOM-6939 Fixed social auth false password-validation error
 2017-03-08 22:15:46 +05:00
noraiz-anwar
1c0ccb2f61 ECOM-6939 Fixed social auth false password-validation error (adding form field) 2017-03-08 20:16:21 +05:00
Ahsan Ulhaq
7712bf3151 edx.org/login?next= should not be able to point to an asset 
ECOM-6463
 2017-03-07 22:17:50 +05:00
M. Rehan
f90470a59e Merge pull request #14510 from edx/mrehan/mgmt-cmd-sync-mktg-urls 
MA-3050 – Sync course runs from Catalog service
 2017-03-06 23:21:23 +05:00
Ayub khan
b42089b0dd Revert "added log for refund cutoff date" 2017-03-06 20:50:05 +05:00
Qubad786
7c1f6ff2c0 Mgmt. Command to Sync Marketing Urls from Catalog service 
Introduces a mgmt. command that retrieves course runs from catalog service in order to update marketing urls for the courses found in course metadata cache (i.e. CourseOverview). This also provides an updated utility to retrieve course sharing url.
 2017-03-06 20:12:31 +05:00
mikedikan
dca22ff229 Merge pull request #14613 from edx/mdikan/remove-deprecated-references-to-apiconfig 
Remove deprecated references to ProgramsApiConfig model
 2017-03-03 07:42:21 -05:00
Asad Azam
3102b2dd80 added log for refund cutoff date 2017-03-03 15:05:51 +05:00
Ahsan Ulhaq
2d1bb9bf7f Hidden html sontent on the dashboard are rendered 
ECOM-6977
 2017-03-03 13:17:31 +05:00
Mike Dikan
ca64946b99 Remove deprecated references to ProgramsApiConfig model 
ECOM-7195

The (now deprecated) programs service had several fields to set up configuration of the API.  We are removing the property/field references in codeas the first part of deprecating the model fields.  Also being removed are the model properties.
 2017-03-02 18:07:23 -05:00