Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,488 Commits 1 Branch 0 Tags
72ea1b7d4fffe8b01dcf61aecdf941acd33b7349
Commit Graph

21139 Commits

Author SHA1 Message Date
Carla Duarte
f8963fe11e Merge pull request #24016 from edx/ciduarte/AA-152 
AA-152: Course Start Date for PLS
 2020-05-21 08:56:33 -04:00
adeelehsan
cc3d3aa4ab Merge pull request #24023 from edx/aehsan/PROD-1610/fixed_xss_lint_issues 
Fixed lint issues
 2020-05-21 17:45:43 +05:00
adeelehsan
98590dbddf Fixed xss lint issues 
PROD-1609
PROD-1610
PROD-1614
PROD-1615
PROD-1616
 2020-05-21 17:22:32 +05:00
Awais Jibran
2d2015f463 Merge pull request #23981 from edx/aj/details/code-refactor 
Code Refactor
 2020-05-21 13:18:50 +05:00
Waheed Ahmed
c7f4e16470 Fix XSS lint issues for course_cta_text 
PROD-1602
 2020-05-21 12:51:07 +05:00
jinder1s
6b8ebd5a8d Code Refactor 2020-05-21 10:19:14 +05:00
Carla Duarte
8b376e271c AA-152: Course Start Date for PLS 
Updated the displayed start date for a learner in a self paced course
that appears in the Learner Dashboard and the Dates tab.
Used the max of the course start date and the learner's enrollment date.
 2020-05-20 13:18:31 -04:00
