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

42367 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
J. Cliff Dyer
dae7ce4988 Update problem-builder requirement to 2.6.5patch2 to migrate keys. 2017-08-22 07:41:06 -04:00
McKenzie Welter
ff54a771a8 Merge pull request #15838 from edx/McKenzieW/learner-2228 
Track program purchase attempts from learner programs dashboard
 2017-08-21 12:51:18 -04:00
McKenzie Welter
3e4d20e0d4 bundle purchase tracking 2017-08-21 11:22:52 -04:00
Ned Batchelder
eeb70ca3e3 Merge pull request #15856 from edx/nedbat/fix-field-i18n 
XBlock fields with formatted-in values can now translate properly
 2017-08-21 11:19:01 -04:00
Michael Roytman
e8e01a99d5 Merge pull request #15782 from edx/mroytman/PLAT-1612-upgrade-django-babel-underscore 
PLAT-1612: Upgrade edx-platform to use new django-babel-underscore (0.5.2)
 2017-08-21 10:54:42 -04:00
Waheed Ahmed
6c74cf48e4 Merge pull request #15837 from edx/waheed/LEARNER-2110-add-activation-key-var-in-sailthru 
Add activation_key var to user profile in SailThru.
 2017-08-21 11:32:02 +05:00
Ned Batchelder
fee0c41ce0 XBlock fields with formatted-in values can now translate properly 2017-08-19 15:37:12 -04:00
Gregory Martin
e00867ccd4 Merge pull request #15852 from edx/yro/neem_bugbash 
Yro/neem bugbash
 2017-08-19 11:25:09 -04:00
Gregory Martin
147405df76 Update Flag handling 2017-08-19 08:37:21 -04:00
Andy Armstrong
a506486f67 Merge pull request #15855 from edx/andya/bootstrap-update-lang-page-3 
Convert /update_lang/ page to use Bootstrap
 2017-08-18 17:18:05 -04:00
Douglas Hall
93d84396bd Merge pull request #15854 from edx/douglashall/ENT-585 
Upgrading the edx-organizations package to 0.4.6.
 2017-08-18 16:59:47 -04:00
Andy Armstrong
82f7d6ee64 Convert /update_lang/ page to use Bootstrap 
LEARNER-1922
 2017-08-18 16:15:38 -04:00
Douglas Hall
79660788f7 Upgrading the edx-organizations package to 0.4.6. 
This fixes a bug with the organizations API's get_organization function.
 2017-08-18 15:59:57 -04:00
Andy Armstrong
2b4fe140e1 Merge pull request #15850 from edx/andya/fix-features-i18n-part-2 
Allow i18n strings to be scraped from openedx/features
 2017-08-18 15:42:05 -04:00
Andy Armstrong
41f7502ae3 Allow i18n strings to be scraped from openedx/features 
LEARNER-2304
 2017-08-18 14:41:36 -04:00
George Song
98ee25fbab Merge pull request #15587 from open-craft/jill/tpa-hint-setting 
Adds settings.FEATURES['THIRD_PARTY_AUTH_HINT']
 2017-08-18 13:28:18 -04:00
Ayub khan
36e4c801a9 Merge pull request #15848 from edx/LEARNER-1426-Render_Issue 
LEARNER-1426 Fix for dialog rendering
 2017-08-18 19:53:04 +05:00
Waheed Ahmed
33e077d4e2 Add activation_key var to user profile in SailThru. 
As an email marketer, I would like to send an account activation reminder to learners who haven't activated
their accounts to increase their chances of coming back and engaging with our platform. Each user profile in
SailThru will have a var with the correct activation_key originally assigned to the user.

LEARNER-2110
 2017-08-18 19:34:52 +05:00
Michael Roytman
f2c2402068 update to new version of django-babel-underscore, which supports Django 1.8 - Django 1.11 2017-08-18 10:25:44 -04:00
ayub-khan
558490e71b Fix for dialog rendering 2017-08-18 18:10:09 +05:00
Michael Frey
acc208b6d4 Merge pull request #15845 from edx/mjfrey/increase-enrollment-rate 
increase staff user rate limit
 2017-08-17 17:33:54 -04:00
Michael Frey
fb7b98da0b increase staff user rate limit 2017-08-17 16:23:10 -04:00
sanfordstudent
5b34264cbc Merge pull request #15809 from edx/aed/EDUCATOR-527 
EDUCATOR-527 | get_certificates() should take CourseOverview.may_certify() into account
 2017-08-17 16:00:15 -04:00
Jesse Zoldak
f69a3a2d27 Merge pull request #15841 from edx/zoldak/LEARNER-2288 
Remove flaky test CoursewareSearchTest::test_reindex  LEARNER-2288
 2017-08-17 15:21:41 -04:00
Jesse Zoldak
48b115bf79 Merge pull request #15840 from edx/zoldak/EDUCATOR-1178 
Removed flaky test: test_proctored_exam_flow  EDUCATOR-1178
 2017-08-17 15:20:35 -04:00
Jeff LaJoie
1a4d0d6b21 Merge pull request #15842 from edx/jlajoie/EDUCATOR-1135 
EDUCATOR-1135: Adds in additional logging for verified tracks management command
 2017-08-17 13:44:37 -04:00
