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

41872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Matthew Piatetsky
de3c802700 Do not count programs with no courses as completed 
LEARNER-1143
 2017-07-13 14:57:47 -04:00
Diana Huang
6f24c5a234 Deprecate the Course Home Sidebar setting. 2017-07-13 14:09:26 -04:00
bmedx
8d184480ea Update comment in development.txt to be more correct 2017-07-13 13:09:28 -04:00
bmedx
390ba5c86c Add pyinotify to development requirements for docker devstack perf 
Django can use pyinotify for watching files in runserver which should
save a lot of CPU work in docker.
 2017-07-13 12:40:59 -04:00
Christina Roberts
cdd0e945bd Merge pull request #15551 from edx/christina/update-organizations 
Update version of edx-organizations.
 2017-07-13 10:13:43 -04:00
Simon Chen
be3c29b006 Merge pull request #15550 from edx/LEARNER-683 
Allow enrollment into expired seats if the api is called by ECOM service
 2017-07-13 09:04:08 -04:00
George Song
06c9826904 Merge pull request #14845 from Salomari1987/salah/password_reset_email_subject 
Use platform_name instead of site_name in password reset email
 2017-07-13 05:52:21 -07:00
Vedran Karačić
2ffabe6333 Merge pull request #15539 from edx/vkaracic/update-settings 
Add COURSE_CATALOG_API_URL settings value to devstack_docker
 2017-07-13 06:51:56 +02:00
Albert (AJ) St. Aubin
c78b84ca3f Merge pull request #15480 from edx/staubina/ed-592 
Staubina/ed 592
 2017-07-12 17:24:53 -04:00
George Song
1f6a4f22d1 Merge pull request #15549 from edx/george/git-import-sysadmin 
Disable Git Import view for professor's who are not staff
 2017-07-12 13:20:15 -07:00
Simon Chen
a3d511926f Allow enrollment into expired seats if the api is called by ecom service 2017-07-12 16:04:52 -04:00
edx-pipeline-bot
0e9f5b3d24 Merge pull request #15553 from edx/release-mergeback-to-master 
Merge release back to master
 2017-07-12 15:39:36 -04:00
cahrens
c1cebb1674 Update version of edx-organizations. 
EDUCATOR-772
 2017-07-12 14:32:56 -04:00
George Song
59794ea9c9 Merge pull request #15338 from ravi-ojha/educator_269 
Fix EDUCATOR-269: Don't show "Issue Open Badges" if the feature is disabled
 2017-07-12 10:50:55 -07:00
mrey
d682802f58 Disable view of Git Import when user is professor of course but not staff user 
Reason: Before this fix, if the user is not staff (user.is_staff=0) and ENABLE_SYSADMIN_DASHBOARD=True
happens that the user can access the Git Import in Sysadmin dashboard and get to see the links in the menu
of the sysadmin dashboard (Users, Courses, Staffing and enrollment). When this user clicks on one of
these links, it gets an error from the server.
 2017-07-12 10:36:35 -07:00
Joel Barciauskas
72c9d58ae1 Merge pull request #14899 from edx/jbarciauskas/import-rest-api-2 
Create REST API for importing a course
 2017-07-12 13:02:30 -04:00
Christina Roberts
04f9db20c0 Merge pull request #15533 from edx/christina/remove-mustache 
Remove last Mustache usage.
 2017-07-12 12:58:21 -04:00
Alex Dusenbery
6919fc8ce8 Use kwargs right. 2017-07-12 12:51:42 -04:00
Albert St. Aubin
b8b0110d15 Ui updates, Error messaging shown when discussion scheme is not selected 2017-07-12 12:49:54 -04:00
Kevin Falcone
039afc2517 Merge pull request #15534 from edx/jibsheet/quiet-requests-logging 
Limit requests urllib3 logging to quiet log spam
 2017-07-12 12:49:18 -04:00
Diana Huang
267968b029 Merge pull request #15542 from edx/diana/update-naming 
Update names to be more consistent.
 2017-07-12 12:27:33 -04:00
cahrens
bddc29a850 Remove last Mustache usage. 2017-07-12 12:08:59 -04:00
Joel Barciauskas
01db7a7d74 Add course import REST API to Studio 2017-07-12 11:48:35 -04:00
Brian Mesick
fdaf1b4c9a Merge pull request #15472 from edx/bmedx/django_1.11_upgrade_help_tokens_PLAT-1441 
Upgrade help-tokens to 1.0.3
 2017-07-12 11:14:10 -04:00
Brian Mesick
ef0e15af74 Merge pull request #15439 from edx/bmedx/django_1.11_upgrade_crum_PLAT-1478 
Upgrade django-crum to 0.7.2
 2017-07-12 11:13:49 -04:00
Diana Huang
fc9737581e Update names to be more consistent. 
LEARNER-1669
 2017-07-12 10:55:31 -04:00