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

56152 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carla Duarte
ca7434ce3b AA-405: UI fixes for courseware 2020-10-23 09:20:46 -04:00
Jansen Kantor
8b1075b27b upgrade ora to 2.10.3 (#25407) 2020-10-22 14:26:02 -04:00
Feanil Patel
581b20056d Feanil/edx search update (#25406) 
OeX_ES-44:  Update edx-search elasticsearch.


* removes redundant doc_types from the lms/cms, replaces courseware
index with doc_types to two indices
* code polishing

* Use a new config variable for ES7 deployment. (#2226)

Co-authored-by: Golub-Sergey <1.golub.sergey.1@gmail.com>
Co-authored-by: Diana Huang <diana.k.huang@gmail.com>
 2020-10-22 14:18:19 -04:00
edX requirements bot
d435c0c29e Updating Python Requirements (#25402) 2020-10-22 12:28:27 +05:00
Kellie Selinka
b814938c09 Merge pull request #25400 from edx/kselinka_bump_edx_enterprise_3.9.2 
bump edx-enterprise package number
 2020-10-21 17:33:31 -04:00
edX Transifex Bot
00b6beff50 geoip2: update maxmind geolite country database 2020-10-21 17:14:02 -04:00
Kellie Selinka
5b808ebab5 bump edx-enterprise package number 2020-10-21 16:37:24 -04:00
Ahtisham Shahid
64c0cfe16b Fixed UI issues in problem report (#25183) 
Fixed height issue in Problem grade report new UI
 2020-10-21 20:43:52 +05:00
irfanuddinahmad
877da8308d Merge pull request #25395 from edx/iahmad/ENT-3512 
ENT-3512: Updated requirements for edx-enterprise
 2020-10-21 20:17:12 +05:00
David Ormsbee
0c61b0d4e2 Re-enable refreshing from library only on initial insertion of lib (#25347) 
If the library content block is already in the course, then don't
refresh the children when we re-import it. This lets us address
TNL-7507 (Randomized Content Block Settings Lost in Course Import)
while still avoiding AA-310, where the IDs of the children for an
existing library_content block might be altered, losing student
user state.

When importing, we only copy the default values from content
in a library the first time that library_content block is created.
Future imports ignore what's in the library so as not to disrupt
course state. You can still update to the library via the Studio
UI for updating to the latest version of a library for this block.
 2020-10-21 10:49:32 -04:00
irfanuddinahmad
2ed3e66ff7 Updated requirements for edx-enterprise 2020-10-21 18:53:42 +05:00
Adeel Ehsan
2a33856834 Merge pull request #25185 from edx/aali/fix_password_sent_email 
fix email to which reset link was sent
 2020-10-21 18:32:58 +05:00
syed-awais-ali
b3f1c8c1c7 fix email to which reset link was sent 2020-10-21 18:06:55 +05:00
alangsto
95bcbced21 upgrading edx-proctoring library (#25389) 2020-10-21 08:48:43 -04:00
Muhammad Soban Javed
2489bf3d48 Merge pull request #25393 from edx/testeng/bokchoy_auto_cache_update_c1007c1e99f6bc3137ed8aeee84eaa4d13e63bd9 
Bokchoy Testing DB Cache update
 2020-10-21 15:40:06 +05:00
edX cache uploader bot
305a69de85 Updating Bokchoy testing database cache 2020-10-21 05:37:17 -04:00
Usama Sadiq
77a4575596 Merge pull request #25390 from edx/testeng/bokchoy_auto_cache_update_c1007c1e99f6bc3137ed8aeee84eaa4d13e63bd9 
Bokchoy Testing DB Cache update
 2020-10-21 14:32:50 +05:00
Usama Sadiq
77ac00b4f3 Merge pull request #25392 from edx/usamasadiq/pin-django-oauth-toolkit 
pin django-oauth-toolkit
 2020-10-21 14:24:14 +05:00
arbi-bom
d6d147c970 pin django-oauth-toolkit 2020-10-21 13:04:18 +05:00
edX cache uploader bot
5ab2ba184c Updating Bokchoy testing database cache 2020-10-21 01:00:02 -04:00
Saleem Latif
ef63c2b366 Merge pull request #25385 from edx/saleem-latif/ENT-3522 
ENT-3522: Request for field to specify locale in Django enterprise accounts
 2020-10-21 09:53:28 +05:00
Aarif
77b9113727 Updated the Dockerfile to use python 3.8 (#25205) 2020-10-21 07:31:19 +05:00
edX Transifex Bot
a62843e764 fix(i18n): update translations 2020-10-20 12:27:28 -04:00
Michael Terry
76eff393bf Merge pull request #25387 from edx/mikix/validate-verbose 
Use verbose output when validating new translations
 2020-10-20 12:02:01 -04:00
Michael Terry
ca75c474e1 Use verbose output when validating new translations 
When running "make pull_translations", this will print any
validation errors on the console, rather than stuffing them into
a .prob file.

This helps when looking at failing jenkins log files.
 2020-10-20 11:20:34 -04:00
Saleem Latif
43d0a67fa1 Request for field to specify locale in Django enterprise accounts 2020-10-20 17:56:22 +05:00
edX cache uploader bot
37ecece8d1 Updating Bokchoy testing database cache (#25378) 2020-10-20 12:28:29 +05:00
Binod Pant
d83233266b upgrade to enterprise 3.8.43 (#25380) 
* upgrade to enterprise 3.8.43

* Fix merge
 2020-10-19 22:31:24 -04:00
Jeff Chaves
d25d4038fd ENT-3460: updating usage of EnterpriseCustomerBrandingConfiguration, edx-enterprise 3.8.42 (#25376) 
* bumping enterprise version

* adding pillow constraint

* updating usage of EnterpriseCustomerBrandingConfiguration
 2020-10-19 16:42:16 -04:00
Jansen Kantor
2b5913b53d upgrade ORA to 2.10.2 (#25375) 2020-10-19 16:02:05 -04:00
Dillon Dumesnil
0a597bd775 Merge pull request #25348 from edx/ddumesnil/add-cert-to-linkedin-aa-385-2 
AA-385: Adding in migration for LinkedInAddToProfileConfiguration
 2020-10-19 10:53:27 -07:00
Jason Myatt
fa8d5618da Merge pull request #25377 from edx/jmyatt/bump-edx-ace-0.1.17 
Upgrade edx-ace to 0.1.17
 2020-10-19 13:45:54 -04:00
Jason Myatt
1d454b5bbb Upgrade edx-ace to 0.1.17 2020-10-19 13:05:29 -04:00
Dillon Dumesnil
84a60a1f17 AA-385: Adding in migration for LinkedInAddToProfileConfiguration 2020-10-19 12:56:34 -04:00
Dillon Dumesnil
b6dbbb6f83 Merge pull request #25346 from edx/ddumesnil/add-cert-to-linkedin-aa-385 
AA-385: Add in LinkedIn Add to Profile to courseware meta API
 2020-10-19 07:31:26 -07:00
Jason Myatt
6deace7350 Merge pull request #25367 from edx/jmyatt/bump-edx-ace-0.1.16 
Bump edx-ace version to 0.1.16
 2020-10-19 09:42:43 -04:00
Kyle McCormick
a3deb6e317 Sort imports in cms/ 
Command: `isort --recursive cms/`
 2020-10-19 09:34:31 -04:00
Kyle McCormick
d21a330d0a Tell isort not to sort certain imports in cms/ 2020-10-19 09:34:31 -04:00
Kyle McCormick
538dbf696b Import CMS code using fully qualified module names 
or, using proper the proper Python 3 relative imports
(e.g., 'from .views import x') which are standard and
unambiguous.
 2020-10-19 09:34:31 -04:00
Kyle McCormick
7538691484 Patch CMS app code in tests using fully qualified names 2020-10-19 09:34:31 -04:00
Kyle McCormick
437526b4bb Include CMS urls using fully qualified names 2020-10-19 09:34:31 -04:00
Kyle McCormick
793df96332 Declare CMS apps using fully qualified names 2020-10-19 09:34:31 -04:00
Kyle McCormick
bc8987f685 Generate sys_path_hacks/ modules for cms/djangoapps 
Run 'sys_path_hacks/un_sys_path.sh cms/djangoapps studio'
 2020-10-19 09:34:31 -04:00
Kyle McCormick
4847a18a66 Remove sys.path modification for Studio; use sys_path_hacks instead 
Also, tweak the un_sys_path.sh script.
 2020-10-19 09:34:31 -04:00
Usama Sadiq
78eae80e38 Merge pull request #25371 from edx/jenkins/upgrade-python-requirements-5b41d9f 
Python Requirements Update
 2020-10-19 12:53:40 +05:00
edX requirements bot
84725a3e10 Updating Python Requirements 2020-10-19 00:53:47 -04:00
Jason Myatt
1a4dfdc16a Bump edx-ace version to 0.1.16 2020-10-17 12:19:48 -04:00
Calen Pennington
5b41d9fd7f Merge pull request #25364 from cpennington/wire-in-class-based-tasks 
Work around celery changes to class-based-task registration
 2020-10-16 13:38:31 -04:00
Calen Pennington
f30d492164 Work around celery changes to class-based-task registration 2020-10-16 13:02:41 -04:00
Usama Sadiq
7153453a15 Merge pull request #25363 from edx/testeng/bokchoy_auto_cache_update_6374879610097058dc42a1573543224f7a10a6d3 
Bokchoy Testing DB Cache update
 2020-10-16 19:09:25 +05:00