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

3623 Commits

Author SHA1 Message Date
Alex Dusenbery
b33a9436d6 TNL-6832 | Include inactive enrollees in course and problem grade reports. 2017-05-11 13:10:38 -04:00
Nimisha Asthagiri
adb88e21f3 Bulk-reads and Request caching in Course Grade Report 
This reverts commit 5388d5d1fc.
 2017-05-10 17:14:29 -04:00
edx-pipeline-bot
544d5d5996 Merge pull request #15085 from edx/release-mergeback-to-master 
Merge release back to master
 2017-05-10 15:19:09 -04:00
Douglas Hall
665ec6c475 Allow override of initial account activation from address. 
In PR #15030, we missed adding the override of the initial account activation from address using the ACTIVATION_EMAIL_FROM_ADDRESS SiteConfiguration setting. We had only added the override when a subsequent activation email was sent.

ENT-318
 2017-05-10 13:44:19 -04:00
Sanford Student
5388d5d1fc Revert "Bulk-reads and Request caching in Course Grade Report" 
This reverts commit 16e9636513.
 2017-05-09 16:25:46 -04:00
Douglas Hall
0a313da601 Remove edx.org theme override of activation email body. 
We have standardized the activation email in the base activation email body template, so we do not need this override any longer.

ENT-318
 2017-05-09 15:46:10 -04:00
Nimisha Asthagiri
3491837e9c Merge pull request #15036 from edx/neem/bulk-read-grade-report 
Bulk-reads and Request caching in Course Grade Report
 2017-05-09 10:53:01 -04:00
Nimisha Asthagiri
16e9636513 Bulk-reads and Request caching in Course Grade Report 2017-05-09 08:58:49 -04:00
Matt Drayer
5e94c63da6 mattdrayer/ENT-318: Update activation email subject and message text 2017-05-06 00:16:43 -04:00
Brandon DeRosier
3d51bd0817 Merge pull request #15022 from open-craft/bdero/ent-361 
ENT-361: Allow hiding of IDP selection page during SSO
 2017-05-05 15:10:35 -04:00
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
Brandon DeRosier
123584e5af ENT-361: Allow hiding of IDP selection page during SSO 
Closes ENT-361.
 2017-05-03 03:39:48 -04: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