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

53704 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Terry
fcd95e2eaa Merge pull request #23432 from edx/mikix/ics-fixes 
Minor fixes to ics for events
 2020-03-19 10:06:01 -04:00
edX requirements bot
97c8c609e7 Updating Python Requirements (#23450) 2020-03-19 08:53:47 -04:00
Saad Yousaf
81ab740efd Merge pull request #23408 from edx/saad/PROD-515-radio-button-change 
[PROD-515] - Update ora2 for radio button contrast change.
 2020-03-19 14:58:41 +05:00
SaadYousaf
4cdba04bab update ora2 for radio button contrast change. 2020-03-19 13:51:12 +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
9df15c9a69 Merge pull request #23446 from edx/ddumesnil/AA-74 
AA-74: Only show cert available date in Instructor paced courses
 2020-03-18 13:08:28 -07:00
Dillon Dumesnil
a13b695660 AA-74: Only show cert available date in Instructor paced courses 2020-03-18 12:41:27 -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
Alex Dusenbery
5f00228b11 Add grades how_tos doc. 2020-03-18 14:38:07 -04:00
Kyle McCormick
b40b55cbbf Improve Django admin listings for program_enrollments 2020-03-18 14:33:36 -04:00
Kyle McCormick
f4d5bc22f9 Improve repr() output of program_enrollments models 2020-03-18 14:33:36 -04:00
Matt Tuchfarber
568dcf5686 Merge pull request #23440 from edx/tuchfarber/fix_plugin_context_adr 
Fix rst formatting for plugin view context ADR
 2020-03-18 14:32:06 -04:00
edX cache uploader bot
650a5679a4 Updating Bokchoy testing database cache (#23444) 2020-03-18 14:30:58 -04:00
Matt Tuchfarber
f596a27064 Fix rst formatting for plugin view context ADR 2020-03-18 14:02:05 -04:00
Alex Dusenbery
2cdb244858 remove some potentially problematic tests 2020-03-18 13:26:48 -04:00
Alex Dusenbery
f2efb28833 Generate migrations for changes to default values of fields in the CourseTeam model. 2020-03-18 13:26:48 -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
adeel khan
e7d0970c67 Merge pull request #23428 from edx/adeel/prod_1348_fix_adblocking_expore_course_link 
Fix link for ad blocker.
 2020-03-18 14:10:06 +05:00
Awais Jibran
1296b6a79d Merge pull request #23427 from edx/logs-cleanup 
Remove/Limit log.info
 2020-03-18 12:08:23 +05: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
atesker
7e51f438e4 EDUCATOR-4903. Move defaults to correct place 
EDUCATOR-4903. Move defaults to correct place - cr
 2020-03-17 15:53:15 -04:00
Cory Lee
d0c3f16c2c DENG-17 Make schedules and schedulehistory the same (#23419) 2020-03-17 14:40:04 -04:00
Michael Terry
5591a2358a Merge pull request #23421 from edx/mikix/graded-probs 
Show number of problems in outline
 2020-03-17 14:37:51 -04:00
edX cache uploader bot
391f155b3e Updating Bokchoy testing database cache (#23430) 2020-03-17 14:31:14 -04:00
Nick
34ea405ffb Merge pull request #23431 from edx/ndalfonso/AA-73-courseware-nonetype-error 
AA-73 courseware nonetype error
 2020-03-17 14:30:38 -04:00
Nicholas D'Alfonso
8e77a822fe AA-73 courseware nonetype error 
- ensure logic for displaying reset dealines banner in courseware
  is behind the relative dates waffle flag, only shows if the
  course is self paced, and handles the situation where no
  sequentials exist.
 2020-03-17 14:05:15 -04:00
Michael Terry
23544ccc2a Minor fixes to ics for events 
Updates to the description field in the ics file we generate for
scheduled events.
 2020-03-17 14:01:31 -04:00
Michael Terry
a199c6bfd9 Show number of problems in outline 
Specifically, the number of 'problem' blocks that are graded, in
a given subsection. Also shows an icon next to the subsection if so.

AA-45
 2020-03-17 12:44:11 -04:00
Nathan Sprenkle
9535c37c79 Fix UX issues on Team Management tab (#23417) 
* Don't disable download button after click

* Allow reuploading for team membership CSV
 2020-03-17 12:03:53 -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
Nathan Sprenkle
8219ddc40a Fix A11y issues on Team Management tab (#23403) 
* Change upload div to a button for focus styling

* Fix team membership button resize on focus

* Remove box shadow from focus styling
 2020-03-17 11:16:24 -04:00
adeelehsan
2131ebf03d Configuration model added for account recover command 2020-03-17 19:43:53 +05:00
Brandon Baker
98e5b9d4a3 Upgrade frontend-auth and frontend-enterprise (#23377) 
* Upgrade frontend-enterprise and pass in user

ENT-2648

* Add react-router-dom

* Add back caret
 2020-03-17 10:31:37 -04:00
Jansen Kantor
fe93f68163 EDUCATOR-4938: Teams Tab does not consider Teamset max_size (#23348) 
* correctly resolve teamset-level and course-level max_team_size
 2020-03-17 10:01:09 -04:00
Michael Terry
bc722ed565 Merge pull request #23422 from edx/mikix/fix-segment-tracking 
Fix error in experiment tracking
 2020-03-17 08:35:06 -04:00
Adeel Khan
51480918dd Fix link for ad blocker. 
Explore new courses links gets
disabled by ad blocker. Changing
class name to bypass this.

PROD-1348
 2020-03-17 17:34:44 +05:00
Awais Jibran
d47a0b61a9 301k in last 7 days. 2020-03-17 17:31:37 +05:00
Awais Jibran
e3069877af 383k instance / 7 days. 2020-03-17 16:59:19 +05:00
Hammad Ahmad Waqas
7bab5e179b Merge pull request #23424 from edx/hammad/ENT-2580 
ENT-2580| better exception handling
 2020-03-17 16:29:44 +05:00
edX requirements bot
9b7f563fb1 Updating Python Requirements (#23425) 2020-03-17 07:24:03 -04:00
HammadAhmadWaqas
968761e7f9 better exception handling 2020-03-17 15:55:36 +05:00
Hammad Ahmad Waqas
e9113e5273 Merge pull request #23413 from edx/hammad/ENT-2580 
ENT-2580 | printing only id for failed enterprise course enrollments
 2020-03-17 12:03:02 +05:00
Michael Terry
2e5f2f2be3 Fix error in experiment tracking 
If the user is not logged in, the ExperimentWaffleFlag code was
raising an exception when trying to send an event to segment.

This is a quick fix to ignore anonymous users.
 2020-03-16 17:40:55 -04:00
Matt Tuchfarber
8a48218628 Typos, constant names, add context nesting. 2020-03-16 17:39:24 -04:00
Matthew Piatetsky
85f3592b89 Merge pull request #23420 from edx/REV-1119 
[REV-1119] Enable first purchase discount for all eligible users
 2020-03-16 17:16:24 -04:00
Jeff LaJoie
278e698abe Merge pull request #23343 from edx/jlajoie/AA-51 
AA-51: Adds in 'Up next' banner to course home
 2020-03-16 16:32:20 -04:00