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

52916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diana Huang
6dbc0e77d2 Merge pull request #22843 from edx/jenkins/upgrade-python-requirements-533adf6 
Python Requirements Update
 2020-01-15 10:40:23 -05:00
Dave St.Germain
cfd1e2ae7d Merge pull request #22707 from edx/dcs/sequence-api 
Implementation of metadata endpoint for sequence modules
 2020-01-15 10:33:18 -05:00
Usama Sadiq
4b1a0105df Merge pull request #22846 from edx/usama/bom-1087-django-mysql-version-bump 
BOM 1087  django-mysql version bump
 2020-01-15 18:49:22 +05:00
usamasadiq
aee3318cbd BOM 1087 django-mysql version bump 
Removed the version constraint for django-mysql
Also pinned the freezegun version to 0.3.12 as the latest version is causing failures.
 2020-01-15 17:54:42 +05:00
M Zulqarnain
e5407a31ee Merge pull request #22841 from mzulqarnain1/zulqarnain/BOM-1147 
BOM-1147 -- Create a code mod for Widget.render change
 2020-01-15 11:35:58 +05:00
Brittney Exline
b43fd6652e Merge pull request #22855 from edx/bexline/migrate_enterprise_catalogs 
Upgrading edx-enterprise
 2020-01-14 17:47:09 -05:00
