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

48489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saleem Latif
ecc86f9827 Update final copy recovery feature copy 2019-02-07 15:55:42 +05:00
Saleem Latif
7aa9ed5320 Merge pull request #19689 from edx/saleem-latif/ENT-1492 
ENT-1492: Update dashboard alert link and account settings page styling
 2019-02-07 15:53:46 +05:00
Saleem Latif
63f8074402 Update dashboard alert link and account settings page styling 2019-02-07 14:00:27 +05:00
Waheed Ahmed
bf6301c11e Merge pull request #19291 from edx/waheed/LEARNER-4434-discovery-support-beta-langs 
Add support for beta languages
 2019-02-07 13:10:27 +05:00
Awais Jibran
2c1eac8f47 Merge pull request #19018 from open-craft/opencraft/taranjeet/opt-out-weekly-highlight-messages 
Add api support to let users opt out of email updates.
 2019-02-07 12:47:31 +05:00
Taranjeet Singh
3eb9058dd2 Adds optional "unsubscribe" link and api support to let users opt out of email updates. 
Scheduled emails show "unsubscribe" link if waffle switch `schedules.course_update_show_unsubscribe` is enabled, and
settings.ACE_ENABLED_POLICIES respects `bulk_email_optout`.

API endpoint allows GET/POST requests, which:

* GET asks for confirmation of opt-out
* POST accepts "unsubscribe" or "cancel", where "unsubscribe" creates the
  Optout entry, and "cancel" does nothing.
 2019-02-07 11:47:10 +10:30
David Ormsbee
c0889e16ab Merge pull request #19266 from open-craft/paulo/bump_dndv2 
Bump xblock-drag-and-drop-v2 to v2.2.1 which includes i18n support in JS files
 2019-02-06 17:31:45 -05:00
Simon Chen
4fdbdffcf9 Merge pull request #19758 from edx/schen/rollout_gradebook 
Roll out gradebook waffle flag to be default on
 2019-02-06 15:48:28 -05:00
Matt Tuchfarber
b62d70441b Merge pull request #19631 from mahyard/master 
tiny style modification
 2019-02-06 15:18:21 -05:00
Calen Pennington
c8688633b3 Merge pull request #19733 from edx/unicode5 
fix unicode strings in pavelib/
 2019-02-06 15:06:54 -05:00
Simon Chen
e8e396cac5 Roll out gradebook waffle flag to be default on 2019-02-06 14:00:11 -05:00
Jeremy Bowman
00cdc7a7ef Merge pull request #19757 from edx/jmbowman/docker_shell 
Add pull and shell make targets
 2019-02-06 13:15:57 -05:00
Jeremy Bowman
3b7817aec5 Add pull and shell make targets 2019-02-06 12:06:07 -05:00
David Ormsbee
857769e379 Merge pull request #19022 from edx/ormsbee/fix_ccx_data_migration 
Remove course publish from CCX data migration.
 2019-02-06 12:04:53 -05:00
Calen Pennington
829227ade3 Merge pull request #19663 from cpennington/fbe-improve-course-api-performance 
Fbe improve course api performance
 2019-02-06 11:01:25 -05:00
Calen Pennington
972ad9cb1f Merge pull request #19742 from edx/unicode6 
fix unicode strings in lms/ part 1
 2019-02-06 10:32:23 -05:00
Calen Pennington
e575cf30f1 Merge pull request #19731 from edx/unicode4 
fix unicode strings in common/
 2019-02-06 10:13:06 -05:00
Calen Pennington
43d975a92a Select related CourseOverview.image_set when loading the course_api 2019-02-06 10:11:16 -05:00
Calen Pennington
419657d7a5 Prefetch course modes used in has_access calls in course api 2019-02-06 10:11:15 -05:00
Calen Pennington
6d22866e78 Cache org-site lookups in the RequestCache 2019-02-06 10:11:15 -05:00
Calen Pennington
6c596f7c49 Allow courses api to return data incrementally 
Prior to this commit, the course api (/api/courses/v1/courses/)
performed all the work necessary to return all courses available
to the user, and then only actually returned on page's worth of those
courses.

With this change, the api now does the work incrementally, computing
only the data needed to fetch the courses up to and including the page
being returned. This still increases approximately linearly as
the page number accessed being increases, but should be more cache-friendly.
One side effect of this is that the max_page reported by pagination
will be an overestimate (it will include pages that are removed due
to a users access restrictions).

This change also changes the sort-order of courses being returned by the
course_api. By sorting by course-id, rather than course-number, we
can sort in the database, rather than in Python, and defer loading data
from the end of the list until it is requested.

REVMI-90
 2019-02-06 10:11:15 -05:00
