Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
53,004 Commits 1 Branch 0 Tags
025d0f07cbcd844e14c8a99b44ea5cec393abd79
Commit Graph

53004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mahyar Damavand
025d0f07cb Reveal a message to be extracted 2020-01-26 18:46:46 +03:30
Jansen Kantor
25baa93af9 EDUCATOR-4877: Implement stubbed API functions using new config values (#22913) 
add stubbed api functions, tests
 2020-01-24 15:54:32 -05:00
Adam Butterworth
48d20e338b fix: video fullscreen must not assume resizer exists (#22935) 
Otherwise it fails to go fullscreen before playback
 2020-01-24 14:59:49 -05:00
edX cache uploader bot
811d45c1ae Updating Bokchoy testing database cache (#22933) 2020-01-24 14:30:24 -05:00
Diana Huang
600d51c45d Merge pull request #22934 from edx/diana/unpin-edx-rest-api-client 
Unpin edx-rest-api-client and make upgrade.
 2020-01-24 14:05:34 -05:00
Diana Huang
4c48e0e558 Unpin edx-rest-api-client and make upgrade. 2020-01-24 13:33:18 -05:00
Muhammad Ammar
52bfd3d6b8 Merge pull request #22931 from edx/ammar/upgrade-edx-enterprise-2.1.4 
upgrade edx-enterprise to 2.1.4
 2020-01-24 23:31:13 +05:00
Matthew Piatetsky
978f72cfac Merge pull request #22925 from edx/REV-1071 
[REV-1071] add more incomes
 2020-01-24 10:32:01 -05:00
Adam Butterworth
f0aa3daa87 Use Fullscreen API for video XBlock full screen mode (#22896) 
[TNL-7051] Clicking a video XBlock's fullscreen button now takes the video fullscreen instead of full window.

Gracefully fallback to full window if fullscreen apis are absent
 2020-01-24 09:48:41 -05:00
muhammad-ammar
043a5e44a8 upgrade edx-enterprise to 2.1.4 2020-01-24 19:13:35 +05:00
edX requirements bot
2b1134d7e1 Updating Python Requirements (#22929) 2020-01-24 08:47:30 -05:00
adeelehsan
796b81c2d8 Merge pull request #22877 from edx/aehsan/prod-1153/add_warning_in_certificate_template_asset_admin 
Warning added in admin
 2020-01-24 17:04:21 +05:00
adeelehsan
b44f1e9c1c Warning added in admin 
PROD-1153
 2020-01-24 16:31:42 +05:00
Syed Muhammad Dawoud Sheraz Ali
995f56454b Merge pull request #22887 from edx/dsheraz/PROD-1179 
modify URL generation in tinymce editor
 2020-01-24 12:27:03 +05:00
Usama Sadiq
52f6418430 Merge pull request #22904 from edx/usama/bom-1143 
BOM-1143 Django-auth-toolkit update
 2020-01-24 12:21:37 +05:00
DawoudSheraz
63d1b2bc9c modify URL generation in tinymce editor 2020-01-24 11:57:01 +05:00
usamasadiq
1e33a4f3ba BOM-1143 
Django-auth-toolkit update

Pinned the latest commit from github to get Django2.2 support in testing.
Pinned the zipp<2.0.0 to get Python<3.5 support too.
 2020-01-24 11:52:23 +05:00
Kyle McCormick
cdb0619846 Revert "Remove CourseOverview.get_from_id[s]_if_exists (#22918)" (#22926) 
This reverts commit 3ca006214e.
 2020-01-23 13:52:11 -05:00
Matthew Piatetsky
5779bd1584 add more incomes 2020-01-23 12:03:42 -05:00
Jeff Witt
9fa49606f8 update instruction text per W3C request 2020-01-23 11:35:59 -05:00
Manjinder Singh
d9b8fb6eb6 Constraining edx-rest-api-client (#22924) 
* Constraining edx-rest-api-client

* Decreased pin on edx-rest-api-client from <3.0.0 to <2.0.0
 2020-01-23 11:13:37 -05:00
Kyle McCormick
3ca006214e Remove CourseOverview.get_from_id[s]_if_exists (#22918) 
The functions `CourseOverview.get_from_id_if_exists`
and `CourseOverview.get_from_ids if exists` are bug-
prone, in that they do not go to the modulestore
when a CourseOverview is out-of-date or uncached.
The docstrings spell this out, but callers seem
not to understand the implications.

So, in this commit, we:
* Remove both functions
* Add `CourseOverview.get_from_ids` for almost-as-fast
  yet safer bulk-fetching of overviews
* Update call sites to use `course_exists` or `get_from_ids`
  in place of the old functions.
* Add tests for @verify_course_exists.
This PR should specifically fix an issue where
the program_enrollments API was breaking when the CourseOverview
version was bumped.

CR-1708
 2020-01-23 09:41:55 -05:00
Jeremy Bowman
7bbd229526 Unpin more outdated dependencies (#22898) 
Unpin several more outdated dependencies whose changelogs don't contain any significant backwards incompatible changes. Also add "moto" to the list of packages to uninstall from existing environments, since it requires a jsondiff version that clashes with the one we now use (triggering a harmless but distracting warning on dependency updates).

We can potentially stop using path.py/path altogether by switching to pathlib in the Python 3 standard library, but that merits a separate PR of its own.

Also, note that I'm not actually unpinning freezegun; different PRs restricted it in both constraints.txt and test.in, I'm just removing the latter redundant constraint.
 2020-01-23 06:59:32 -05:00
AsadAzam
cb8f95c838 Merge pull request #22906 from edx/asad/prod-1127 
Fixed bytes in filename
 2020-01-23 12:22:20 +05:00
M Zulqarnain
ec2ca0bd0e Merge pull request #22902 from edx/zulqarnain/BOM-1156 
BOM-1156 : Bridgekeeper Fork Update
 2020-01-23 12:21:31 +05:00
edX cache uploader bot
42d69d0e70 Updating Bokchoy testing database cache (#22917) 2020-01-22 11:51:17 -05:00
Abdul Hannan
c3b5eb900a Merge pull request #22746 from edx/rename_start_in_schedule_3.5/5 
Remove null, blank from start field in Schedules. Step 4/5
 2020-01-22 18:54:48 +05:00
hunytalk
73aae081c3 Remove null, blank from start field in Schedules 2020-01-22 18:10:33 +05:00
Ahtisham Shahid
df25e91648 Merge pull request #22900 from edx/ahtisham/PROD-726 
Updated border color on login page fields Ally
 2020-01-22 15:46:37 +05:00
adeelehsan
f711465862 Merge pull request #22885 from edx/aehsan/fetch_lms_root_url_from_configuration 
fetch lms root url using configuration helper
 2020-01-22 15:40:04 +05:00
Zulqarnain
c6e06b5327 Django 1.1 support of bridgekeeper 2020-01-22 14:25:43 +05:00
M Zulqarnain
4eea92640c Merge pull request #22907 from edx/zulqarnain/BOM-1132 
BOM-1132 : Change deprecated storage methods signatures
 2020-01-22 14:04:08 +05:00
Aarif
fd8c8f09e1 Merge pull request #22891 from edx/BOM-1148 
Added the app_name to URL inclusions to remove warnings - BOM-1148
 2020-01-22 12:50:36 +05:00
Ned Batchelder
2aeec06589 Merge pull request #22547 from edx/nedbat/api-docs-from-lib 
Use API doc tooling from its own library
 2020-01-21 11:39:21 -05:00
Ned Batchelder
079d17b899 Remove code that is now in edx_api_doc_tools 2020-01-21 11:15:41 -05:00
Ned Batchelder
7d7d6a655a make upgrade 2020-01-21 11:09:21 -05:00
Ned Batchelder
2b06a941b4 Use edx/api-doc-tools for api doc support 2020-01-21 11:09:21 -05:00
iamsobanjaved
38493d5092 Removed app_name warning from django.conf.urls.include() 2020-01-21 20:38:27 +05:00
Zia Fazal
209364ece3 Merge pull request #22884 from edx/ziafazal/ENT-2543 
ENT-2543: Added ability to add enrollment with GlobalStaff permissions
 2020-01-21 18:07:55 +05:00
zia.fazal@arbisoft.com
18f73c744c Added ability to add enrollment with GlobalStaff permissions 
added unit test

Reviewer feedback changes

Fixed broken test
 2020-01-21 17:28:47 +05:00
Zulqarnain
644a1fc0a6 Change deprecated methods signatures 2020-01-21 16:33:37 +05:00
asadazam93
86b3dfbc54 Fixed bytes in filename 2020-01-21 16:04:46 +05:00
Ahtisham Shahid
0ce89b70eb Merge pull request #22873 from edx/ahtisham/PROD-1126 
created separate const for search_index_update queue
 2020-01-21 11:45:46 +05:00
Ahtisham Shahid
03e7ec97aa Updated border color on login page fields 2020-01-20 16:40:59 +05:00
adeel khan
8f9dfaba49 Merge pull request #22892 from edx/adeel/prod_1178_add_remove_footer_logo 
Adds instagram and removes google-plus footer links
 2020-01-20 13:29:42 +05:00
edx-transifex-bot
e406aaa658 fix(i18n): update translations (#22899) 2020-01-20 13:28:44 +05:00
adeelehsan
35fb321a89 fetch lms root url using configuration helper 
PROD-1063:
 2020-01-20 12:58:34 +05:00
Aarif
84afadb4e7 Merge pull request #22886 from edx/BOM-1155 
Removed the deprecated app_name usage from lms/urls.py BOM-1155
 2020-01-20 12:09:08 +05:00
Brandon Baker
84ebcdf1ec Bump edx-enterprise to 2.1.0 (#22894) 2020-01-17 15:33:24 -05:00
Brandon Baker
4fc19f5d8c Add enterprise catalog url settings to CMS (#22895) 2020-01-17 14:26:42 -05:00