Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
bmedx
f538aafe98 Upgrade of django-model-utils to 3.0.0 for Django 1.11 support 2017-08-15 11:19:45 -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
Andy Armstrong
0df428fe38 Merge pull request #15808 from edx/andya/fix-xsy-message-logo 
Fix the edx.org theme location for Xsy images
 2017-08-14 16:52:35 -04:00
Albert St. Aubin
790c3e5a07 Added Program UUID to the end of purchase button URL when purchasing a program 
[LEARNER-1721]
 2017-08-14 16:23:15 -04:00
Matthew Piatetsky
28a7a3e6bd Merge pull request #15744 from edx/LEARNER-1510 
LEARNER-1510 Add unenrollment reason survey
 2017-08-14 15:39:26 -04:00
Alex Dusenbery
14fcba4922 EDUCATOR-527 | get_certificates() should take CourseOverview.may_certify() into account. 2017-08-14 14:07:29 -04:00
Andy Armstrong
d75beaf9cd Fix the edx.org theme location for Xsy images 
LEARNER-2217
 2017-08-14 13:42:38 -04:00
Ned Batchelder
c9e8fc371c Merge pull request #15807 from edx/nedbat/translate-two-strings 
Two labels were untranslated, fixed.
 2017-08-14 13:36:13 -04:00
Stu Young
af9b5b5863 Merge pull request #15775 from edx/estute/remove-flaky-decorator 
remove all occurrences of flaky decorator
 2017-08-14 13:26:40 -04:00
Ned Batchelder
6e9ac07710 Merge pull request #15805 from edx/nedbat/update-translations 
Update translations (autogenerated message)
 2017-08-14 12:52:43 -04:00
Ned Batchelder
c75c742b83 Two labels were untranslated, fixed. 2017-08-14 12:03:40 -04:00
Christina Roberts
1e5e822d62 Merge pull request #15776 from edx/christina/slash-the-slash-2 
Remove usages of deprecated SlashSeparatedCourseKey.
 2017-08-14 11:58:31 -04:00
Jeremy Bowman
9e3f35db22 PLAT-1676 Use pytest for bok-choy tests 2017-08-14 11:49:39 -04:00
McKenzie Welter
6413dcc214 Merge pull request #15804 from edx/McKenzieW/discount-data-retrieval-failure 
Make is_discounted False when failing to retrieve discount data
 2017-08-14 11:48:55 -04:00
Ned Batchelder
408d6b5e0c Update translations (autogenerated message) 2017-08-14 11:32:28 -04:00
Brittney Exline
39cb750499 Merge pull request #15796 from open-craft/uman/bump-enterprise-0.40.1 
[ENT-495] Bump edx-enterprise to 0.40.1.
 2017-08-14 11:31:04 -04:00
cahrens
819a56fee3 Remove usages of deprecated SlashSeparatedCourseKey. 2017-08-14 11:01:00 -04:00
McKenzie Welter
f11a4cf589 updated exception handling 2017-08-14 10:59:00 -04:00
Matthew Piatetsky
12bd5b49b5 Add unenrollment reason survey 
LEARNER-1510
 2017-08-14 09:46:56 -04:00
Uman Shahzad
cc3a63415e Add consent application to installed apps. 2017-08-14 10:41:14 +05:00
Uman Shahzad
bfb5531110 Bump edx-enterprise to 0.40.1. 
This adds a new DataSharingConsent model, but it is unused for now.
 2017-08-14 10:40:36 +05:00
Christina Roberts
0aaea6a080 Merge pull request #15801 from edx/christina/educator-1134 
Log courses with improper end dates.
 2017-08-11 17:58:20 -04:00
cahrens
6446f6111e Log courses with improper end dates. 
EDUCATOR-1134
 2017-08-11 14:37:16 -04:00
Tyler Hallada
a9c1e1cf43 Squashed commit of the following: 
commit 12880fa21eac0c2e69b2d832d42829f00484561d
Author: Tyler Hallada <thallada@edx.org>
Date:   Fri Aug 11 11:17:22 2017 -0400

    Tweak exam override messaging in progress.html

commit 6f90352dc27b3a199eea7efaf84b72df50f570a9
Merge: e0e9f83789 7c535f5fb9
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:38:13 2017 -0400

    Merge remote-tracking branch 'origin/master' into EDUCATOR-926

commit e0e9f83789efa837577cedbcd5807c6fdba249e4
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:35:26 2017 -0400

    Revert "Comment out actual override and log instead"

    This reverts commit 4953cf30d9.

commit 27d6b537c8915ecd1af8af51c8f9509db6ea0a26
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:56 2017 -0400

    Revert "Fix tests"

    This reverts commit 1b2fec2129.

commit cabddd504ddcb4f92aeed8b5fec4bff0d64a8de3
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:36 2017 -0400

    Revert "Remove override behavior and log instead"

    This reverts commit 1ab1880337.

commit dc9407f4606804e00d5aee4e80d309c7d7f9c437
Author: Tyler Hallada <thallada@edx.org>
Date:   Thu Aug 10 17:34:15 2017 -0400

    Revert "Fix python tests and use proctoring 1.0.0"

    This reverts commit 842ce8365f.
 2017-08-11 13:53:34 -04:00
edx-pipeline-bot
dc2f808f60 Merge pull request #15797 from edx/release-mergeback-to-master 
Merge release back to master
 2017-08-11 13:20:28 -04:00
Brian Mesick
e14cad4532 Merge pull request #15784 from edx/bmedx/app_label_warnings_PLAT-1642_PLAT-1643 
Reorder INSTALLED_APPS
 2017-08-11 13:10:30 -04:00