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

41915 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
dfca1fa2fa Merge pull request #15574 from edx/jmbowman/PLAT-1619 
PLAT-1619 karma and bok-choy Docker Devstack fixes
 2017-07-18 15:04:02 -04:00
Eric Fischer
da931349d5 Merge pull request #15595 from edx/dahlia/EDU-949 
Skip flaky proctoring tests until we can fix them
 2017-07-18 14:39:14 -04:00
sanfordstudent
07ad189b9d Merge pull request #15263 from edx/sstudent/grade-override 
Learner grade override
 2017-07-18 14:33:27 -04:00
Andy Armstrong
0bff61533d Merge pull request #15585 from edx/andya/learner-profile-as-feature 
[WIP] Refactor learner profile into openedx/features directory
 2017-07-18 14:24:44 -04:00
Sanford Student
932776159c EDUCATOR-165 instructor task and UI for overriding learner grades. 2017-07-18 13:51:56 -04:00
Eric Fischer
03896448ce Skip flaky tests until we can fix them 2017-07-18 12:40:37 -04:00
Andy Armstrong
33bee3f70b Refactor learner profile into openedx/features directory 
LEARNER-1855
 2017-07-18 12:30:12 -04:00
Brittney Exline
583719cce1 Merge pull request #15579 from open-craft/bdero/bulk-enroll 
Fix the BulkEnrollSerializer courses field to internally behave with strings and lists
 2017-07-18 11:32:08 -04:00
Brittney Exline
b4c2b56109 Merge pull request #15583 from edx/bexline/revert_ent_457 
ENT-512 Revert ENT-457 to avoid production error noise
 2017-07-18 10:05:23 -04:00
Andy Armstrong
d58f2ac2db Merge pull request #15580 from edx/andya/course-home-messaging 
Show page banner for anonymous and unenrolled users
 2017-07-17 23:58:47 -04:00
Andy Armstrong
3e786ec6c5 Show page banner for anonymous and unenrolled users 
LEARNER-1697
 2017-07-17 22:19:40 -04:00
Ari Rizzitano
4370142a84 Merge pull request #15581 from edx/ari/flaky-problem-type-test 
mark test_problem_type_a11y as flaky
 2017-07-17 15:01:54 -04:00
Jesse Shapiro
0e8e3ad6a5 Merge pull request #15582 from open-craft/haikuginger/bump-enterprise-0.38.3 
Update Enterprise to 0.38.3 to fix dependency issues
 2017-07-17 14:57:09 -04:00
Brittney Exline
8c362d4df6 Revert "Create EnterpriseCourseEnrollment when enrolling via Track Selection page" 
This reverts commit d940bbfd09.
 2017-07-17 14:11:24 -04:00
Brittney Exline
6c761ce8aa Revert "Specify catalog URL to configure" 
This reverts commit add01fdfab.
 2017-07-17 14:11:24 -04:00
Jesse Shapiro
30df7c693f Update Enterprise to 0.38.3 to fix dependency issues 2017-07-17 14:01:08 -04:00
John Eskew
0365712b96 Merge pull request #15584 from edx/jeskew/fix_drf_upgrade_incompat 
Remove request.POST save - incompatible with DRF v3.6.3.
 2017-07-17 13:54:06 -04:00
Douglas Hall
33b1e7ca1b Merge pull request #15564 from edx/tuchfarber/wl-1109_zendesk 
Fix WL sites from causing multiple zendesk emails
 2017-07-17 13:40:50 -04:00
Andy Armstrong
31039ab504 Merge pull request #15570 from edx/andya/page-banners 
Add support for page banner status messages
 2017-07-17 13:16:52 -04:00
John Eskew
d003765047 Remove request.POST save - incompatible with DRF v3.6.3. 2017-07-17 13:05:39 -04:00
Matt Tuchfarber
4813df02a3 Fix WL sites from causing multiple zendesk emails 
WL-1109. Currently the system is using org filters to tag zendesk
tickets. MITxPro uses both MITxPro and MITProfessionalX org filters
to pull courses from both orgs. This is causing multiple emails to
be sent from Zendesk as they are getting tagged with both
whitelabel_MITProfessionalX and whitelabel_MITxPRO. This fix changes
to using SITE_NAME instead.
 2017-07-17 12:47:23 -04:00
Andy Armstrong
a077a5e364 Add support for page banner status messages 
LEARNER-1890
 2017-07-17 12:17:32 -04:00
Ari Rizzitano
a16f0b2fe0 test_problem_type_a11y is flaky 2017-07-17 11:39:27 -04:00
John Eskew
febf2a07ae Merge pull request #15373 from edx/jeskew/drf_upgrade_django_1.11 
Bump DRF version to 3.6.3 for eventual Django 1.11 compatibility.
 2017-07-17 11:19:56 -04:00
