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

51766 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Diana Huang
ff795347dd Annotate a few of the course_experience waffle flags. 2019-10-01 16:03:36 -04:00
David J. Malan
680f62278c AccessTokenView: support for X-Token-Type in HTTP header (#21662) 
* AccessTokenView: support for X-Token-Type in HTTP header
 2019-10-01 15:57:21 -04:00
Calen Pennington
62300b922c Merge pull request #21897 from cpennington/absolute-path-bokchoy-uploads 
Use absolute paths to upload files in video tests
 2019-10-01 14:57:06 -04:00
Calen Pennington
b70d8e68c5 Merge pull request #21870 from cpennington/upgrade-edx-lint 
Upgrade edx-lint
 2019-10-01 14:56:20 -04:00
Feanil Patel
3dd8decd23 Merge pull request #21888 from edx/jenkins/upgrade-python-requirements-27aa7e4 
Python Requirements Update
 2019-10-01 14:01:47 -04:00
Calen Pennington
2fa5ff0067 TEST: increase the timeout on the linting jobs 2019-10-01 14:00:54 -04:00
Calen Pennington
86be8d124a Upgrade edx-lint 2019-10-01 14:00:54 -04:00
jinder1s
3dc35dc09c Explicity creating byte strings 2019-10-01 13:43:45 -04:00
Calen Pennington
8e0f90045a Use absolute paths to upload files in video tests 2019-10-01 13:04:58 -04:00
irfanuddinahmad
657d533efe Merge pull request #21896 from edx/iahmad/ENT-2223-Version-upgrade-for-edx-enterprise 
ENT-2223: Version upgrade for edx-enterprise
 2019-10-01 20:06:27 +05:00
root
a9564a622d Version upgrade for edx-enterprise 2019-10-01 14:18:28 +00:00
edX requirements bot
881861346d Updating Python Requirements 2019-10-01 06:48:26 -04:00
Ayub
27aa7e4abf Merge pull request #21806 from edx/BOM-609 
BOM-609
 2019-10-01 12:10:38 +05:00
Ayub
f4ca2035f9 Merge pull request #21861 from edx/BOM-850 
BOM-850
 2019-10-01 12:00:06 +05:00
Aarif
bc6821ce53 Merge pull request #21810 from edx/BOM-745 
BOM-745
 2019-10-01 11:58:09 +05:00
Ayub khan
b5dc95a30d BOM-609 
python3 compatibility
 2019-10-01 11:33:37 +05:00
Ayub khan
c29b7520a1 BOM-850 
python3 compatibility
 2019-10-01 10:56:00 +05:00
Ayub
2de3667c85 Merge pull request #21804 from edx/BOM-613 
BOM-613
 2019-10-01 10:41:31 +05:00