Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
48,559 Commits 1 Branch 0 Tags
911aecefbb29c4d5dc7c2f3aa2887b95fed44377
Commit Graph

48559 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeremy Bowman
911aecefbb Merge pull request #19795 from edx/jmbowman/progress_page_screenshots 
Capture screenshots on progress page test failures
 2019-02-13 13:49:44 -05:00
Troy Sankey
cfd20b1a99 Merge pull request #19804 from edx/pwnage101/add-missing-production-setting-logout-uris 
Load IDA_LOGOUT_URI_LIST in all the necessary places
 2019-02-13 12:53:07 -05:00
Troy Sankey
11c3588fcc Load IDA_LOGOUT_URI_LIST in all the necessary places 
I missed the LMS production settings, and Studio in its entirety.
 2019-02-13 12:17:02 -05:00
Nimisha Asthagiri
4b4957ad9f Merge pull request #19738 from edx/arch/per-field-visibility 
Account API: Support Per-field Visibility
 2019-02-13 10:05:49 -05:00
Nimisha Asthagiri
7878b2409f Merge pull request #19796 from edx/arch/remove-profile-tab 
Remove Profile Tab on Dashboard pages
 2019-02-13 10:05:02 -05:00
Agha Awais
ca65153826 Merge pull request #19801 from edx/awais/removed_pages_lettuce_tests 
removed old lettuce files for pages/tabs
 2019-02-13 16:50:22 +05:00
Uzair Rasheed
c8a33f8e03 Merge pull request #19800 from edx/LEARNER-6981/remove-links-that-are-missed 
Remove links from spanish footer
 2019-02-13 16:15:52 +05:00
Agha Awais
7d29fbd596 removed old lettuce files for pages/tabs 2019-02-13 10:51:57 +00:00
uzairr
4d0315c5f3 Remove links from spanish footer 
It is a follow-up PR of the work that is already done for
removing specific links on footer.It is created because
two links are still appearing on spanish footer that need
not to be appeared on it.

LEARNER-6981
 2019-02-13 15:24:57 +05:00
Nimisha Asthagiri
d62114dede Remove Profile Tab on Dashboard pages 2019-02-13 00:00:34 -05:00
Nimisha Asthagiri
34201c62e8 Merge pull request #19790 from edx/pwnage101/read-from-extra-list-of-logout-uris 
Additionally logout from a settings list of extra logout URIs
 2019-02-12 22:49:36 -05:00
Jeremy Bowman
193ef1ceb7 Capture screenshots on progress page test failures 2019-02-12 20:32:54 -05:00
Troy Sankey
10afe5e52f Additionally logout from a settings list of extra logout URIs 
Currently, the LMS logout endpoint should iframe in the logout pages of
all the IDAs you were logged into. In short, this was made possible with
DOP because keeping track of the logout URIs and leaving a trail of
evidence in the user cookies was part of what we added in our fork of
DOP.  In the case of DOT, we don't have time or desire to fork DOT to
mirror this behavior, so our stop-gap solution is to log out the user
from a list of logout URIs in settings.
 2019-02-12 19:44:41 -05:00
Douglas Hall
b22c1ed0d6 Merge pull request #19746 from edx/douglashall/user_account_api_auth 
Modify order of user account api authentication classes.
 2019-02-12 17:24:26 -05:00
Michael Youngstrom
d21a57715d Merge pull request #19793 from edx/youngstrom/remove-commonlib-shards 
Remove shards from commonlib-unit tests
 2019-02-12 17:15:33 -05:00
Jeremy Bowman
bf2da9c192 Merge pull request #19792 from edx/jmbowman/bokchoy-container-publish 
More reliable container publish in bok-choy tests
 2019-02-12 17:13:14 -05:00
Douglas Hall
12a5b4cc8d Modify order of Account API authentication classes 2019-02-12 16:37:57 -05:00
Michael Roytman
73356d8f1f Merge pull request #19786 from edx/mroytman/bump-edx-proctoring-1.5.11 
bump version of edx-proctoring to 1.5.11
 2019-02-12 15:26:37 -05:00
Michael Youngstrom
4bbd1dee0b Remove shards from commonlib-unit tests 2019-02-12 14:28:35 -05:00
Jeremy Bowman
b046ce89b4 More reliable container publish in bok-choy tests 2019-02-12 14:10:54 -05:00
albemarle
f829cbe873 Merge pull request #19778 from edx/transifex-bot-update-translations2019-02-10 
Update translations
 2019-02-12 14:08:04 -05:00
Rabia Iftikhar
22dea124dd Merge pull request #19709 from edx/ri/EDUCATOR-3965-update_course_schedules 
EDUCATOR-3965 fix update course schedules on course start date changed
 2019-02-13 00:01:51 +05:00