Brian Mesick
05f55d5b3d Merge pull request #15555 from edx/bmedx/django_1.11_upgrade_restframework-jwt_PLAT-1586 
Upgrade djangorestframework-jwt to 1.11.0
 2017-07-17 10:48:56 -04:00
sarahkf
51208f370a Merge pull request #15339 from edx/sarahkf/fix-structure-files-and-uploads 
fixed files and uploads template in Studio
 2017-07-17 10:46:05 -04:00
Sarah Fischmann
f617deea05 Fix files and uploads template in Studio 
EDUCATOR-605

fixed template in places that only affect Studio

changed > to dash and article to div

Added translation of aria-label

EDUCATOR-605

Capitalize Files and Uploads

EDUCATOR-605

fixed aria label on div
 2017-07-17 09:40:08 -04:00
Albert (AJ) St. Aubin
2e140a6a5f Merge pull request #15569 from edx/staubina/ed-592_tests 
Staubina/ed 592 tests
 2017-07-17 07:24:16 -04:00
Douglas Hall
cc49c74a29 Merge pull request #15578 from edx/douglashall/upgrade_enterprise_0_38_2 
Upgrade edx-enterprise package version to 0.38.2.
 2017-07-16 20:07:22 -04:00
Douglas Hall
bff39b034e Merge pull request #15575 from open-craft/configure-ecommerce-service-worker-username 
[ENT-503] Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME
 2017-07-15 07:49:42 -04:00
Brandon DeRosier
43e161f66b Fix the BulkEnrollSerializer courses field to internally behave with strings and lists 2017-07-14 19:17:16 -04:00
Robert Raposa
db16ec2a04 Merge pull request #15577 from edx/robrap/LEARNER-1896-fix-waffle-flag-cache 
Fix course override caching bug.
 2017-07-14 18:33:54 -04:00
George Song
a45ae04e8b Merge pull request #15006 from open-craft/bdero/bulk-enroll 
Upstream the Bulk Enroll API endpoint
 2017-07-14 14:20:23 -07:00
Robert Raposa
7e8566b4d8 Fix course override caching bug. 
LEARNER-1896
 2017-07-14 16:45:27 -04:00
Douglas Hall
7ff9bce86b Upgrade edx-enterprise package version to 0.38.2. 2017-07-14 16:37:47 -04:00
John Eskew
6fa00e75a6 Upgrade django-config-models to 0.1.8 2017-07-14 16:10:32 -04:00
John Eskew
2cd62c7bfb Upgrade django-rest-framework version to edX fork, which is DRF v3.6.3 
with a custom patch needed by edx-platform.
Upgrade django-filter as well to v1.0.4
Import DjangoFilterBackend from the correct module - django_filter.
Add django-filter to INSTALLED_APPS.
 2017-07-14 16:05:13 -04:00
Jeremy Bowman
309ec0ac86 PLAT-1619 karma and bok-choy Docker Devstack fixes 2017-07-14 16:00:09 -04:00
Albert St. Aubin
427967ea83 Working tests for the new Group moderator error messaging 2017-07-14 15:48:12 -04:00
Andy Armstrong
0c72a62ad8 Merge pull request #15556 from edx/andya/pre-start-date-access 
Enable conditional pre-start-date access to courses
 2017-07-14 15:46:25 -04:00
Brandon DeRosier
a31855c935 Upstream the Bulk Enroll API endpoint 2017-07-14 14:01:16 -04:00
Andy Armstrong
aeecf34387 Enable conditional pre-start-date access to courses 
LEARNER-1854
 2017-07-14 14:00:48 -04:00
Ari Rizzitano
28bdfd4fdf Merge pull request #15537 from edx/ari/node-6.11 
upgrade jenkins node version to 6.11.1
 2017-07-14 13:59:57 -04:00
Gregory Martin
214018dfee Merge pull request #15572 from edx/yro/repair_signal_config 
Repair signal config, certs
 2017-07-14 13:20:34 -04:00
Matt Tuchfarber
70169016e7 Merge pull request #15443 from edx/tuchfarber/password_reset_misaligned 
WL-1086 Center password reset page
 2017-07-14 13:15:08 -04:00
Ned Batchelder
b310fbbb03 Merge pull request #15571 from edx/jill/ora2-django-storage 
Use ORA2 django storage on openstack and devstack.
 2017-07-14 12:57:47 -04:00
edx-pipeline-bot
b97f593402 Merge pull request #15573 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-14 12:56:04 -04:00
Jesse Shapiro
f3dd677fa9 Allow configuration of ECOMMERCE_SERVICE_WORKER_USERNAME 2017-07-14 12:50:55 -04:00
Matthew Piatetsky
2c2aa903f0 Merge pull request #15562 from edx/LEARNER-1143 
LEARNER-1143 Do not count programs with no courses as completed
 2017-07-14 12:47:15 -04:00
Gregory Martin
6fd51467c9 repair signal config 2017-07-14 12:14:53 -04:00