Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

12296 Commits

Author SHA1 Message Date
David Ormsbee
993e9630b4 Merge pull request #21677 from open-craft/samuel/fix-migration-crash 
SE-1553 conditionally run migration on CSMH Extended table
 2019-09-17 13:19:40 -04:00
Stu Young
13bbf85257 clean up toggle annotations (#21673) 
clean up toggle annotations and lint when running feature toggle report
 2019-09-17 11:11:20 -04:00
Awais Qureshi
a4428d751d BOM-422 
Fixing python3
 2019-09-17 19:00:05 +05:00
Ayub khan
d34eba0e9c BOM-438 
Python3 compatibility.
 2019-09-17 16:08:32 +05:00
Samuel Walladge
eeedc39b3e conditionally run migration on CSMH Extended table 
CSMH_EXTENDED is optional, so this table is not guaranteed to exist.
 2019-09-17 11:00:17 +09:30
Ayub
7b186b2f52 Merge pull request #21656 from edx/BOM-420 
BOM-420
 2019-09-16 12:26:46 +05: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
Ayub khan
06c7e3e4e9 BOM-420 
fixed all file tests
 2019-09-13 18:39:00 +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
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
Awais Qureshi
1dde3c354a Merge pull request #21642 from edx/awais786/BOM-472 
BOM-472
 2019-09-12 21:30:30 +05:00
Awais Qureshi
ab50ee96ec Merge pull request #21636 from edx/BOM-411 
BOM-411
 2019-09-12 21:23:58 +05:00
Awais Qureshi
dfb00f95b5 BOM-411 
Fixing python3
 2019-09-12 19:12:37 +05:00
Awais Qureshi
fd2b7b65e2 BOM-471 
Fixing python3
 2019-09-12 19:09:59 +05:00
Awais Qureshi
fac33c275d BOM-472 
Fixing python3
 2019-09-12 19:08:23 +05:00
aarif
9301ec38f3 python 3 fixes 2019-09-12 17:29:34 +05:00
aarif
dba8a23144 python 3 fixes 
test fixes

changes made as suggested

updated the variable name
 2019-09-12 15:32:19 +05:00
Ayub
b536b4acaf Merge pull request #21554 from edx/BOM-238 
BOM-238
 2019-09-12 12:34:28 +05:00
Awais Qureshi
9d4ac90b62 Merge pull request #21611 from edx/awais786/BOM-404 
BOM-404
 2019-09-11 19:04:32 +05:00
Awais Qureshi
2338c34abd Merge pull request #21620 from edx/awais786/BOM-409 
BOM-409
 2019-09-11 19:03:01 +05:00
Awais Qureshi
f528e31b76 Merge pull request #21619 from edx/awais786/BOM-416 
Awais786/bom 416
 2019-09-11 19:01:22 +05:00
Awais Qureshi
762db8a2df Merge pull request #21624 from edx/awais786/BOM-426 
BOM-426
 2019-09-11 18:59:28 +05:00
Awais Qureshi
16e3ae71c1 BOM-426 
Fixing python3
 2019-09-11 17:17:00 +05:00
Ayub
82bddf12ab Merge pull request #21578 from edx/BOM-106 
BOM-106
 2019-09-11 16:44:27 +05:00
Ayub khan
7bc093eee9 BOM-238 
python3 compatibility
 2019-09-11 16:39:52 +05:00
Awais Qureshi
441e6b57b2 BOM-409 
Fixing python3
 2019-09-11 16:17:30 +05:00
Aarif
8511c00ad9 Merge pull request #21529 from edx/BOM-131 
BOM-131 Python 3 fixes
 2019-09-11 16:17:18 +05:00
Awais Qureshi
ff98318aa4 BOM-416 
Fixing python3
 2019-09-11 16:04:06 +05:00
Ayub khan
8f65e6923b BOM-106 
python3 compatibility
 2019-09-11 16:03:58 +05:00
Awais Qureshi
d1de513cdf BOM-410 
Fixing python3
 2019-09-11 15:18:30 +05:00
Ayub khan
26d9866bb2 BOM-123 
Removed broken tests.
 2019-09-11 14:24:59 +05:00
Awais Qureshi
98ec44b56c BOM-404 
Fixing python3
 2019-09-11 12:52:56 +05:00
Ben Holt
8bb52f177f REV-935 add api endpoint to decide if mobile should show upsell (#21612) 
Add experimental api endpoint for mobile upsell experiment, more unit tests coming soon
 2019-09-10 14:08:54 -04:00
Brittney Exline
90e5fa90b9 ENT-2230 Fix import errors by adding __init__.py file 2019-09-09 13:35:40 -06:00
Kyle McCormick
52be01a577 Document temporary program_enrollments API to edx-enterprise (#21605) 
See https://github.com/edx/edx-platform/pull/21511#pullrequestreview-285556560
for more context.
 2019-09-09 13:12:31 -04:00
Feanil Patel
78b488dcf3 Merge pull request #21597 from amitvadhel/BOM-429 
BOM-429 | decoding for CSV response
 2019-09-09 11:39:18 -04:00
Brittney Exline
cc2850500b Merge pull request #21593 from edx/bexline/upgrade_enterprise 
ENT-2230 Upgrade edx-enterprise to 1.9.12
 2019-09-09 09:23:07 -06:00
Feanil Patel
002cc9e52d Merge pull request #21600 from amitvadhel/BOM-442 
BOM-442 | Response decoding for RssProxyViewTests
 2019-09-09 10:58:25 -04:00
Feanil Patel
7d93eb85f0 Merge pull request #21596 from amitvadhel/BOM-423 
BOM-423 | Fixes for Python 3 decoding
 2019-09-09 10:56:58 -04:00
Brittney Exline
d35218a820 ENT-2230 Upgrade edx-enterprise to 1.9.12 2019-09-09 08:52:01 -06:00
amitvadhel
a5a0403444 Response decoding for RssProxyViewTests 2019-09-08 13:34:52 +03:00
amitvadhel
b0c28187b6 Fixes decoding for csv response 2019-09-08 11:10:46 +03:00
amitvadhel
9daa1528fa Fixes for Python 3 decoding 2019-09-08 10:33:06 +03:00
Ayub
e27439772d Merge pull request #21551 from edx/BOM-280 
BOM-280
 2019-09-06 15:38:41 +05:00
Ayub
48b0afaa9a Merge pull request #21550 from edx/BOM-288 
BOM-288
 2019-09-06 15:08:13 +05:00
Ayub khan
5ab7d84d76 BOM-280 
python3 compatibility
 2019-09-06 15:03:07 +05:00
adeelehsan
808f1ad156 user agent regex updated in mobile platform 
learner-3838
 2019-09-06 14:57:20 +05:00
Awais Qureshi
510e0577ba Merge pull request #21573 from edx/awais786/BOM-137 
BOM-137
 2019-09-06 13:05:35 +05:00