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

41899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joshua Spayd
db6f59987d Style timer with class rather than style attribute 2017-07-25 00:12:11 +00:00
Joshua Spayd
9da5be0298 Move JavaScript to edx-proctoring repo 2017-07-20 16:02:09 -07:00
Joshua Spayd
dd6d172abe WIP: Add toggle timer functionality 
JavaScript needs to be moved to edx-proctoring repo
 2017-07-17 20:17:22 +00: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
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
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
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
Jillian Vogel
0fcdcb02bb Use ORA2 django storage on openstack and devstack. 
Default ORA2 storage settings use AWS, so no change required to aws envs.
 2017-07-14 11:23:15 -04:00
Jesse Shapiro
99994b0eb5 Merge pull request #15525 from open-craft/haikuginger/enterprise-0.38.0 
[ENT-469] Upgrade edx-enterprise to 0.38.1, along with related dependencies
 2017-07-14 10:27:26 -04:00
muhammad-ammar
edcd64e90f edx-videoi-id strip fix 
LEARNER-1871
 2017-07-14 19:17:16 +05:00
Jesse Shapiro
b815f1df61 Upgrade edx-enterprise to 0.38.0, along with related dependencies 2017-07-14 09:02:19 -04:00
Ahsan Ul Haq
b39d9e0b5b Merge pull request #15541 from edx/ahsan/LEARNER-1530-update-edx-search 
Update edx-search
 2017-07-14 18:00:48 +05:00
Tim Krones
cbd3660cdc Merge pull request #15383 from edx/saleem-latif/ENT-367-updates 
ENT-367: Remove enterprise cookie when it is not needed any further.
 2017-07-14 14:57:46 +02:00
Robert Raposa
48c6c17c3c Merge pull request #15548 from edx/robrap/LEARNER-613-handle-start-dates 
LEARNER-613: Redirect Course Home for course that hasn't started.
 2017-07-14 08:50:14 -04:00
Ahsan Ul Haq
a0735ef230 Merge pull request #15567 from edx/ahsan/update-edx-packages 
Updated edx packages to the latest releases
 2017-07-14 16:23:19 +05:00
Ahsan Ulhaq
d0a6f90522 Updated edx packages to the latest releases 2017-07-14 15:22:27 +05:00
Ahsan Ulhaq
d6534c567b UPdate edx-search 
LEARNER-1530
 2017-07-14 15:07:31 +05:00
Robert Raposa
22c8e4c6ad Redirect Course Home for course that hasn't started. 
Includes the following:
- Move the redirect logic for before course that hasn't started to
share between Course Info and Course Home.
- Add audit comments for Course Info vs Course Home
- Other minor clean-up.

LEARNER-613
 2017-07-14 01:47:32 -04:00
Diana Huang
13e06a37a3 Merge pull request #15560 from edx/diana/deprecate-setting 
Deprecate the Course Home Sidebar setting.
 2017-07-13 17:11:11 -04:00
Harry Rein
3dbe04811a Merge pull request #15518 from edx/HarryRein/updating-bootstrap-theming 
Harry rein/updating bootstrap theming
 2017-07-13 16:56:28 -04:00
Alex Dusenbery
a0da9b895c Turn down course_grade_factory.py logging. 2017-07-13 15:48:31 -04:00
Brian Mesick
b63e5fa098 Merge pull request #15559 from edx/bmedx/pyinotify_for_dev 
Add pyinotify to development requirements for docker devstack perf
 2017-07-13 15:42:14 -04:00
Harry Rein
6d89cc1bd1 Updating themes for bootstrap. 
LEARNER-1785

This story was to update the existing custom themes to work with the flexible bootstrap design. It also updates the red theme to more closely resemble the real implementation on openedx.
 2017-07-13 15:25:40 -04:00