Calen Pennington
9ff9c33f59 Add a test that shows how bad course api query counts are 2019-02-06 10:11:15 -05:00
Waheed Ahmed
c48df3214b update bokchoy db cache. 2019-02-06 16:13:24 +05:00
Waheed Ahmed
d76a2463fa Add support for beta languages. 
Whenever user selects a beta language on account settings page,
show a page level warning message that this language is not
fully translated along with action to revert.

LEARNER-5654
 2019-02-06 15:18:04 +05:00
Matthew Piatetsky
6e81c84d8b fix unicode strings in lms/ part 1 2019-02-05 15:15:02 -05:00
Mahyar Damavand
84f609a269 tiny style modification 2019-02-05 23:37:14 +03:30
Zachary Hancock
945debb00f Merge pull request #19739 from edx/zhancock/progress-override 
Grading Overrides on Progress Page
 2019-02-05 11:32:12 -05:00
Matthew Piatetsky
9681ca36b8 fix unicode strings in common/ 2019-02-05 10:57:00 -05:00
Matthew Piatetsky
6cf44a0467 fix unicode strings in pavelib/ 2019-02-05 09:14:20 -05:00
Zach Hancock
8a55435b1e progress page to represent gradebook overrides 2019-02-04 17:06:53 -05:00
Jeremy Bowman
33d16d8e24 Merge pull request #19745 from edx/jmbowman/TE-2852 
TE-2852 Preserve screenshots in bok-choy pipeline jobs
 2019-02-04 15:53:19 -05:00
Dave St.Germain
bf692acea6 Merge pull request #19690 from edx/dcs/retire-perm 
Refactored the retirement permission to use Django rules
 2019-02-04 15:17:38 -05:00
Calen Pennington
703d510057 Merge pull request #19730 from edx/unicode3 
fix unicode strings in cms/
 2019-02-04 15:14:41 -05:00
Calen Pennington
c2d19b5930 Merge pull request #19728 from edx/unicode1 
Revert "Revert "change banner date localization to use dateutilfactory""
 2019-02-04 15:13:34 -05:00
Jeremy Bowman
727ef94326 TE-2852 Preserve screenshots in bok-choy pipeline jobs 2019-02-04 15:09:00 -05:00
Matthew Piatetsky
7df30938c4 fix unicode strings in cms/ 2019-02-04 13:01:51 -05:00
Matthew Piatetsky
b37bc75bb4 Revert "Revert "change banner date localization to use dateutilfactory"" 
This reverts commit 08cb56664b.
 2019-02-04 12:42:27 -05:00
Gabe Mulley
802cb0e491 Merge pull request #19732 from edx/REVMI-91/fix-fbe-banner-style 
REVMI-91: Fix FBE banner styling
 2019-02-04 12:07:54 -05:00
Jeremy Bowman
0b6fa0190d Merge pull request #19735 from edx/jmbowman/DEPR-9 
DEPR-9 Remove dependency on dogapi
 2019-02-04 12:05:44 -05:00
Matthew Piatetsky
150618cf9a Merge pull request #19729 from edx/unicode2 
update to newer version of edx-lint that includes updated unicode-format-string rule
 2019-02-04 10:59:20 -05:00
Gabe Mulley
25890a440f REVMI-91: Fix FBE banner styling 2019-02-04 09:58:02 -05:00
Alex Dusenbery
068b4a8c44 Distinguish zeros from null when considering grade overrides in subsection grades. 2019-02-02 16:08:01 -05:00
Jeremy Bowman
b162414e8c DEPR-9 Remove dependency on dogapi 2019-02-01 17:25:42 -05:00
Jeremy Bowman
2c9b04db21 Merge pull request #19717 from edx/jmbowman/py3_tox_fixes 
More fixes for Python 3 via tox
 2019-02-01 16:51:33 -05:00
Jeremy Bowman
c7fe747c7f More fixes for Python 3 via tox 2019-02-01 15:01:15 -05:00
Michael Youngstrom
dd1fdb3fa1 Merge pull request #19721 from edx/youngstrom/pycountry 
INCR-12: Upgrade pycountry for python3 support
 2019-02-01 13:46:46 -05:00
Christopher Pappas
e2df5760b6 Adding in py2 to py3 conversion script from hackathon 2019-02-01 13:29:12 -05:00
Matthew Piatetsky
883d250bde update to newer version of edx-lint that includes updated unicode-format-string rule 2019-02-01 12:39:36 -05:00
Calen Pennington
3296d5b2e0 Merge pull request #19225 from edx/fsheets/fix-unicode 
WIP: Cleanup from LEARNER-6668
 2019-02-01 12:02:23 -05:00
Christie Rice
545b93f1a6 Merge pull request #19724 from edx/crice/upgrade 
Run make upgrade
 2019-02-01 11:54:15 -05:00