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

42347 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Simon Chen
893b7a0060 Stop audit and honor mode creating basket and order 
LEARNER-2222
 2017-08-15 16:08:08 -04:00
Christina Roberts
8e4ae99e8a Merge pull request #15814 from edx/christina/usage-key 
Replace deprecated_string methods.
 2017-08-15 15:12:02 -04:00
Brian Beggs
f451c7602e Enable forums for docker devstack 2017-08-15 15:05:11 -04:00
Jesse Zoldak
7966fb1c30 Merge pull request #15823 from edx/zoldak/LEARNER-2267 
Remove flaky video test test_video_position_save_state  LEARNER-2267
 2017-08-15 14:58:03 -04:00
Sofiya Semenova
76f1df6b0e EDUCATOR-526 Update view cert button to only appear after availability 
date has passed
 2017-08-15 11:57:28 -07:00
cahrens
b26b41b9fc Replace deprecated_string methods. 2017-08-15 14:21:45 -04:00
Matthew Piatetsky
129d298d3a Merge pull request #15824 from edx/revert-15744-LEARNER-1510 
Revert "LEARNER-1510 Add unenrollment reason survey"
 2017-08-15 13:40:29 -04:00
Matthew Piatetsky
441bccf4b6 Revert "LEARNER-1510 Add unenrollment reason survey" 2017-08-15 13:35:15 -04:00
Nimisha Asthagiri
4474b20bfc Merge pull request #15815 from edx/neem/course-overviews-memory 
Prevent high mem usage in generate_course_overview
 2017-08-15 13:24:25 -04:00
Jesse Zoldak
fb66af5cac Merge pull request #15820 from edx/zoldak/LEARNER-2265 
Remove flaky test test_multiple_videos_in_sequentials_load_and_work LEARNER-2265
 2017-08-15 13:15:34 -04:00
Jesse Zoldak
3b853126d8 Remove flaky video test test_video_position_save_state LEARNER-2267 2017-08-15 13:10:16 -04:00
Ned Batchelder
fb068fd705 Merge pull request #15818 from edx/nedbat/git-hashes-only 
Use commit hashes on all non-edX GitHub requirements
 2017-08-15 13:07:35 -04:00
Nimisha Asthagiri
987ef9dc9d Prevent high mem usage in generate_course_overview. 2017-08-15 12:11:41 -04:00
Michael Frey
0205720d46 Merge pull request #15816 from edx/mjfrey/enrollment-throttle 
Increase rate-limit staff or superusers for enrollment API.
 2017-08-15 11:52:00 -04:00
Harry Rein
48d77676c2 Show Enroll Now banner to staff. 
LEARNER-2249

Allow staff to see the Enroll Now banner, matching the functionality of
the in course home messaging and showing the actual page that the
students can see before being enrolled.
 2017-08-15 11:13:35 -04:00
Jesse Zoldak
6d94796a2c Remove flaky test test_multiple_videos_in_sequentials_load_and_work 2017-08-15 11:00:00 -04:00
Ned Batchelder
775393a194 Use commit hashes on all non-edX GitHub requirements 2017-08-15 10:28:53 -04:00
Michael Frey
e35b35f6c2 Increase rate-limit staff or superusers for enrollment API. 2017-08-15 10:21:30 -04:00
McKenzie Welter
aae392a5b4 Merge pull request #15786 from edx/McKenzieW/learner-1721 
Send program UUID to ecommerce for program purchase tracking
 2017-08-15 09:16:08 -04:00
Jeremy Bowman
5e2742027b Merge pull request #15712 from edx/jmbowman/PLAT-1676 
PLAT-1676 Use pytest for bok-choy tests
 2017-08-14 17:03:20 -04:00