Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
56,048 Commits 1 Branch 0 Tags
860c680caaefed01748e3775e7cfd28d61580d9b
Commit Graph

56048 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unknown
860c680caa Replace "+" in print with the more idiomatic "," 2020-10-08 12:35:40 -04:00
unknown
3c119ecf10 Correct DemoX Code Grader solution 
the Show Answer button displays an answer that returns a SyntaxError:
invalid syntax

this commit corrects the print call by wrapping the int with str() for
proper type conversion and concatenates the sub strings inside parens
 2020-10-08 03:22:55 -04:00
edX Transifex Bot
ef73c68a20 geoip2: update maxmind geolite country database 2020-10-07 17:23:56 -04:00
Alex Dusenbery
cf77a80be5 Upgrade edx-enterprise to 3.8.31 2020-10-07 15:26:14 -04:00
David Ormsbee
5fbc501b23 Merge pull request #21594 from open-craft/guruprasad/fix-non-activated-users-can-access-enrolled-courses 
[BB-1504] Fix the automatic enrollment issue for inactive user
 2020-10-07 13:01:30 -04:00
David Ormsbee
8b2b9b5c74 Merge pull request #23174 from open-craft/agrendalath/add_course_id_to_html_block 
[BB-2088] Add %%COURSE_ID%% to html block
 2020-10-07 12:36:36 -04:00
