Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
50,838 Commits 1 Branch 0 Tags
658cd5c62ecb093ff5aeef9383eb4146dee5ab93
Commit Graph

2606 Commits

Author SHA1 Message Date
Ayub
658cd5c62e BOM-70 (#21327) 
* Update Financial Assistance logic

Use the zendesk proxy app instead of the unsupported zendesk library.

* Move to pre-fetching the group IDs.

Rather than making extra requests to zendesk to list all groups and find
a specific group ID. Just make a pre-filled list of group IDs for the
groups we care about.  When a group name is passed in, it is checked
against this list and the ticket is created in the correct group so the
right people can respond to it.
 2019-08-16 13:05:35 -04:00
Dave St.Germain
a394391a66 Merge pull request #21352 from edx/dcs/upgrade 
Upgrade edx-when to fix CR-1089
 2019-08-16 10:24:27 -04:00
Matt Hughes
c3a1a70d4f Correct discrepancy between grade data sources for gradebook 2019-08-16 10:02:46 -04:00
Dave St.Germain
ef67067d17 Upgrade edx-when to fix CR-1089 2019-08-16 09:57:14 -04:00
Chris Pappas
4461d978db Running make upgrade to bump edx-enterprise version (#21344) 
Fix for test that broke related to DRF;
 2019-08-15 14:56:08 -04:00
Matt Hughes
828c2fdc93 Add limit stops for assignment grade filtering for gradebook api 
JIRA:EDUCATOR-4541
 2019-08-13 15:05:03 -04:00
Feanil Patel
9753eae441 Convert to using ExitStack instead of nested. (#21329) 
* Convert to using ExitStack instead of nested.

nested is not available in Python3.

* Use ExitStack from contextlib2.

ExitStack has not been backported to the Python 2.7 standard library and
contextlib.nested is no longer available in Python 3.5.  We need to be
able to use something in both 2 and 3 as we transition so we'll pull in
contextlib2 which has backports of the full python3 contextlib.
 2019-08-12 16:55:05 -04:00
Dave St.Germain
05375b40fa Merge pull request #21318 from edx/dcs/missing-when 
Added edx-when's FieldData
 2019-08-12 12:41:51 -04:00
Dave St.Germain
267be29ab7 Added edx-when's FieldData 
EDUCATOR-4554
This fixes a bug where extended due dates were visible in the outline but not reflected on the courseware pages, resulting in problems not being submittable past the due date.
In order for edx-when to work on courseware pages, it has to be more careful about field inheritance, which version 0.2 achieves.
 2019-08-12 11:05:44 -04:00
Feanil Patel
b599c807a9 Merge pull request #21325 from edx/awais786/BOM-84-version 
BOM-84
 2019-08-09 12:17:41 -04:00
Feanil Patel
a2e0acf1e0 Merge pull request #21317 from edx/feanil/upgrade_mongodb_proxy 
Feanil/upgrade mongodb proxy
 2019-08-09 11:56:18 -04:00
arbisoft
ed1bdf31bd BOM-84 
Update the version.
 2019-08-09 19:44:32 +05:00
Feanil Patel
b8f8f072b4 Run make upgrade. 2019-08-09 10:02:17 -04:00
Feanil Patel
3cf42a692e Update mongodbproxy. 2019-08-09 09:44:58 -04:00
root
e2213b6712 BOM-79 updated codejail 2019-08-08 16:27:27 -04:00
Ayub
26a1445c93 Revert "BOM-70" 2019-08-08 17:39:45 +05:00
Waheed Ahmed
e81500a25e Downgrade newrelice version from 5.0.0.124 to 4.20.1.121. 
Getting 500 error on stage after upgrading to latest version
of newrelice.
 2019-08-08 14:15:19 +05:00
Feanil Patel
ea7b0d2d0c Run make upgrade. 2019-08-07 15:04:58 -04:00
Feanil Patel
170c689506 Update to a version of crowdsourcehinter that supports python 3. 2019-08-07 15:04:26 -04:00
Nimisha Asthagiri
4c7d437bdd DEPR-20 Remove django-openid-auth 2019-08-06 14:02:48 -04:00
Ayub
3f2bd0a020 Merge pull request #21229 from edx/BOM-70 
BOM-70
 2019-08-06 18:48:42 +05:00
Ayub khan
c9080e257e -fixed tests 2019-08-06 15:31:41 +05:00
Dave St.Germain
2e4cbbe250 Upgrade bulk-grades 2019-08-05 12:04:19 -04:00
Ayub khan
c965e13c73 BOM-70 
-Removed Submit-feedback View
-Removed related tests
-Removed help_modal.html
-Removed help_modal.html test
-Removed zendesk from requirements
-Updated requirements
 2019-08-05 13:38:46 +05:00
aarif
a40c771a1c updated the github.in 
added the updated dependency for oauth2

added the commit hash instead of branch

minor fix

changes made by make upgrade
 2019-08-05 10:51:24 +05:00
Feanil Patel
519e3a7ca3 Run make upgrade 2019-08-02 13:41:59 -04:00
Feanil Patel
74132f8ed9 Update moto to support python3. 
We had to pin json diff because of how we pull prod requirements into
testing.txt
 2019-08-02 13:41:55 -04:00
Hammad Ahmad Waqas
85c4ba1a9d Merge pull request #21283 from edx/hammad/bump-version 
edx-platform version bump
 2019-08-02 18:38:46 +05:00
Hammad Ahmad Waqas
f8e89b5059 edx-platform version bump 2019-08-02 15:06:46 +05:00
Nimisha Asthagiri
c1a5d2fa06 DEPR-15: Remove usage of firebase-token-generator 
The old Notes Django app is the only caller of this no longer
supported library. I have verified that this old app is no
longer functional and is already slated to be removed as part
of DEPR-18.

So this commit simply removes the call to firebase-token-generator
and leaves removal of the Notes app to DEPR-18.
 2019-08-01 18:56:04 -04:00
Calen Pennington
b5a8f67e64 Merge pull request #21219 from cpennington/permission-courseware-enable-masquerade 
Permission courseware enable masquerade
 2019-07-31 14:15:28 -04:00
Feanil Patel
6e590ac9a8 Run make upgrade. 2019-07-31 13:19:26 -04:00
Calen Pennington
136f58cb2d Add a staff-access specific bridgekeeper rule with full query support 2019-07-31 13:07:52 -04:00
DawoudSheraz
82874538e3 run make upgrade to update DnD Xblock version 2019-07-31 11:08:04 +05:00
Calen Pennington
c00b60ffa5 Merge pull request #21244 from cpennington/check-permissions-view-course-home 
Check permissions view course home
 2019-07-30 13:06:13 -04:00
Calen Pennington
2d1eb9923f Convert a has_access check into a bridgekeeper rule 
This reverts commit 5e8f90caa1.
 2019-07-30 12:02:24 -04:00
arbisoft
dfa2cb14b7 https://openedx.atlassian.net/browse/BOM-68 
Upgrade the django-wiki version.
 2019-07-30 14:44:52 +05:00
Feanil Patel
d9f936b85b Constrain two more requirements. 
Both python 3 related but different reasons. numpy dropped python 3
support and faulthandler was pulled into python in python 3.3
 2019-07-29 15:48:01 -04:00
Calen Pennington
5e8f90caa1 Revert "Convert a has_access check into a bridgekeeper rule" 2019-07-29 11:38:26 -04:00
Feanil Patel
21595eaefc Merge pull request #21198 from edx/feanil/update_sandbox_matplotlib 
Update matplotlib and numpy in codejail sandbox.
 2019-07-26 14:15:41 -04:00
Calen Pennington
7fba761050 Convert a has_access check into a bridgekeeper rule 2019-07-26 11:41:30 -04:00
Awais Qureshi
89d0f81855 Merge pull request #21216 from edx/awais786/BOM-68-django-wiki 
BOM-68-edx-django-wiki
 2019-07-26 12:57:24 +05:00
muhammad-ammar
e3e74788f6 bump edx-enterprise version to 1.8.6 2019-07-26 00:26:48 +05:00
Douglas Hall
642be6c8b6 Upgrade edx-enterprise to 1.8.5. (#21223) 2019-07-25 15:20:33 -04:00
Feanil Patel
e1b9869b26 Merge pull request #21194 from edx/feanil/remove_parsepy 
DEPR-41 Remove parsepy
 2019-07-25 10:25:08 -04:00
arbisoft
dbd66707e2 https://openedx.atlassian.net/browse/BOM-68 
Upgrade the django-wiki version.
 2019-07-25 14:29:57 +05:00
Ayub
4640641c9c Merge pull request #21201 from edx/BOM-69 
BOM-69
 2019-07-25 14:23:10 +05:00
Feanil Patel
1f7b12a38d Remove references to push notifications. 
Push notifications was only ever setup to connect to Parse.com a service
that has been discontinued.  Since we haven't replaced the functionality
for a few years now, remove this dead code.

In cms/templates/js/course_info_update.underscore we're allowing content
to not be escaped because this is by design according to the tests.
Long term there should be a better fix for this but for now this is
intended behavior.
 2019-07-24 11:45:46 -04:00
Muhammad Ammar
d7e5863714 Enterprise version bump 2019-07-24 14:21:49 +00:00
Ayub khan
ad7c77493a -upgrade ora to 2.2.6 2019-07-24 15:37:00 +05:00