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

52897 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Anders Pearson
f1df842e77 update bookmarks update_xblocks_cache celery task name 
Make it match the function name.
 2020-01-14 12:47:41 +00: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
Zulqarnain
93a726ff6b Merge branch 'master' into zulqarnain/BOM-1138 2020-01-14 15:25:20 +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
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
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
Alex Dusenbery
a6adb62e8f Upgrade ORA to 2.5.9 2020-01-12 17:06:01 -05:00
edX Transifex Bot
ca4b9d15fb fix(i18n): update translations 2020-01-12 16:25:31 -05:00
Ned Batchelder
ccac3f5e14 Merge pull request #22804 from mahyard/master 
Delete extra parentheses which prevented a message from being extracted
 2020-01-12 09:40:02 -05:00
Mahyar Damavand
532f3e80fa Delete extra parentheses which prevented a message from being extracted 2020-01-12 17:17:51 +03:30
Jeff Chaves
251aad6288 Chavesj/enterprise v2 0 45 (#22796) 
bumping enterprise version to 2.0.45
 2020-01-10 16:05:41 -05:00
Awais Qureshi
87da483e87 Merge pull request #22789 from edx/awais786/BOM-1146-p2 
Bom-1146
 2020-01-11 01:24:59 +05:00
David Ormsbee
d0c764b4d8 Merge pull request #22320 from open-craft/fix-blockstore-field-bug 
Improve handling of 'children' field in Blockstore XBlock runtime
 2020-01-10 14:32:04 -05:00
Aarif
d89a1b872d Merge pull request #22713 from edx/BOM-1131 
Updated the Mako Loader to remove deprecated methods
 2020-01-10 21:34:04 +05:00
edX cache uploader bot
6eefba4e14 Updating Bokchoy testing database cache (#22792) 2020-01-10 09:44:26 -05:00
Awais Qureshi
48dbebd28f Bom-1146 
In mobile-api model PLATFORM_CLASSES tuple of list and make migrations generate new migration due to different order.
 2020-01-10 18:10:05 +05:00
usama sadiq
889f7d492d Updated LtiBackend.authenticate() method 
Added a positional `request` arugment in the function header.
 2020-01-10 17:00:22 +05:00
Usama Sadiq
e7f112c61c Merge pull request #22773 from edx/usama/bom-1137 
Updated ExceptionViews handles
 2020-01-10 16:29:19 +05:00
usama sadiq
720dcb6c3a Updated ExceptionViews handles 
Added additional 'exception' parameter to function headers.
Disabled pylint warnings for missing docstring and unused arguments.
 2020-01-10 15:56:24 +05:00
Usama Sadiq
7a7ed99a73 Merge pull request #22771 from edx/usama/bom-1086 
Django-mptt package upgrade to 0.10.0
 2020-01-10 12:57:18 +05:00
Zia Fazal
f9e73da4f7 Merge pull request #22772 from edx/ziafazal/ENT-2524 
ENT-2524: Unmarked name field of content gating partition for translation
 2020-01-10 12:26:17 +05:00
usamasadiq
c821a49359 Updated django-mptt package to version 0.10.0 to provide support up to Django 2.2. 2020-01-10 11:42:30 +05:00
Awais Qureshi
804a2bbbb9 Merge pull request #22785 from edx/awais786/BOM-1146 
Bom-1146
 2020-01-10 11:38:35 +05:00
Awais Qureshi
390bae36e8 Bom-1146 
Due to some recent schema changes this test is failing. Temporarily skipping it. Fix it in other PR.
 2020-01-10 10:59:45 +05:00
mraarif
ecdf2a3ebd updated the custom Loader to remove deprecated methods 2020-01-10 03:16:29 +05:00