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

17978 Commits

Author SHA1 Message Date
Aarif
765942d7d2 Updated the template loaders to make them compatible with django 1.11,2.0 and above 2020-03-28 13:27:38 +05:00
Ned Batchelder
136003fcff Merge pull request #23015 from Abstract-Tech/fix/non-admin-error-descriptor 
Add xblock.v1 and xmodule.v1 entrypoints for NonStaffErrorDescriptor
 2020-03-27 17:43:16 -04:00
Ahtisham Shahid
42ccc5564c Merge pull request #23498 from edx/ahtisham/PROD-1232 
Fixed \n escape issue in import-export
 2020-03-27 18:39:29 +05:00
edX cache uploader bot
a7494b22fc Updating Bokchoy testing database cache (#23511) 2020-03-27 08:58:58 -04:00
AsadAzam
15f73195e4 Merge pull request #23451 from edx/asad/prod-1369 
Fixed comparison mismatch
 2020-03-27 14:00:36 +05:00
Ahtisham Shahid
f264e5dd03 fixed \n escape issue in import 
updated test

updated test
 2020-03-27 12:29:32 +05:00
Nick
f37c860c87 Merge pull request #23448 from edx/ndalfonso/AA-38-calendar-sync-email-template 
AA-38 calendar sync email template
 2020-03-26 08:51:53 -04:00
asadazam93
fc3e63714e Fixed comparison mismatch 2020-03-26 14:11:31 +05:00
Waheed Ahmed
ccbd353201 Revert "Allow Block Structures Collect to work in Studio" 2020-03-26 13:22:10 +05:00
Nicholas D'Alfonso
52309d5541 AA-38 calendar sync email template 
- create templates and methods to build/send calendar sync emails.
 2020-03-25 16:40:19 -04:00
edX cache uploader bot
a43edcb026 Updating Bokchoy testing database cache (#23494) 2020-03-25 15:11:34 -04:00
Awais Jibran
3ff96ef6be Merge pull request #23479 from edx/logs-cleanup 
Logs cleanup
 2020-03-25 19:53:35 +05:00
Awais Jibran
bb4b38b30b Do not log after sending activation email 2020-03-25 11:54:28 +05:00
Feanil Patel
6367962846 Get rid of 2 flaky a11y tests. 2020-03-24 16:27:32 -04:00
Adeel Khan
5cbcd0e952 Reducing play button opacity to improve viewing experience. 
This patch lowers the opacity for play button
enabling learners unhindered learning experience
when on video pause.

PROD_1231
 2020-03-20 23:39:07 +05:00
uzairr
471d7311bf Update bulk un-enroll management command 
PROD-1370
 2020-03-20 20:33:24 +05:00
Awais Jibran
e398d9f748 Merge pull request #23442 from edx/logs-cleanup 
Fix DeprecationWarning
 2020-03-20 11:28:52 +05:00
Jansen Kantor
21c6d6b08d EDUCATOR-4952: Allow Users to join one team per open teamset (#23423) 
*allow users to join one team per teamset
 2020-03-19 13:56:35 -04:00
Awais Jibran
9f74ea044b Fix DeprecationWarning 2020-03-19 14:23:46 +05:00
Dillon Dumesnil
78baddb60f Merge pull request #23445 from edx/ddumesnil/date-comment 
Adding comment about div that can't be removed.
 2020-03-18 13:11:11 -07:00
Dillon Dumesnil
b9e6fdfdef Adding comment about div that can't be removed. 
Also fixing Meta class being defined twice in one model
 2020-03-18 11:45:19 -07:00
edX cache uploader bot
650a5679a4 Updating Bokchoy testing database cache (#23444) 2020-03-18 14:30:58 -04:00
Matt Tuchfarber
2559c42836 Merge pull request #23330 from edx/tuchfarber/add_dashboard_context 
Allow plugins to update contexts in specific views
 2020-03-18 10:29:56 -04:00
Matt Tuchfarber
0a8b06a122 Lints and final tweaks 2020-03-17 22:19:22 -04:00
edX cache uploader bot
ebb739af86 Updating Bokchoy testing database cache (#23434) 2020-03-17 18:00:30 -04:00
Cory Lee
c02d761045 Reenabling test now that the renames on the schedules table are completed (#23388) 
* Reenabling this since the renames on the schedules table are completed

* Reverting regex change that caused migration to be generated for userprofile
 2020-03-17 16:23:14 -04:00
Matt Hughes
acce8baca4 Add management command for retroactively adding sso IdV for IdP 
We sometimes update preexisting SAML SSO providers to configure them
to automatically create SSO identity verification (IdV) records when a
learner links an account via that provider. Turning that configuration
from off to on does make it such that when learners log back in via
their linked account, a new IdV record will be created for them. But
it's possible we'd want this process to happen more automatically and
seamlessly, for which this management command will be helpful.

Note that this does not help with removing SSO verification records
for a provider for which this configuration has been turned off.

JIRA:EDUCATOR-4947
 2020-03-17 16:04:24 -04:00
edX cache uploader bot
391f155b3e Updating Bokchoy testing database cache (#23430) 2020-03-17 14:31:14 -04:00
adeelehsan
6f7585c6b7 Merge pull request #23426 from edx/aehsan/configuration_model_added_for_recover_account_command 
Configuration model added for account recover command
 2020-03-17 20:59:06 +05:00
Thomas Tracy
4d9f20689a MICROBA-253 add phone number field api for coaching plugin (#23406) 
* MICROBA-253 add phone number field api for coaching plugin

* Remove hardcoded value

* Requested changes

* Add logger to models_api.py for student
* Import model with underscore to prevent exporting
* Moved return outside of try/catch block

* Add docstring

* whitespace
 2020-03-17 11:52:27 -04:00
adeelehsan
2131ebf03d Configuration model added for account recover command 2020-03-17 19:43:53 +05:00
edX cache uploader bot
efbd8c6684 Updating Bokchoy testing database cache (#23415) 2020-03-16 16:02:20 -04:00
adeelehsan
9608528cb3 Merge pull request #23395 from edx/aehsan/prod-1361/command_for_account_recovery 
Command added to recover learner accounts
 2020-03-16 19:59:28 +05:00
adeelehsan
c0f9053ddb Command added to recover accounts 
PROD-1361
 2020-03-16 19:23:26 +05:00
edX cache uploader bot
747cdd1ecb Updating Bokchoy testing database cache (#23401) 2020-03-13 15:36:19 -04:00
Matt Tuchfarber
fc3bc032b9 Update with suggestions: 
- Add ADR describing Plugin Contexts
- Remove app-specific constants from framework-level code
- Add dashboard constants to student app with README
 2020-03-13 15:14:37 -04:00
Abdul Hannan
fa6633ba4e DO NOT MERGE - NEED FAKE - Rename start in schedule 5/5 (#22392) 
* Remove start field in Schedules

Co-authored-by: hunytalk <ahannan@edx.org>
Co-authored-by: Cory Lee <cory@edx.org>
 2020-03-12 15:40:19 -04:00
edX cache uploader bot
c5db2b2cce Updating Bokchoy testing database cache (#23382) 2020-03-12 13:10:02 -04:00
Awais Jibran
ebd6494af2 Merge pull request #23380 from edx/logs-cleanup 
Remove unnecessary logs.
 2020-03-12 16:38:54 +05:00
Awais Jibran
084b409662 Unnecessary logs. 2020-03-12 15:15:22 +05:00
edX cache uploader bot
a277237f9d Updating Bokchoy testing database cache (#23376) 2020-03-11 14:12:02 -04:00
Calen Pennington
5a33c4b5ee Merge pull request #23357 from edx/mikix/reset-on-mode 
Reset schedule when mode changes
 2020-03-11 13:05:39 -04:00
Michael Terry
f56a01adbe Reset schedule when mode changes 
This way if an audit user upgrades a self paced course to verified,
their schedule will reset to the current time.

AA-60
 2020-03-11 11:53:49 -04:00
Waheed Ahmed
f54b9a42e7 Disallow NaN value for speed key. 
The VideoBlock `handle_ajax` is allowing NaN values for speed key
and causing videos to not load. Also added a data migration to fix
the data for learners.

PROD-1148
 2020-03-11 18:45:49 +05:00
Ahtisham Shahid
1014f1941b Merge pull request #23340 from edx/ahtisham/PROD-1326 
update added workaround for CSV report  error
 2020-03-11 15:48:20 +05:00
edX cache uploader bot
5fb02b181c Updating Bokchoy testing database cache (#23366) 2020-03-10 15:00:10 -04:00
edX cache uploader bot
af7103c313 Updating Bokchoy testing database cache (#23352) 2020-03-09 15:09:59 -04:00
edX cache uploader bot
8914fafaad Updating Bokchoy testing database cache (#23345) 2020-03-09 10:09:11 -04:00
Troy Sankey
02d8913339 Merge pull request #22753 from edx/juliasq/rename_site_configuration_siteconfiguration_values_3 
Rename values in SiteConfiguration/History (3/3)
 2020-03-09 09:32:40 -04:00
Ahtisham Shahid
ef40efae9b update added workaround for csv error 2020-03-09 17:35:12 +05:00