Ben Warzeski
ee6eac546b Test non-ascii utf-8 character team member name upload. (#24009) 
* remove old_format reference in teams config

* validate uploaded character values for team csv upload

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 12:13:27 -04:00
Jeff LaJoie
efa7b3b816 AA-164: Performance fixes for course home 2020-05-20 10:09:41 -04:00
Ben Warzeski
1703a88d46 remove old_format from team config tests (#24010) 
* remove old_format from team config tests

* remove old format from teams_config

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.cable.rcn.com>
 2020-05-20 08:56:46 -04:00
stvn
4125ae0e23 Merge PR #24012 add/masquerade 
* Commits:
  Add is_staff check to masquerade POST
  Convert masquerade view to class-based
 2020-05-19 14:44:15 -07:00
stvn
69417396aa Add is_staff check to masquerade POST 2020-05-19 13:55:37 -07:00
stvn
5bf38f5416 Convert masquerade view to class-based 2020-05-19 13:55:37 -07:00
Ned Batchelder
9c721d78c5 Merge pull request #24026 from open-craft/kshitij/cri-174/fix-lti 
[CRI-174] [BB-2402] Fix LTI issues due to duplicated Content-Length header
 2020-05-19 16:21:02 -04:00
Dillon Dumesnil
97af77e785 Merge pull request #23902 from edx/ddumesnil/dates-external-api-AA-115 
AA-115: Adding external API for dates tab
 2020-05-19 13:01:50 -07:00
Dillon Dumesnil
7cd821b52e AA-115: Adding external API for dates tab 
This adds in the API for the Dates Tab for use by the
Course Home MFE.
 2020-05-19 12:35:43 -07:00
Kshitij Sobti
746eeb1383 Fix LTI issues due to duplicated Content-Length header 2020-05-19 23:16:42 +05:30
Diane Kaplan
e1c6801d85 Hide financial assistance link for two cases 2020-05-19 12:45:44 -04:00
atesker
cfff2a86aa EDUCATOR-5053 2020-05-19 12:07:05 -04:00
Jeremy Bowman
5077479959 Remove shoppingcart code from courseware index page (#23977) 
Remove code from the courseware index page that was only relevant if the shopping cart was enabled.
 2020-05-19 11:11:34 -04:00
Aura Milena Alba
04802d2d72 Remove pattern library of programs.html (#23951) 2020-05-19 09:33:24 -04:00
uzairr
39b4a3f4a7 Restrict api to staff users 2020-05-19 17:22:50 +05:00
Ned Batchelder
68aceff860 Merge pull request #23968 from edx/nedbat/docs-progress 
Update swagger.yaml, fix some markup errors
 2020-05-16 14:50:35 -04:00
Jansen Kantor
9707dcff6e EDUCATOR 5042: Learner's Private Team Appears When Learner Browses all Team Sets (#24004) 
* fix query to remove dulicates and incorrect teams
 2020-05-15 16:50:31 -04:00
Jeff Chaves
34634eb8e8 ENT-2885: importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settin… (#23999) 
importing ENTERPRISE_CUSTOMERS_EXCLUDED_FROM_CATALOG list from settings following same pattern that is used for CORS_ORIGIN_WHITELIST
 2020-05-15 16:02:48 -04:00
Ben Warzeski
7778347aed remove old_format from team config tests 2020-05-15 14:44:23 -04:00
Dave St.Germain
45a71cfcf7 Merge pull request #24001 from edx/dcs/hide-tabs 
Only the data download tab should appear for data researchers
 2020-05-15 11:14:20 -04:00
Dave St.Germain
c6344aa577 Only the data download tab should appear for data researchers 
TNL-7222
 2020-05-15 08:11:45 -04:00
Dillon Dumesnil
39d45eee42 Moving SUPPORTED_FIELDS for transformers into serializers 
It is only referenced inside of the serializers so we can just
define it there
 2020-05-14 13:12:43 -07:00
Dillon Dumesnil
4d4b93c6ed AA-159: Improving performance of get_course_assignments 
We saw an increase in response time with recent changes to the logic
behind get_course_assignments. This effort works to better access
the information we need in order to improve performance.
Namely, this is done by using the course_blocks_api
 2020-05-14 13:12:25 -07:00
Ben Warzeski
d559a35879 Update teams scss (#23989) 
highlight topic cards on tab-select
add border highlight to sorting select input on teams and topics pages.

Co-authored-by: Ben Warzeski <benwarzeski@edX-C02CD0HCLVDM.local>
 2020-05-14 11:37:29 -04:00
edX requirements bot
5724432741 Python Requirements Update (#23984) 
* Updating Python Requirements

* Constrain django-cookies-samesite until dep bug fixed

* Fix PEP 8 problems revealed by pycodestyle upgrade

Co-authored-by: Tim McCormack <tmccormack@edx.org>
Co-authored-by: Jeremy Bowman <jbowman@edx.org>
 2020-05-13 20:24:30 +00:00
Carla Duarte
069aea8f40 Dates Intro Messaging 
Added a banner to introduce learners to the Dates Tab.
The banner is hidden when the learner has missed deadlines.

Refactored naming conventions in the dates sass file to better
reflect the function of our banners.

AA-156
 2020-05-13 13:20:53 -04:00
atesker
839a0edc4e EDUCATOR-4989 - use student-key 2020-05-13 13:07:31 -04:00
Nick
821eb84486 Merge pull request #23963 from edx/ndalfonso/AA-157-dates-page-missed-deadlines 
AA-157 dates page missed deadlines
 2020-05-13 10:24:10 -04:00
adeelehsan
5f26cde55f Merge pull request #23969 from edx/aehsan/PROD-1579/fixed_quality_violation 
Fixed  xss lint violations
 2020-05-13 06:39:01 +05:00
adeelehsan
3da5144fee Fixed python-wrap-html 
PROD-1579
 2020-05-13 06:12:30 +05:00
Jeremy Bowman
f17e12ba0e Remove shoppingcart from course about page - DEPR-43 (#23973) 
Remove all references to the shoppingcart app from the course about page. Also removed one test of shoppingcart functionality from the student app.
 2020-05-12 15:03:47 -04:00
Olivia Ruiz-Knott
f72a6556a9 MICROBA-311 Add US State field to UserProfile 
Add list of states and field to UserProfile model; add migration; add
state field to relevant serializers and to
ACCOUNT_VISIBILITY_CONFIGURATION. Removes state data if country is
changed to something other than United States.
 2020-05-12 13:55:11 -04:00
Ned Batchelder
cca33732ba Correct markup mistakes in api docs 2020-05-12 13:36:14 -04:00
Nicholas D'Alfonso
637b639e78 AA-157 dates page missed deadlines 
- add banner to dates page when deadlines are missed
 2020-05-12 13:02:26 -04:00
Diane Kaplan
9b8af1493b Kaplan/rev 1136 financial aid- handle missing feature flag (#23957) 
Add financial assistance link in course tools where available, so this will be more visible to learners
 2020-05-12 10:11:48 -04:00
Jeff LaJoie
972c7f3bc1 Merge pull request #23954 from edx/jlajoie/AA-163 
AA-163: Fixes duplicate dates tab issue
 2020-05-12 09:08:54 -04:00
Jeff LaJoie
ee0f4567a8 AA-163: Fixes duplicate dates tab issue 2020-05-12 08:38:14 -04:00
Awais Jibran
5e7cd2f818 Merge pull request #23898 from edx/aj/msingh/details 
Course Content boilerplate blurb (and link to discussions)
 2020-05-12 17:24:37 +05:00
jinder1s
ae2c2c4765 Course Content boilerplate blurb (and link to discussions) 
PROD-1475
 2020-05-12 13:05:10 +05:00
Ned Batchelder
6a23e6f641 Merge pull request #22358 from open-craft/samuel/custom-search-filter 
SE-1839 Allow overriding SEARCH_FILTER_GENERATOR
 2020-05-11 11:58:44 -04:00
Ned Batchelder
b3b58690e6 Merge pull request #21507 from open-craft/guruprasad/youtube-api-missing-referer-fix 
[BB-1637] Pass the referer from the client to the YouTube API
 2020-05-11 11:46:57 -04:00
Farhanah Sheets
d37b333d53 Revert "Add financial assistance link in course tools (#23921)" 
This reverts commit cbb4cfb988.
 2020-05-10 16:43:39 -04:00
Jansen Kantor
f4a2303013 EDUCATOR-5043: remove grades from program progress page (#23940) 
* remove grades from program progress page
 2020-05-08 14:46:20 -04:00