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

56966 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edx-pipeline-bot
a41c7e2e1f Merge pull request #26054 from edx/private_to_public_780deee 
Mergeback PR from private to public.
 2021-01-13 07:13:14 -05:00
Ahtisham Shahid
780deeed7a Merge pull request #217 from edx/ahtisham/PROD-1916-p 
Error incase of disabled user social login
 2021-01-13 16:24:02 +05:00
edX requirements bot
bba0e1723a Updating Python Requirements (#26049) 2021-01-13 16:12:04 +05:00
edX Transifex Bot
5d1934725d geoip2: update maxmind geolite country database 2021-01-13 04:52:41 -05:00
Saad Yousaf
cf8c0bbec7 Merge pull request #26028 from edx/saad/TNL-7820 
[TNL-7820] - remove important rule for links on hover.
 2021-01-13 12:02:41 +05:00
Adam Stankiewicz
7561079b34 bump edx-enterprise to 3.17.5 (#26048) 2021-01-12 17:15:35 -05:00
Alex Dusenbery
7908565dd4 Update edx-enterprise to 3.17.4 | Include a docstring indicating a preference that we don't delete EnterpriseCourseEnrollments. 2021-01-12 15:59:04 -05:00
edx-abolger
8e54ef4360 Merge pull request #26044 from edx/edx-abolger/enterprise-3-17-3 
Version bump edx-enterprise to 3.17.3
 2021-01-12 14:01:10 -05:00
Bianca Severino
c903f7363d Merge pull request #26045 from edx/bseverino/proctoring-2.5.8 
Update edx-proctoring to 2.5.8
 2021-01-12 13:35:48 -05:00
Bianca Severino
78165fd33a Update edx-proctoring to 2.5.8 2021-01-12 13:06:23 -05:00
Zainab Amir
2e6e360f03 fix login cookie parse issue (#26032) 2021-01-12 22:45:21 +05:00
Adrienne Bolger
81b8fada83 Version bump edx-enterprise to 3.17.3 2021-01-12 12:14:14 -05:00
Ahtisham Shahid
32985420c0 Added named logs (#26036) 
Added named logs
 2021-01-12 13:28:47 +05:00
Awais Qureshi
177c1a530f Merge pull request #26037 from edx/jenkins/upgrade-python-requirements-9be8a2b 
Python Requirements Update
 2021-01-12 12:02:52 +05:00
Awais Qureshi
4d3919fa81 Fixing package version. 2021-01-12 11:20:55 +05:00
edX requirements bot
07648422b5 Updating Python Requirements 2021-01-11 23:56:56 -05:00
Alex Dusenbery
9be8a2b562 Upgrade enterprise to 3.17.2 | stop listening for unenroll signal and deleting EnterpriseCourseEnrollments there-from. 2021-01-11 14:46:58 -05:00
Kellie Selinka
e858addce1 Merge pull request #26034 from edx/kselinka_enterprise_version_bump 
version bump edx-enterprise
 2021-01-11 13:44:26 -05:00
Kellie Selinka
8ef4f54d5d version bump edx-enterprise 2021-01-11 13:02:08 -05:00
Nizar
1e872d4e10 Adds support for enabling custom tinymce plugins in Studio's HTML editor (#25695) 2021-01-11 11:28:20 -05:00
Nizar
b49ebb93f8 Adds clean-js jake command to JakePackage and updates building instructions (#25324) 
The clean-js jake command helps remove all minified js files that get generated using the minify bundle jake command

By running clean-js before running the minify command, we ensure that the tinymce files are consistent after being rebuilt/minified.

This is helpful with multiple app servers that are applying the same changes to the TinyMCE editor

This ensures that no matter on which machine the files are rebuilt, the resulting minified plugin files are consistent among all
 2021-01-11 11:28:07 -05:00
Nathan Sprenkle
0e194bf517 Add team protection tests for CSV team management (#26019) 2021-01-11 10:42:50 -05:00
Christie Rice
7817c47df1 MICROBA-885 Check whitelisted, even if a grade exists (#26011) 2021-01-11 10:19:16 -05:00
Matthew Piatetsky
53ccf9bd84 Merge pull request #25988 from edx/AA-488 
[AA-488] Remove uses of the active field on the schedule model in the code.
 2021-01-11 09:34:00 -05:00
Ahtisham Shahid
33fb1e6b4a added logs in oauth exchange (#26005) 2021-01-11 19:05:28 +05:00
Michael Terry
1c322bbe67 Merge pull request #26008 from edx/mikix/timezone-alerts 
Show discount deadline in a timezone-aware way
 2021-01-11 08:00:43 -05:00
Usama Sadiq
eaecaec510 Merge pull request #26025 from edx/jenkins/upgrade-python-requirements-53dcec6 
Python Requirements Update
 2021-01-11 17:38:00 +05:00
usamasadiq
0d7fb1e2c9 Pin social-auth-core<4.0.2 2021-01-11 17:09:46 +05:00
Ali Akbar
e89127bfcc Merge pull request #26030 from edx/IM/security-fixes-4-thresholds 
update thresholds after IM security fixes 4
 2021-01-11 16:36:44 +05:00
edX requirements bot
5e0f34cb17 Updating Python Requirements 2021-01-11 16:00:34 +05:00
Awais Qureshi
6d8f356c01 Merge pull request #26015 from edx/awais786/drf-upgrade 
Upgrade drf version.
 2021-01-11 15:33:41 +05:00
Ali-D-Akbar
aa6da77c4e update thresholds after IM security fixes 4 2021-01-11 15:02:29 +05:00
SaadYousaf
c6a661820f [TNL-7820] - remove important rule for links on hover. 2021-01-11 14:35:53 +05:00
edx-pipeline-bot
d303f7afd8 Merge pull request #26026 from edx/private_to_public_0e2d12f 
Mergeback PR from private to public.
 2021-01-11 03:35:21 -05:00
Michael Roytman
53dcec616e Merge pull request #26006 from edx/mroytman/update-edx-proctoring-version-2.5.6 
update version of edx-proctoring library to 2.5.6
 2021-01-08 14:57:41 -05:00
Awais Qureshi
aa06846141 Upgrade drf version. 2021-01-09 00:53:21 +05:00
Awais Qureshi
14b5e48653 Merge pull request #26018 from edx/awais786/pin-bulk-grades 
pinned edx-bulk-grades to avoid migration error.
 2021-01-09 00:46:25 +05:00
Awais Qureshi
e92fa1cccd latest edx-bulk-grades==0.8.5 is giving migration error. 2021-01-08 23:59:14 +05:00
Michael Terry
1482755bbd Show discount deadline in a timezone-aware way 
Also, fix it and the access expiration deadline to not hardcode
the date presentation in an American way.
 2021-01-08 13:56:18 -05:00
Ali Akbar
0e2d12fc7c Merge pull request #213 from edx/IM/security-fixes-4 
Incident Management Security Fixes 4
 2021-01-08 21:46:05 +05:00
Alex Dusenbery
180227d6b1 bump edx-enterprise to 3.17.0 Listen for student.CourseEnrollment unenrollment signal and delete associated EnterpriseCourseEnrollment record if one exists (we will have a historical record of the deletion). 2021-01-08 11:18:05 -05:00
Usama Sadiq
378e25f8e0 Merge pull request #25701 from edx/awais786/upgrade-drf 
Upgrading drf version
 2021-01-08 17:16:27 +05:00
Awais Qureshi
47f874f350 BOM-2130 
Upgrade the django-rest framework.
 2021-01-08 16:13:24 +05:00
edX requirements bot
c711fcf2af Updating Python Requirements (#26012) 2021-01-08 14:40:22 +05:00
Saad Yousaf
ba7602476b Merge pull request #26002 from edx/saad/TNL-7877 
[TNL-7877] - Cleanup branding app.
 2021-01-08 13:58:49 +05:00
Adam Stankiewicz
f217c6d90b upgrade edx-enterprise to 3.16.11 (#26010) 2021-01-07 17:17:10 -05:00
alangsto
2a10406924 added logging messages in case of decryption exception (#26007) 2021-01-07 15:12:00 -05:00
Michael Roytman
da1d61e34e update version of edx-proctoring library to 2.5.6 2021-01-07 12:54:34 -05:00
Usman Khalid
9e38b17202 Convert ErrorModule and NonStaffErrorModule to XBlocks. (#25570) 2021-01-07 10:51:33 -05:00
Tobias Macey
50bb70298c Added a configuration flag to force third party auth (#24789) 
This adds a toggle to allow operators to prevent user registration and login via username/password authentication, forcing the platform to only support login and registration using third-party auth such as SAML.

Co-authored-by: Umar Asghar <mrumarasghar@gmail.com>
 2021-01-07 09:55:27 -05:00