Brittney Exline
1209dc35b1 pinning freezegun because of it breaking a test 2020-01-14 17:09:17 -05:00
Diana Huang
28743215bd Pin freezegun due to breaking shib in third_party_auth. 2020-01-14 16:56:26 -05:00
Jansen Kantor
b2f69fc803 EDUCATOR-4858: Update teams service to consider teamset/topic (#22834) 
* update teams service and api to consider topic
 2020-01-14 16:06:27 -05:00
Brittney Exline
debb83d4ba Upgrading edx-enterprise 2020-01-14 14:03:10 -05:00
Calen Pennington
e2f3be9213 Merge pull request #22853 from edx/revert-22692-juliasq/rename_site_configuration_siteconfiguration_values_1 
Revert "Rename values in SiteConfiguration/History (1/3)"
 2020-01-14 13:20:36 -05:00
Julia Eskew
84de6bc6de Revert "This stage does the following: (#22692)" 
This reverts commit cebeab4348.
 2020-01-14 13:01:21 -05:00
Nick
fd13ccf4f9 Merge pull request #22850 from edx/ndalfonso/remove-upcoming-dates-border 
remove left boarder from upcoming dates
 2020-01-14 12:54:22 -05:00
Nicholas D'Alfonso
796f1802d2 remove left boarder from upcoming dates 2020-01-14 10:56:02 -05:00
Julia Eskew
cebeab4348 This stage does the following: (#22692) 
- Adds the new field and migration to create the column.
- Makes all writes go to both old and new field.
 2020-01-14 10:40:39 -05:00
Dave St.Germain
20235bcf56 Added subsection id to gated metadata. 2020-01-14 10:01:07 -05:00
Awais Qureshi
a37854931e Merge pull request #22842 from mzulqarnain1/zulqarnain/BOM-1138 
BOM-1138 -- Update assertRedirects usage
 2020-01-14 16:57:08 +05:00
Zia Fazal
402a1b3257 Merge pull request #22840 from edx/ziafazal/ENT-2535-b 
ENT-2535: Changed site configuration name to avoid conflict with existing configuration
 2020-01-14 16:38:15 +05:00
edX requirements bot
35171d6f55 Updating Python Requirements 2020-01-14 05:48:41 -05:00
Zulqarnain
93a726ff6b Merge branch 'master' into zulqarnain/BOM-1138 2020-01-14 15:25:20 +05:00
Zulqarnain
e6a6fd15d4 Merge branch 'master' into zulqarnain/BOM-1147 2020-01-14 15:23:43 +05:00
zia.fazal@arbisoft.com
17e64a8020 Chnage site configuration name to avoid conflict with existing configration 
Changed `THIRD_PARTY_AUTH_HINT` to `THIRD_PARTY_AUTH_ONLY_HINT` because there is an existing configuration with same name.
 2020-01-14 15:19:52 +05:00
Zulqarnain
834079104b BOM-1147 Widget.render change 2020-01-14 15:15:19 +05:00
Ahtisham Shahid
533adf6088 Merge pull request #22817 from edx/ahtisham/PROD-1099 
updated drag and drop xblock version
 2020-01-14 12:37:00 +05:00
Ahtisham Shahid
7abeb42465 updated xblox-drag-and-drop version by make upgrade 2020-01-14 12:05:48 +05:00
Awais Qureshi
1e572ef539 Merge pull request #22770 from edx/awais786/BOM-1084 
BOM-1084
 2020-01-14 09:34:58 +05:00
Nick
a3aa6d358c Merge pull request #22589 from edx/ndalfonso/AA-3-course-dates-cleanup 
AA-3 course dates cleanup
 2020-01-13 15:32:45 -05:00
Nicholas D'Alfonso
3ad963b8a7 AA-3 course dates cleanup 
-change Important Course Dates to Upcoming Dates
-remove today's date
-left align date, right aling rest of info
 2020-01-13 14:58:23 -05:00
edX cache uploader bot
b4eb64a425 Updating Bokchoy testing database cache (#22833) 2020-01-13 13:03:37 -05:00
George Babey
ebe2ee103e Merge pull request #22813 from edx/ziafazal/ENT-2535 
ENT-2535: Added link to error message displayed when TPA only user login from FPA form
 2020-01-13 12:06:56 -05:00
Syed Muhammad Dawoud Sheraz Ali
5356e7a657 Merge pull request #22830 from edx/dsheraz/PROD-1109 2020-01-13 21:44:19 +05:00
Abdul Hannan
64ad41630a Merge pull request #22825 from edx/rename_start_end_in_courseoverview_1 
Rename start, end in CourseOverview
 2020-01-13 21:43:58 +05:00
Awais Qureshi
c875508006 Merge pull request #22827 from edx/awais786/migration-test 
Bom-1146
 2020-01-13 21:37:23 +05:00
Dave St.Germain
507b85ee3d Return sequence metadata from an ajax handler endpoint, to support the new courseware micro-frontend. 2020-01-13 11:26:02 -05:00
DawoudSheraz
17d2a04bac ORA update to 2.6.0 2020-01-13 20:47:26 +05:00
Awais Qureshi
a2ab14d756 Bom-1146 
Enabling migration test.
 2020-01-13 20:27:53 +05:00
Awais Qureshi
8b3b045803 BOM-1084 
Bump django-filter.
Rename the name to field-name.
 2020-01-13 20:25:44 +05:00
Awais Qureshi
7c45d99ae9 Merge pull request #22818 from edx/awais786/django-wiki-ver 
Bom-1146
 2020-01-13 20:25:07 +05:00
Brittney Exline
9ee9a3dfdb Merge pull request #22802 from edx/bexline/migrate_enterprise_catalogs 
ENT-2475 Upgrading edx-enterprise and adding settings for enterprise catalog service
 2020-01-13 08:01:29 -07:00
Brittney Exline
e33b4614af ENT-2475 Upgrading edx-enterprise and adding settings for enterprise catalog service 2020-01-13 09:36:20 -05:00
Awais Qureshi
164ce5fa8a Bom-1146 
Wiki version bump.
 2020-01-13 19:21:08 +05:00
hunytalk
ef7350f375 Add comment 2020-01-13 19:09:15 +05:00
Awais Qureshi
3eb4154c6b Merge pull request #22742 from edx/wiki-ver 
BOM-1126
 2020-01-13 19:01:22 +05:00
hunytalk
8374d111c1 Add start_date, end_date for renaming start, end field to CourseOverview 2020-01-13 18:59:51 +05:00
edX requirements bot
c99a026ad3 Updating Python Requirements (#22816) 2020-01-13 08:31:53 -05:00
edX cache uploader bot
9ac40c79c3 Updating Bokchoy testing database cache (#22815) 2020-01-13 08:25:07 -05:00
Awais Jibran
0162124c39 Merge pull request #22812 from edx/aj/bump-studio-frontend-version 
Bump Studio-Frontend
 2020-01-13 15:30:07 +05:00
zia.fazal@arbisoft.com
60ce80379b Added link to error message displayed when TPA only user login from FPA login page 
Added link to error message displayed when TPA only user login from FPA login page.
ENT-2535

Fixed pep8 quality violation

skip unit test if context is not LMS
 2020-01-13 14:23:04 +05:00
Awais Jibran
0e7b04875f Bump Studio-Frontend 2020-01-13 13:45:00 +05:00
Usama Sadiq
6349606b55 Merge pull request #22774 from edx/usama/bom-1140 
Updated LtiBackend.authenticate() method
 2020-01-13 11:50:37 +05:00