Simon Chen
442bcae46e Merge pull request #15207 from teltek/teltek/bugfix/cookie-consent-navigation 
Cookie consent page loaded from navigation template instead of footer…
 2017-08-17 13:37:33 -04:00
mrey
e54c83fc8d Fix cookie consent page loaded from navigation template instead of footer template after rebasing master 2017-08-17 17:48:16 +02:00
Jeff LaJoie
6cb73cf7d5 adds in additional logging for management command, shows what's enqueued and what's updated 2017-08-17 11:48:10 -04:00
mrey
86852206bc Cookie consent page loaded from navigation template instead of footer template. 
Following the commit ae9c686912, we can see the cookie consent template was loaded from footer template.
The login and registration templates do not load footer, so the cookie consent template is not being loader either.
With this fix, the cookie consent template is being loaded from navigation template, so it is shown in login and registration pages as well.
 2017-08-17 17:39:48 +02:00
Jesse Zoldak
b50c5f3710 Remove flaky test CoursewareSearchTest::test_reindex 2017-08-17 10:31:11 -04:00
Ayub khan
31292a68f9 Merge pull request #15602 from edx/adeel/LEARNER_1426_lms_dashboard_on_enrollment_and_refund_orders_on_demand_version 
Improve ECOM connection on student dashboard via on demand ajax calls.
 2017-08-17 19:16:22 +05:00
Jesse Zoldak
b2faa181d9 Removed flaky test: test_proctored_exam_flow 2017-08-17 10:15:13 -04:00
Adeel Khan
e966188ba6 Improve ECOM connection on student dashboard via on demand ajax calls. 
Fix course unenroll dialog's incorrect message rendering. LEARNER-2033
 2017-08-17 18:18:04 +05:00
Jillian Vogel
84c6c5ac27 Adds THIRD_PARTY_AUTH_HINT to SiteConfiguration and to site-wide setting.FEATURES 
When provided, this setting appends tpa_hint=<value> to the `next` URL provided for /login and /register page URLs, which bypasses the Open edX Login/Register page with an an automatic redirection to the TPA login/register URL.

This allows the already implemented tpa_hint feature to be automatically added to login, registration, and enrolment URLs generated throughout the platform.

Avoids auto-appending the tpa_hint parameter when the request is already in the TPA pipeline, to prevent infinite redirect loops, and adds tests to verify this behaviour.
 2017-08-17 14:01:00 +09:30
Jesse Shapiro
aaad66d3f8 Merge pull request #15706 from open-craft/haikuginger/new-consent-api 
[ENT-494] Move to new consent API
 2017-08-16 23:57:11 -04:00
Jesse Shapiro
7a31441ebc Move to new consent API 2017-08-16 22:58:09 -04:00
Feanil Patel
b649d5a259 Merge pull request #15830 from edx/jibsheet/remove-unused-settings 
BOOK_URL hasn't been used since the 6.00 courses
 2017-08-16 20:05:09 -04:00
Diana Huang
24d6d377ba Merge pull request #15789 from edx/diana/new-updates-behavior 
Add new latest-update fragment and waffle flag.
 2017-08-16 17:15:49 -04:00
Calen Pennington
e9028ce834 Merge pull request #15819 from edx/clintonb/schedule-indexes 
Added indices to the Schedule model
 2017-08-16 16:50:01 -04:00
Sofiya Semenova
ffd72c1051 Merge pull request #15705 from edx/ssemenova/ed-526 
EDUCATOR-526 Update view certificate button
 2017-08-16 15:52:54 -04:00
Clinton Blackburn
526564c9a4 Added indices to the Schedule model 
These new indices will allow for more efficient querying of schedules.
 2017-08-16 15:32:37 -04:00
Kevin Falcone
c2175423fe BOOK_URL hasn't been used since the 6.00 courses 
RSS_TIMEOUT was removed in e8ee29786f
but missed in lms/envs
 2017-08-16 15:04:02 -04:00
Simon Chen
b8e4814634 Merge pull request #15811 from edx/schen/LEARNER-2222 
Stop audit and honor mode creating basket and order
 2017-08-16 15:03:30 -04:00
Diana Huang
dcf528a597 Add new latest-update fragment and waffle flag. 2017-08-16 13:58:56 -04:00
George Song
e1ad295a0f Merge pull request #15764 from pepeportela/teltek/i18n_certificate_date_utils 
Teltek/i18n certificate date utils
 2017-08-16 13:57:07 -04:00
Harry Rein
66fe1c9ad6 Merge pull request #15812 from edx/HarryRein/LEARNER-2238-profile-tweaks 
Applying styling changes.
 2017-08-16 12:49:05 -04:00
Harry Rein
23640ad20d Minor Styling Fixed for Learner Profile 
LEARNER-2238

- Assure change image only shows on hover
- Better UX for delete image, only shows on hover
- Fixing issue with bottom border when user does not have a country set
- Issues with location of pencil icon in dropdown edit modeApplying styling changes.
 2017-08-16 10:18:45 -04:00
Harry Rein
6f81e38291 Merge pull request #15810 from edx/HarryRein/LEARNER-2249-show-update-banner-to-staff 
Show Enroll Now banner to staff.
 2017-08-16 09:42:33 -04:00
Brian Beggs
f55d79001d Merge pull request #15825 from edx/bbeggs/devstack_forums 
Enable forums for docker devstack
 2017-08-16 09:33:25 -04:00