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

51784 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Feanil Patel
d9302ab73b Merge pull request #21982 from edx/feanil/revert_requirements_changes 
Revert requirements changes due to memory issues.
 2019-10-10 08:45:32 -04:00
Feanil Patel
5d7bdf91b1 Revert requirements changes due to memory issues. 
Some change in the requirements here may be responsible for increased
CPU and memory usage.  This is causing production LMS for edx.org to run
into lots of performance issues.  Reverting for now until we can narrow
it down to which change caused the issue.
 2019-10-09 16:47:26 -04:00
Chris Pappas
96aa11d9d3 Bumping edx-enterprise to 2.0.1 (#21944) 2019-10-07 12:50:01 -04:00
Jeremy Bowman
71e9c85dca Fix capa problem i18n BOM-775 (#21832) 2019-10-07 11:19:49 -04:00
Feanil Patel
9c6e3ce383 Merge pull request #21942 from edx/jenkins/upgrade-python-requirements-9a8f0ce 
Python Requirements Update
 2019-10-07 11:16:06 -04:00
Awais Qureshi
7905640df2 Merge pull request #21927 from edx/awais786/BOM-866 
BOM-866
 2019-10-07 19:24:42 +05:00
edX requirements bot
79b7a8d467 Updating Python Requirements 2019-10-07 06:48:37 -04:00
Awais Qureshi
79b00c9af4 BOM-866 
Dictionaries are being rendered into the HTML but in different order between python2 and python3 and failing tests in python3.
The function parses and sorts the dictionary so that we get ordered data that can be compared in tests cases.
 2019-10-07 15:00:41 +05:00
Aarif
9a8f0cee1d Merge pull request #21894 from edx/BOM-802 
Updated the comparison operation to calculate MongoDB's connection version - BOM-802
 2019-10-07 12:22:30 +05:00
Syed Muhammad Dawoud Sheraz Ali
f558bd7b0a Merge pull request #21872 from edx/dsheraz/PROD-760 
add information for missing annotation fields
 2019-10-07 11:22:58 +05:00
DawoudSheraz
aeeb76edd0 add information for missing annotation fields 2019-10-07 10:55:11 +05:00
edX Transifex Bot
855e973b37 fix(i18n): update translations 2019-10-06 17:18:17 -04:00
Feanil Patel
e5361038ff Merge pull request #21936 from edx/jenkins/upgrade-python-requirements-42ec910 
Python Requirements Update
 2019-10-04 14:39:39 -04:00
Calen Pennington
6c73361cf5 Merge pull request #21565 from cpennington/content-highlight-warning 
Downgrade content-highlights mismatches to warnings, and add the cour…
 2019-10-04 11:06:56 -04:00
Calen Pennington
c664fed716 Merge pull request #21928 from cpennington/absolute-path-bokchoy-uploads 
Use absolute paths to upload files in more bokchoy tests
 2019-10-04 10:36:08 -04:00
Calen Pennington
9a800fb180 Downgrade content-highlights mismatches to warnings, and add the course-key to the error message 2019-10-04 10:35:03 -04:00
Calen Pennington
5734e79b5d Use absolute paths to upload files in more bokchoy tests 2019-10-04 10:10:11 -04:00
edX requirements bot
ff1e18f358 Updating Python Requirements 2019-10-04 06:48:29 -04:00
Ayub
42ec910e07 Merge pull request #21922 from edx/BOM-788 
BOM-788
 2019-10-04 15:07:36 +05:00
Ayub
0b82a59db4 Merge pull request #21925 from edx/BOM-893 
BOM-893
 2019-10-04 11:23:40 +05:00
Chris Pappas
69bb6b582b ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2… (#21916) 
* ENT-2310, ENT-1289 | Running make upgrade to bump edx-enterprise to 2.0.0 (and 1.11.0)

* Skipping db_migration test for first part of removal of enterprisecustomerentitlements
 2019-10-03 16:55:55 -04:00
Stu Young
7de7bcb398 Revert "Upgrade edx-lint" (#21930) 2019-10-03 16:23:44 -04:00
Diana Huang
3599ee3878 Merge pull request #21912 from edx/diana/remove-notes 
Remove notes app and remaining js.
 2019-10-03 12:57:32 -04:00
Manjinder Singh
2213f524cf Merge pull request #21899 from edx/msingh/python3_test_parser_py 
BOM-749: Explicity creating byte strings
 2019-10-03 11:57:15 -04:00
Stu Young
31859fb930 remove flaky test (#21871) 2019-10-03 09:57:50 -04:00
Ayub khan
09843b993c BOM-893 
python3 compatibility: regex needs bytes type strings to check bytes type response
 2019-10-03 15:54:04 +05:00
Ayub khan
277afeb85e BOM-788 
python3 compatibility: etree returns a bytes type string so in py3 we need to decode it
to compare with a unicode string
 2019-10-03 15:26:36 +05:00
Aarif
8cf25ea81a Merge pull request #21883 from edx/BOM-874 
Updated the division operation to make the output compatible with both python versions - BOM-874
 2019-10-03 12:40:19 +05:00
Aarif
767a0a3a19 Merge pull request #21853 from edx/BOM-840 
BOM-840
 2019-10-03 11:19:14 +05:00
edX Transifex Bot
df6f54da9a geoip2: update maxmind geolite country database 2019-10-02 17:03:28 -04:00
Diana Huang
df32ffd37b Remove notes app and remaining js. 2019-10-02 15:00:37 -04:00
Diana Huang
c10292bc4a Merge pull request #21900 from edx/diana/notes-removal-migrations 
Drop notes tables.
 2019-10-02 14:46:30 -04:00
Diana Huang
f724f5b488 Add courseware migration. 2019-10-02 14:11:15 -04:00
Diana Huang
abf77b1ae1 Drop notes tables. 2019-10-02 14:11:15 -04:00
Manjinder Singh
84ccc9b41c Merge pull request #21829 from edx/msingh/type_error 
BOM-749: Fixing: a bytes-like object is required, not 'str'
 2019-10-02 12:45:36 -04:00
Feanil Patel
cf989502a1 Merge pull request #21830 from edx/jmbowman/BOM-774 
Fix deprecated drag and drop grading BOM-774
 2019-10-02 10:58:10 -04:00
Andytr1
69712ddd27 Merge pull request #21828 from edx/andytr1/4365-display-max-score-if-not-started 
EDUCATOR-4365 - display max score for not started assignment
 2019-10-02 10:44:09 -04:00
Feanil Patel
59ae37b3ba Merge pull request #21903 from edx/feanil/fix_date_mock 
Fix datetime mock to only mock the now function.
 2019-10-02 09:44:57 -04:00
Diana Huang
5e5c857208 Merge pull request #21902 from edx/diana/annotate-toggles 
Annotate a few of the course_experience waffle flags.
 2019-10-02 09:36:54 -04:00
atesker
e07635559c EDUCATOR-4365 - display max score for not started assignment 
pep8

moved includes

refactor 1

correted properties

update unit test

pep update

cr 2

made failure case a function
 2019-10-02 08:48:31 -04:00
adeel khan
dbaf7f2512 Merge pull request #21905 from edx/adeel/fix_missing_migration 
Adds migration for simulate publish command
 2019-10-02 15:40:11 +05:00
Adeel Khan
f11afb57a2 Adds migration for simulate publish command 
A rewording of help text caused django to create
a new migration for config model and that was not
initially pushed to master.
 2019-10-02 14:45:43 +05:00
aarif
86c7b9f809 updated the division operation to make the output compatible in python 2 and python 3 
changes made to fix quality errors

changes made to fix issues on BOM-587

minor changes made to fix quality issues

minor changes

removed unused pylint supression
 2019-10-02 14:01:08 +05:00
Aarif
6e13e061a7 Merge pull request #21863 from edx/BOM-758 
BOM-758
 2019-10-02 13:42:20 +05:00
aarif
c7a05ecf77 Updated the comparison operation to properly calculate mongo connection version 
minor changes made to fix quality issues

changes made as suggested

removed unused import statement
 2019-10-02 13:41:19 +05:00
aarif
e6470fb970 python 3 fixes 
changes made to fix quality errors

changes made to fix quality errors

minor changes
 2019-10-02 12:13:45 +05:00
Aarif
7be6acb880 Merge pull request #21856 from edx/BOM-851 
BOM-851
 2019-10-02 11:44:45 +05:00
Ned Batchelder
0fb36bf549 Merge pull request #21904 from edx/nedbat/revert-fancy-stacktrace 
See if this fancy stack trace was stopping newrelic
 2019-10-01 19:37:12 -04:00
Ned Batchelder
d3a1ca9f69 See if this fancy stack trace was stopping newrelic 2019-10-01 18:04:16 -04:00
Feanil Patel
3132982141 Fix datetime mock to only mock the now function. 2019-10-01 16:17:45 -04:00