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

51338 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aarif
12eaf050dc Merge pull request #21658 from edx/BOM-480 
BOM-480
 2019-09-17 13:46:41 +05:00
Aarif
ba3a7e733d Merge pull request #21651 from edx/BOM-473 
BOM-473
 2019-09-17 13:45:07 +05:00
Aarif
0225162c67 Merge pull request #21654 from edx/BOM-476 
BOM-476
 2019-09-17 12:37:22 +05:00
Ayub
eefa0092d0 Merge pull request #21669 from edx/BOM-450 
BOM-450
 2019-09-17 10:12:05 +05:00
Hassan
f96c71143e Merge pull request #21639 from edx/hassan/initial-history 
Added management command to populate initial history.
 2019-09-17 03:54:19 +05:00
Douglas Hall
bd4db303d6 Upgrading various packages. (#21674) 2019-09-16 18:27:24 -04:00
Hassan Javeed
092da8c5f4 Management command to insert initial historical records. 2019-09-17 03:13:07 +05:00
Feanil Patel
9c0bd39e67 Merge pull request #21671 from edx/feanil/more_bokchoy_fixes 
Feanil/more bokchoy fixes
 2019-09-16 17:01:09 -04:00
Feanil Patel
fb59752c75 Need to return a unicode string in the xml factory. 
The underlying data is put into json documents that expect unicode
strings not byte strings.  In python2 lxml provided strings that were
auto coerced but in python3 it provides byte strings.
 2019-09-16 11:30:05 -04:00
Feanil Patel
a3d39eaeb6 JSON takes unicode as input. 
In python2 there would be some auto coercion done so that the orginal
code here works but that's not the case in python 3.
 2019-09-16 11:30:05 -04:00
Feanil Patel
f8129721d9 Fix failure during cms startup. 2019-09-16 11:30:05 -04:00
Ayub khan
89b48d3723 BOM-450 
python3 compatibility
 2019-09-16 17:06:39 +05:00
aarif
e791325f6c quality fixes 2019-09-16 17:02:33 +05:00
aarif
38ad965c2e test fixes 2019-09-16 16:36:12 +05:00
aarif
602b6d4607 minor fixes 2019-09-16 15:59:02 +05:00
Ned Batchelder
a4f03620a4 Merge pull request #21645 from edx/nedbat/no-pipes-on-logout 
Remove extraneous pipes
 2019-09-16 06:41:27 -04:00
Aarif
04758b47b3 Merge pull request #21558 from edx/BOM-366 
BOM-366
 2019-09-16 13:52:02 +05:00
aarif
cde8a2a62a python 3 fixes 
changes made as suggested

minor change

changes made as suggested

test fixes for python 2

removed debug statement

quality fixes

quality fix

quality fix
 2019-09-16 13:13:45 +05:00
Aarif
7012bcea94 Merge pull request #21653 from edx/BOM-475 
BOM-475
 2019-09-16 12:55:12 +05:00
Ayub
7b186b2f52 Merge pull request #21656 from edx/BOM-420 
BOM-420
 2019-09-16 12:26:46 +05:00
Awais Qureshi
851702e09e Merge pull request #21660 from edx/awais786/BOM-479 
BOM-479
 2019-09-16 11:18:48 +05:00
Ayub
71a593f68c Merge pull request #21641 from edx/BOM-435 
BOM-435
 2019-09-16 09:58:50 +05:00
edX Transifex Bot
3aee9049ad fix(i18n): update translations 2019-09-15 17:18:07 -04:00
Awais Qureshi
f6537586d6 BOM-479 
Fixing python3
 2019-09-15 00:23:39 +05:00
David Ormsbee
d98de5cf3a Merge pull request #21595 from open-craft/blockstore-key-changes 
Blockstore opaque keys moved to external repo
 2019-09-13 17:50:38 -04:00
Awais Qureshi
5b8e194f81 Merge pull request #21657 from edx/awais786/BOM-478 
BOM-478
 2019-09-14 02:03:03 +05:00
Awais Qureshi
f2a9df0687 Merge pull request #21655 from edx/awais786/BOM-477 
BOM-477
 2019-09-14 02:01:35 +05:00
Braden MacDonald
ec97387d3e Move new Blockstore key types to external opaque-keys library. 2019-09-13 09:56:44 -07:00
Kyle McCormick
6c89f61770 Add a simple pull request template. 2019-09-13 12:32:56 -04:00
Matt Hughes
4957b981a4 Only delete latest grade override if it came from proctoring 
... on proctored exam attempt deletion

JIRA:EDUCATOR-4642
 2019-09-13 11:54:32 -04:00
Michael Terry
e80b76c3db Merge pull request #21659 from edx/mikix/depr-44 
Drop RUN_AS_ANALYTICS_SERVER_ENABLED
 2019-09-13 10:27:41 -04:00
aarif
701e574fc3 python 3 fixes 2019-09-13 18:48:01 +05:00
Ayub khan
06c7e3e4e9 BOM-420 
fixed all file tests
 2019-09-13 18:39:00 +05:00
Michael Terry
45d48e07cd Drop RUN_AS_ANALYTICS_SERVER_ENABLED 
This is an ancient feature flag that uses an archived and
unsupported support library (edinsights, edx/insights).

DEPR-44
 2019-09-13 09:30:02 -04:00
Awais Qureshi
1de1e72b43 BOM-478 
Fixing python3
 2019-09-13 18:29:08 +05:00
aarif
d95474e060 python 3 fixes 
further fixes
 2019-09-13 17:34:47 +05:00
Awais Qureshi
68ecbc0432 BOM-477 
Fixing python3
 2019-09-13 17:31:02 +05:00
aarif
0690178446 python 3 fixes 2019-09-13 17:02:39 +05:00
aarif
ae8126bf98 python 3 fixes 2019-09-13 16:50:20 +05:00
Ayub
aeecabbe0d Merge pull request #21628 from edx/BOM-405 
BOM-405
 2019-09-13 16:21:05 +05:00
Ayub khan
f0a16d2aea BOM-455 
python3 compatibility
 2019-09-13 15:35:18 +05:00
Ayub khan
a0e0b13eae BOM-435 
python3 compatibility
 2019-09-13 15:32:16 +05:00
adeelehsan
89c57a636a Merge pull request #21572 from edx/aehsan/learner-3838/user_agent_regex_updated_for_mobile_platform 
user agent regex updated in mobile platform
 2019-09-13 15:05:52 +05:00
Aarif
072f878b90 Merge pull request #21637 from edx/BOM-446 
BOM-446
 2019-09-13 14:40:36 +05:00
Aarif
616ee00437 Merge pull request #21621 from edx/BOM-412 
BOM-412
 2019-09-13 12:01:07 +05:00
Kyle McCormick
1eb6c884bb Upgrade requirements, specifically ora2==2.3.1 
PR #21614 made this upgrade, but it was accidentally
undone by a later PR that merged an out-of-date
'make upgrade'.

EDUCATOR-4635
 2019-09-12 17:05:22 -04:00
edX Transifex Bot
d343f273a8 fix(i18n): update translations 2019-09-12 15:51:49 -04:00
Kyle McCormick
358f989131 Create Python API for program_enrollments: Part III 
This is the third in a series of commits to create
a Python API for the LMS program_enrollments app.
It does the following:
* Creates api/ folder.
* Moves link_program_enrollments.py to api/linking.py
* Creates api/reading.py for enrollment-fetching
  functions.
* Updates rest of app to use api/reading.py when
  it was going directly through the models before.
* Other misc. cleanup (isorting, unicode_literals,
  line breaks, etc).

Still to do:
* Create api/writing.py and update app to use it instead
  of going directly through models.
* Create api/reset.py and api/expire.py, which the management
  commands call out to.

EDUCATOR-4321
 2019-09-12 14:54:03 -04:00
Kyle McCormick
77aacee6ed Add query util read_replica_or_default() 
This is similar to use_read_replica_if_available(),
but it just returns either 'read_replica' or
'default', for use with the Django ORM using()
method. Syntactically, it fits nicer with queryset
method-call chains.
 2019-09-12 14:54:03 -04:00
Kyle McCormick
7c10e03ce4 Fix CourseOverview factory timezone unawareness warnings 2019-09-12 14:54:03 -04:00