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

17254 Commits

Author SHA1 Message Date
Aarif
8511c00ad9 Merge pull request #21529 from edx/BOM-131 
BOM-131 Python 3 fixes
 2019-09-11 16:17:18 +05:00
Ayub
bcad9519bc Merge pull request #21528 from edx/BOM-398 
BOM-398
 2019-09-11 12:29:24 +05:00
Braden MacDonald
48ee155af8 Minor fixes for blockstore runtime 2019-09-09 15:59:29 -07:00
edX cache uploader bot
dbc36a3241 Updating Bokchoy testing database cache (#21604) 2019-09-09 12:29:57 -04:00
Awais Qureshi
a57d1fd7da BOM-133 
python3 tests failures.
 2019-09-06 18:22:51 +05:00
edx-pipeline-bot
38cc1f0ab7 Merge pull request #21586 from edx/private_to_public_f98c819 
Mergeback PR from private to public.
 2019-09-06 12:32:38 +05:00
Awais Jibran
f98c819f74 Merge pull request #160 from edx/aj/add-noopener-to-new-window-urls 
Update hyperlinks in platfrom
 2019-09-06 11:43:38 +05:00
Ayub khan
df45007ce8 BOM-235 
python3 compatibility
 2019-09-05 16:32:57 +05:00
aarif
ec894ee10c python 3 fixes 
fixed test failures

fixed test failures

python 3 fixes

fixed test failures

fixed test failures

changes made as suggested

minor change
 2019-09-05 15:29:09 +05:00
Kyle McCormick
ea5652010c Create Python API for program_enrollments: Part I (#21511) 
This is the first in a series of commits to create
a Python API for the LMS program_enrollments app.
We do some general refactoring, renaming, and clean-up
in order to move toward the creation of that API.

EDUCATOR-4321
 2019-09-04 14:06:00 -04:00
Waheed Ahmed
6612423420 Merge pull request #21524 from edx/waheed/LEARNER-5114-fix-reset-password 
Fixed password reset for authenticated user.
 2019-09-04 16:26:44 +05:00
Brian Mesick
75e38fc4fd DEPR-18 Remove deprecated Notes LMS djangoapp (#21008) 2019-09-03 16:49:58 -04:00
Feanil Patel
3205cdab5f Merge pull request #21536 from edx/feanil/get_runserver_working 
Fix errors when running runserver in python 3.
 2019-09-03 11:06:25 -04:00
Feanil Patel
ca9cfb128c Fix errors when running runserver in python 3. 
- The fields need to be unicode not bytes.  In python 2 it was auto
converting.
- The static url base has been allowed to be a unicode string for a
while.
 2019-09-03 09:10:58 -04:00
Ayub khan
0dc180ddc3 BOM-398 
py3 combatibility - test fix
 2019-09-03 13:45:15 +05:00
Ayub khan
da9c71557b -Remove unicode and use six.text_type 2019-09-02 16:14:02 +05:00
Waheed Ahmed
9f80fd2b87 Fixed password reset for authenticated user. 
Password reset link for one user is working for other logged in users.
Fixed by verifying the token with request.user if authenticated.

LEARNER-5114
 2019-09-02 15:30:25 +05:00
Aarif
85f622f0e1 Merge pull request #21515 from edx/BOM-362 
BOM-362 Python 3 fixes
 2019-09-02 14:34:46 +05:00
Ayub khan
8e71206312 BOM-96 
-fixes all issues
 2019-09-02 13:30:33 +05:00
Aarif
40f4ab2b90 Merge pull request #21487 from edx/BOM-161 
BOM-161 Python 3 fixes
 2019-09-02 12:34:05 +05:00
edX cache uploader bot
37c599cbdc Updating Bokchoy testing database cache (#21519) 2019-08-30 16:29:46 -04:00
Braden MacDonald
d3f6ed09d8 Learning Contexts, New XBlock Runtime, Blockstore API Client + Content Libraries 
https://github.com/edx/edx-platform/pull/20645

This introduces:
* A new XBlock runtime that can read and write XBlocks that are persisted using
  Blockstore instead of Modulestore. The new runtime is currently isolated so
  that it can be tested without risk to the current courseware/runtime.
* Content Libraries v2, which store XBlocks in Blockstore not modulestore
* An API Client for Blockstore
* "Learning Context" plugin API. A learning context is a more abstract concept
  than a course; it's a collection of XBlocks that serves some learning purpose.
 2019-08-30 10:31:15 -07:00
aarif
e60f767fc4 python 3 fixes 
minor fix
 2019-08-30 18:01:16 +05:00
Aarif
924a1d2171 Merge pull request #21499 from edx/BOM-379 
BOM-379 Python 3 fixes
 2019-08-30 11:18:27 +05:00
aarif
d4924d661e python 3 fixes 2019-08-29 17:32:49 +05:00
edX Transifex Bot
2e92668e9e geoip2: update maxmind geolite country database 2019-08-28 16:58:30 -04:00
aarif
d355dbbef4 python 3 fixes 2019-08-28 16:34:48 +05:00
Awais Jibran
1a4eb7d2e8 Pervent reverse tabnabbing in edx platform 2019-08-28 16:08:34 +05:00
edX cache uploader bot
aa33743006 Updating Bokchoy testing database cache (#21471) 2019-08-27 15:42:12 -04:00
edX cache uploader bot
ac989e8211 Updating Bokchoy testing database cache (#21468) 2019-08-27 12:04:34 -04:00
Farhanah Sheets
5fa3024a54 Merge pull request #21441 from edx/azarembok/youtube-disable-flag 
PROD-202: Add per-course flag to block access to youtube videos.
 2019-08-27 10:16:29 -04:00
Ayub khan
8c4848ae35 BOM-397 
py3 compatibility and test fix
 2019-08-26 16:53:27 +05:00
Alan Zarembok
b953841893 PROD-202: Add per-course flag to block access to youtube videos. Can be set 
for courses that have lost access to their youtube channels.
 2019-08-25 14:45:16 -04:00
edX cache uploader bot
2b0d281ecf Updating Bokchoy testing database cache (#21438) 2019-08-23 16:49:02 -04:00
edX cache uploader bot
774f02d267 Updating Bokchoy testing database cache (#21434) 2019-08-23 11:13:14 -04:00
Ayub khan
67224f401a BOM-90 
Made all tests py3 compatible.
 2019-08-22 13:04:05 +05:00
noraiz-anwar
1c4f9da92d improved quality of multiple files 2019-08-22 12:47:08 +05:00
Ayub
85be57b64a Merge pull request #21397 from edx/BOM-95 
BOM-95
 2019-08-22 12:41:08 +05:00
edX cache uploader bot
f6b56edbb5 Updating Bokchoy testing database cache (#21401) 2019-08-21 13:09:06 -04:00
Feanil Patel
f332b81e4c Merge pull request #21384 from edx/bom/python-3-swarm 
Bom/python 3 swarm
 2019-08-21 09:27:59 -04:00
Ayub khan
8a95a8e520 BOM-95 
assertItemsEqual with six.assertCountEqual
 2019-08-21 17:01:40 +05:00
Bill DeRusha
aebdf77f8e Revert "PROD-145: Added validation to discussion topic input in studio, testing 2" 2019-08-20 20:31:15 -04:00
Feanil Patel
fde27196f9 Fix quality issues. 2019-08-20 18:02:30 -04:00
Feanil Patel
73a146fbbe Revert "assertItemsEqual() moved to assertCountEqual()" 
This reverts commit 3d2617983b.

The change was not quite right because the method six provides needs to
have `self` be passed in as well.  See the docs here:
https://six.readthedocs.io/#unittest-assertions

Reverting for now and we can fix it in smaller chunks later.
 2019-08-20 15:31:20 -04:00
Diana Huang
c94ffcdc72 Remove the microsites djangoapp. 2019-08-20 12:31:51 -04:00
edX cache uploader bot
be000cb8cd Updating Bokchoy testing database cache (#21379) 2019-08-20 11:29:33 -04:00
Feanil Patel
6e6c489f1f Merge pull request #21372 from edx/feanil/fix_cmp_issues 
Fix a few issues we run into when running tests in python 3.
 2019-08-20 11:28:23 -04:00
Dave St.Germain
3d2617983b assertItemsEqual() moved to assertCountEqual() 2019-08-19 17:00:17 -04:00
Dave St.Germain
a3b52662d1 Prevent changing dict while iterating 2019-08-19 16:27:04 -04:00
Dave St.Germain
aaf7ddd3f3 Correctly encode and decode 2019-08-19 16:08:38 -04:00