Jansen Kantor
2667d8766e prevent max_team_size from exceeding 500 (#25267) 2020-10-07 12:02:48 -04:00
Carla Duarte
13cb6d4c57 Merge pull request #25174 from edx/ciduarte/AA-371 
AA-371: Progress Milestone Waffle Flags
 2020-10-07 10:03:33 -04:00
Carla Duarte
080f04c18c AA-371: Progress Milestone Waffle Flags 2020-10-07 09:36:07 -04:00
Muhammad Ammar
e0de14bc56 Merge pull request #25279 from edx/ammar/ent-3442-upgrade-edx-enterprise 
upgrade edx-enterprise
 2020-10-07 17:48:23 +05:00
muhammad-ammar
28689b5003 upgrade edx-enterprise 
ENT-3442
 2020-10-07 16:51:50 +05:00
edx-pipeline-bot
506f580108 Merge pull request #25275 from edx/private_to_public_ba96336 
Mergeback PR from private to public.
 2020-10-07 13:54:26 +05:00
Ali Akbar
ba96336307 Merge pull request #204 from edx/sustaining/security-fixes-6 
Sustaining security fixes 6
 2020-10-07 13:06:07 +05:00
Aarif
76e15a9394 Python Requirements Update (#25272) 2020-10-07 12:46:22 +05:00
Hammad Ahmad Waqas
fc1d7d2318 Merge pull request #25228 from edx/hammad/ENT-3523 
ENT-3523 | Handle Client Error for the API called in refund_order_voucher signal.
 2020-10-07 12:29:42 +05:00
HammadAhmadWaqas
215d004930 Handle Client Error for the API called in refund_order_voucher signal. 2020-10-07 11:28:26 +05:00
edX requirements bot
5bcb288ef7 Updating Python Requirements 2020-10-07 00:48:26 -04:00
Andytr1
b4f144ef62 EDUCATOR-5304 - update help text (#25264) 
* EDUCATOR-5304 - update help text

* EDUCATOR-5304 - update help text - escape underscore

* EDUCATOR-5304 - update help text - escape underscore 2
 2020-10-06 16:30:02 -04:00
Binod Pant
5f68f2f1e2 upgrade to enterprise 3.8.28 blackboard exporter (#25268) 2020-10-06 14:31:11 -04:00
Dillon Dumesnil
4c7b9bafd9 Merge pull request #25265 from edx/ddumesnil/small-fix 
Check if effective_user is anonymous before trying to get grade
 2020-10-06 10:51:50 -07:00
Dillon Dumesnil
fa2277bb6b Check if effective_user is anonymous before trying to get grade 
I saw locally that it caused an error if you hit the endpoint directly
so just being defensive.
 2020-10-06 12:49:03 -04:00
Alex Dusenbery
5a66ed1c41 ENT-3520 | Define enterprise service usernames as a simple list of strings. Upgrade edx-enterprise to 3.8.27 2020-10-06 09:11:30 -04:00
adeelehsan
593cdaa569 Merge pull request #25257 from edx/aehsan/van-80/suppressed_select_fields_in_logistratoin_form 
suppressed select field for logistration forms
 2020-10-06 14:41:49 +05:00
adeelehsan
a50215031e Merge pull request #25227 from edx/aehsan/van-81/suppressed_email_for_forgot_password 
suppressed email in forgot password banner
 2020-10-06 14:41:27 +05:00
adeelehsan
07352b84ac suppressed select form fields 
VAN-80
 2020-10-06 10:52:22 +05:00
Aarif
420d275474 Python Requirements Update (#25254) 2020-10-06 10:34:18 +05:00
Nadeem Shahzad
6fff141fb2 Merge pull request #25253 from edx/github-actions-mysqldbdump/5bc6829df6bef0eceff8d83d8f65c64117c4a0c9 
edxapp MySQL database dump
 2020-10-06 09:56:24 +05:00
edX requirements bot
e641dbe7e5 Updating Python Requirements 2020-10-06 00:49:14 -04:00
GitHub Actions MySQLdbdump automation
b4125f4f51 MySQLdbdump 2020-10-06 04:13:37 +00:00
Nadeem Shahzad
5bc6829df6 Merge pull request #25209 from edx/nadeem/merge_dbdump_pr 
github action to automerge dbdump PRs
 2020-10-06 08:55:32 +05:00
nadeemshahzad
3aa6f55cef github action to automerge dbdump PRs 2020-10-06 02:43:53 +00:00
Jansen Kantor
45c54ee6a5 log grade policy changes (#25247) 
* log grade policy changes

* quality
 2020-10-05 19:58:33 -04:00
Jansen Kantor
fb626cd072 update docs (#25248) 
* update docs

* obscure urls
 2020-10-05 17:28:48 -04:00
Ned Batchelder
17bc82c11a Merge pull request #25086 from edx/nedbat/logout-login 
Don't use "/logout" as the next-url for login
 2020-10-05 17:13:29 -04:00
Jansen Kantor
12082e6021 add json validation step to advanced settings save (#25085) 
* add json validation step to save

* fixup! add json validation step to save

* fixup! fixup! add json validation step to save
 2020-10-05 16:46:28 -04:00
Andytr1
586e1cc4d5 EDUCATOR-5300 - advanced team settings validation (#25171) 
* EDUCATOR-5300 - advanced team settings validation

* EDUCATOR-5300 - handle missing team config

* EDUCATOR-5300 - CR comments

* EDUCATOR-5300 - CR comments 2

* EDUCATOR-5300 - CR max team size

* EDUCATOR-5300 - CR max team size fix up
 2020-10-05 14:29:56 -04:00
Alexander J Sheehan
e003b6abf7 Merge pull request #25235 from edx/asheehan-edx/bump-enterprise-3-8-26 
bumping enterprise version to 3.6.26
 2020-10-05 14:13:34 -04:00
Awais Jibran
dcdac9ddc1 Merge pull request #24975 from edx/aj/password-reset-confirm-mail 
Sends Post-password-change acknowledgment email
 2020-10-05 22:27:25 +05:00
stvn
9a33fdff16 Merge PR #24264 open-craft/kshitij/bb-2595/tnl-7209/anonymous-apis 
* Commits:
  Allow anonymous access for course blocks API
 2020-10-05 10:25:57 -07:00
Diana Huang
7a22083497 Merge pull request #25237 from edx/bpant/fix-blackboard-missing-app-entry 
add missing app blackboard
 2020-10-05 12:23:39 -04:00
binodpant
ec438cdd28 add missing app blackboard 2020-10-05 11:54:41 -04:00
Fox Piacenti
73adc729d9 Add a license field to libraries. (#25007) 2020-10-05 11:45:36 -04:00
Alexander Sheehan
7da48bab24 bumping enterprise version 2020-10-05 11:34:55 -04:00
Syed Muhammad Dawoud Sheraz Ali
04744bc8a6 Merge pull request #25223 from edx/dsheraz/PROD-2152-drop-video-pipeline-model 
drop video pipeline integration model with migration
 2020-10-05 20:12:13 +05:00
Edx Deployment automation robot
1e64a6e805 MySQLdbdump (#25230) 
Co-authored-by: GitHub Actions MySQLdbdump automation <admin@edx.org>
 2020-10-05 10:47:12 -04:00
Thomas Tracy
6d88ad96cb Ttracy/mb 618 modal fast follow (#25217) 
* Fix ref on multiselect button to prevent if from staying open
 2020-10-05 10:05:41 -04:00
Binod Pant
8ec7df4fdb enterprise 3.8.25 (#25215) 2020-10-05 10:03:08 -04:00
adeelehsan
0f96e595ee suppressed email in forgot password banner 
VAN-81
 2020-10-05 17:34:38 +05:00
Awais Jibran
6b1506c3ff Sends Post-password-change acknowledgement email 
PROD-421
 2020-10-05 17:01:19 +05:00
Awais Qureshi
67cddb7ce7 Merge pull request #25222 from edx/jenkins/upgrade-python-requirements-b7cd41f 
Python Requirements Update
 2020-10-05 11:26:01 +05:00