Michael Youngstrom
cdd77241cb Merge pull request #19791 from edx/youngstrom/remove-cms-shards 
Remove pytest shards from cms
 2019-02-12 13:32:54 -05:00
Michael Youngstrom
fa12b8a481 Merge pull request #19787 from edx/youngstrom/remove-shards 
Remove pytest shards from lms
 2019-02-12 12:34:46 -05:00
Nimisha Asthagiri
74eabcf6bb Account API: support per-field visibility 2019-02-12 11:41:29 -05:00
Michael Youngstrom
16b5606404 Remove shards from cms 2019-02-12 11:26:39 -05:00
Michael Youngstrom
3221c2b91f Remove lms pytest shards 2019-02-12 11:03:46 -05:00
Stu Young
5ac3ef7158 Merge pull request #19770 from edx/revert-19018-opencraft/taranjeet/opt-out-weekly-highlight-messages 
Revert "Add api support to let users opt out of email updates."
 2019-02-12 10:17:11 -05:00
Uzair Rasheed
baf6c156c2 Merge pull request #19711 from edx/LEARNER-6981/remove-links-from-spanish-footer 
Remove un-translated page links from spanish website's footer
 2019-02-12 20:04:12 +05:00
Awais Jibran
d82314f902 fixing quality 2019-02-12 18:45:18 +05:00
Nimisha Asthagiri
a921ebd4ae Merge pull request #19777 from edx/arch/account-api-social-links 
Account API: Enhance Social Link API
 2019-02-12 07:51:57 -05:00
Awais Jibran
717712391f Fixing conflicts 2019-02-12 17:50:58 +05:00
rabiaiftikhar
fdcad0d13c EDUCATOR-3965 fix update schedules on course start date changed 2019-02-12 13:47:22 +05:00
Nimisha Asthagiri
0e79129796 Account API: Enhance Social Link API 2019-02-11 20:17:04 -05:00
Michael Roytman
236a31abb5 bump version of edx-proctoring to 1.5.11 2019-02-11 16:24:27 -05:00
Michael Youngstrom
4b522f0aa0 Merge pull request #19783 from edx/juliasq/update_django_version 
Update Django version to 1.11.20
 2019-02-11 16:17:01 -05:00
uzairr
c477dca533 Remove un-translated page links from spanish website's footer 
Currently, spanish website's main page has links in footer whose
pages are still un-translated.In this PR, links of them are
removed so that user-experience should be improved.

LEARNER-6981
 2019-02-11 22:20:06 +05:00
Julia Eskew
44ca4d48ae Update Django version to 1.11.20 2019-02-11 11:08:56 -05:00
Ned Batchelder
7f53c3d985 Merge pull request #19761 from eduNEXT/lmm/courseoutline_translations 
Fix Collapse All/Expand All translation
 2019-02-11 08:12:00 -05:00
Luis Moreno
91ed45099b Fix Collapse All/Expand All translation 2019-02-11 07:40:41 -04:00
ihtram
7d7736c7f0 Merge pull request #19691 from edx/ihtram/YONK-1282 
Discussion board AssertionError fixed
 2019-02-11 14:56:28 +05:00
edX Transifex Bot
5351545462 Update translations 2019-02-10 20:38:20 +00:00
Jeremy Bowman
406aa21018 Merge pull request #19763 from singuliere/INCR-40-ipaddress 
INCR-40 use ipaddress instead of ipaddr
 2019-02-09 21:29:42 -05:00
singuliere
d00cb9bda8 INCR-40 use ipaddress instead of ipaddr 2019-02-09 13:10:06 +01:00
David Ormsbee
9f56afc18f Merge pull request #19380 from stvstnfrd/show-answer 
Add new Option to Show Answer Dropdown.
 2019-02-08 16:05:54 -05:00
Stu Young
e8374ad944 Merge pull request #19773 from open-craft/jill/flaky-tests-email-updates 
Fixes flaky tests in schedules.tests.TestCourseUpdateResolver
 2019-02-08 15:39:53 -05:00
stv
e7733faa1a Fix tests: Show Answer, Number of Attempts 2019-02-08 12:33:45 -08:00
Joseph Okonda
4a98e4626a Add new Option to Show Answer Dropdown. 
In Studio: Introduces a new option, `after some number of attempts`
and a new entry box for specifying the number of attempts.
This allows course creators to specify that a given question's
answer is only viewable, i.e its show answer button is visible,
after the learner has attempted answering the question -
by hitting the submit button - a given number of times. Included
in this commit are unit tests for the new feature.
 2019-02-08 12:33:40 -08:00
Christopher Pappas
bfc0c5acf5 INCR-24 | Run python-modernize on common/lib/calc 2019-02-08 14:52:17 -05:00
David Ormsbee
4aa6446533 Merge pull request #19385 from open-craft/pooja/implement-public-cohort 
Implement public cohort for anonymous and unenrolled users
 2019-02-08 13:28:02 -05:00