Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
41,069 Commits 1 Branch 0 Tags
08dcbace0f9fbeecb4da46fb5d2b4d006ff93e4e
Commit Graph

3612 Commits

Author SHA1 Message Date
Diana Huang
e12a704cea Add new course dates fragment. 
Also add it to the course home page.
 2017-05-04 20:53:42 -04:00
Andy Armstrong
97c084514f Merge pull request #15044 from edx/bjacobel/mako-bundle-nonfatal 
Mako should be able to render even if webpack hasn't run
 2017-05-04 17:55:40 -04:00
Brian Jacobel
69dd20ffed Mako should be able to render even if webpack hasn't run 2017-05-04 12:56:21 -04:00
Matt Drayer
5097bd6e54 mattdrayer/ENT-328: Update account activation message on sign-in form. 2017-05-04 10:58:42 -04:00
Muzaffar yousaf
2f293ccc68 Merge pull request #14901 from OmarIthawi/omar/commentable-id-unicode 
Unicode fixes for django_comment_client and request_cached decorator
 2017-05-04 15:07:22 +05:00
Ned Batchelder
6be4337c7d Merge pull request #14898 from edx/nedbat/help-tokens-app 
Use a new external app for help tokens
 2017-05-03 18:08:27 -04:00
asadiqbal
47cdf39266 ENT-342 2017-05-03 15:03:34 +05:00
Andy Armstrong
2167584e5e Unify the home and course tabs 
LEARNER-609
 2017-05-01 17:22:28 -04:00
Brian Jacobel
57e8250619 Webpack in LMS 2017-05-01 17:09:32 -04:00
Calen Pennington
3deb3a3c1b Merge pull request #14977 from cpennington/cale/fix-learner-542 
Cale/fix learner 542
 2017-05-01 12:18:03 -04:00
Ned Batchelder
ecce0f1513 Merge pull request #14996 from edx/nedbat/remove-useless-super-delegation 
Remove a number of unneeded super()-delegation methods
 2017-04-28 13:04:43 -04:00
Qubad786
4b73bac9b2 Enable sharing icons for future courses 2017-04-28 15:45:24 +05:00
Ned Batchelder
4a568476fd Remove a number of unneeded super()-delegation methods 2017-04-27 14:12:56 -04:00
Uzair Rasheed
c1e63cb086 Merge pull request #14935 from edx/uzairr/ECOM-7252-refund 
ECOM-7252-fix refund discrepancy after the course mode expiry
 2017-04-27 20:58:21 +05:00
Ned Batchelder
2f1936ce73 Replace context processor with new help-tokens app 
This makes it possible to refer to multiple book from a single app.

This also means that Open edX branches will be able to pass bok-choy
tests (at least if the books have already been built.)
 2017-04-27 10:34:09 -04:00
Calen Pennington
33fee20c3a Reapply "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 65f13ddec4.
 2017-04-27 09:25:02 -04:00
edx-pipeline-bot
38c0fbd638 Merge pull request #14975 from edx/release-mergeback-to-master 
Merge release back to master
 2017-04-26 15:29:32 -04:00
uzairr
d5064413c1 fix of refund after course mode expiry 2017-04-26 18:29:59 +00:00
Calen Pennington
65f13ddec4 Revert "Merge pull request #14868 from cpennington/learner-542" 
This reverts commit 88dd85caec, reversing
changes made to bf8aef33fc.
 2017-04-26 11:29:56 -04:00
M. Rehan
19961dc750 Merge pull request #14918 from edx/mrehan/course-sharing-utm-parameters 
Add utm parameters to course sharing url
 2017-04-26 13:00:56 +05:00
Calen Pennington
88dd85caec Merge pull request #14868 from cpennington/learner-542 
Store Learner language preferences into a cookie rather than the session
 2017-04-25 14:08:13 -04:00
Qubad786
c28d7cd5f9 Add utm parameters to course sharing url 2017-04-24 23:01:21 +05:00
Calen Pennington
e733179d49 Store Learner language preferences into a cookie rather than the session 
This modifies the lang-pref django app to:
a) Use the current value of the 'edx-language-preference' cookie to set the
   users Accept-Language header on an incoming request.
b) At the end of the request, update the 'edx-language-preference' cookie
   to reflect the users current Language Preference choice, if any.

[LEARNER-542]
 2017-04-24 07:37:19 -04:00
Saleem Latif
0361b50286 Change Account Activation UI on Dashboard 2017-04-24 10:22:35 +05:00
Asad Iqbal
7493c11ec2 Merge pull request #14890 from edx/asadiqbal08/ENT-188 
ENT-188 Enterprise Learner support requests from LMS to Zendesk queue
 2017-04-21 17:22:42 +05:00
asadiqbal
8cea65b2d7 ENT-188 2017-04-21 16:30:23 +05:00
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
Omar Al-Ithawi
0a75f8ece0 Unicode support for request_cached decorator and commentable_id 2017-04-18 11:12:52 +03: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