Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,731 Commits 1 Branch 0 Tags
435c3c633811ea5164311caefc7d94de1595c435
Commit Graph

45731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Terry
b2d534da61 Show current tab even in high contrast mode 
In the dashboard header and the course navigation bar, the current
tab is supposed to be the only one with a bottom border.  But in
high contrast mode in Windows, all of them were assigned a bottom
border color.

So instead of toggling the color when active, toggle the border
style, since Windows overrides our color choice anyway.

LEARNER-3219
 2017-11-16 16:33:50 -05:00
bmedx
13ca6343ce Fix lang mapping for zh_HANS 2017-11-16 15:38:18 -05:00
Sofiya Semenova
821db8aa11 ed-1590 Templates for email forum notifications 2017-11-16 15:26:56 -05:00
Fred Smith
14c7c5086e be able to configure default video cdn url 2017-11-16 14:30:18 -05:00
Albert St. Aubin
d918cdb81e Addition of user filter parameter to the Entitlement API 
[LEARNER-3274]
 2017-11-16 13:52:54 -05:00
John Eskew
ee36534fde Merge pull request #16574 from edx/jeskew/add_request_limits_for_django110 
Add request limits to LMS/CMS Django settings.
 2017-11-16 13:13:46 -05:00
Eric Fischer
71aaf6127e Follow up to #16473 
This rule needs an !important in order to override the inline style
 2017-11-16 13:08:18 -05:00
Harry Rein
b6f55c24b9 Scope base build to footer only. 2017-11-16 12:20:48 -05:00
Alex Dusenbery
2fbdb8f6b3 EDUCATOR-1590 | Test that we can actually render the forum emails. 2017-11-16 12:19:16 -05:00
Alex Dusenbery
c28427fd09 EDUCATOR-1590 | Message context usernames should come from django models. 2017-11-16 12:19:16 -05:00
Christopher Lee
926c745a4c Merge pull request #16372 from proversity-org/proversity/default-course-mobile-availability 
add DEFAULT_MOBILE_AVAILABLE flag
 2017-11-16 11:12:48 -05:00
Anthony Mangano
8bdbb38b08 Merge pull request #16582 from edx/amangano/fix-spanish-translations 
Fix Spanish translations
 2017-11-16 10:48:29 -05:00
Stu Young
d6970826f6 Merge pull request #16581 from edx/estute/stop-writing-quality-violations-to-console 
stop writing linting violations to console
 2017-11-16 10:25:28 -05:00
Brian Mesick
4223bf700b Merge pull request #16567 from edx/bmedx/django111_get_prep_lookup 
Change get_prep_lookup to a Lookup
 2017-11-16 10:16:42 -05:00
Jose Antonio Gonzalez
f38e5ab939 add DEFAULT_MOBILE_AVAILABLE flag 2017-11-16 16:50:37 +02:00
Carol Tong
ebe857373a Merge pull request #16483 from edx/carol/DOC-3822 
DOC-3822 Make 2 steps more obvious in credit eligible email
 2017-11-16 09:44:36 -05:00
Bill Filler
03c97b5697 Merge pull request #16583 from edx/bfiller/ENT-727 
Disable View Consent button on dashboard
 2017-11-16 09:42:46 -05:00
Gabe Mulley
39575bcf4d Merge pull request #16586 from edx/fix-email-tracking 
coerce UUIDs to strings when logging email sent events
 2017-11-16 08:52:46 -05:00
Asad Iqbal
3132d29ca5 Merge pull request #16557 from edx/asadiqbal08/ENT-729 
ENT-729 asadiqbal08/Authenticating directly using "tpa_hint" URL link the learner to enterprise customer
 2017-11-16 17:58:53 +05:00
asadiqbal
e5c55a8945 ENT-729 2017-11-16 16:28:31 +05:00
ayub-khan
6fb44898f8 update translations 2017-11-16 16:03:38 +05:00
Noraiz Anwar
ded3422790 Merge pull request #16587 from edx/noraiz/EDUCATOR-1732 
remove temporary log
 2017-11-16 14:32:49 +05:00
David Ormsbee
b03369579b Merge pull request #16477 from edx/ormsbee/consolidate_theme_js 
Remove collection of JS bundles for themes.
 2017-11-16 03:10:15 -05:00
noraiz-anwar
8028d7aede remove temporary log 2017-11-16 12:59:52 +05:00
Gabe Mulley
6de115545a coerce UUIDs to strings when logging email sent events 2017-11-15 22:34:54 -05:00
Gabe Mulley
a4095e49b2 fix discussion notifications emails 2017-11-15 21:06:46 -05:00
Bill Filler
2e783042d2 Disable View Consent button on dashboard 
Partial revert to disable calls to Enterprise API for each course in an
Enterprise Learner's dashboard to determine status of consent. Will re-enable once
a batch API is avaiable (WL-1315) to fix performance.

ENT-727
 2017-11-15 17:22:44 -05:00
Alessandro Roux
6634fc7fb8 Merge pull request #16550 from edx/thallada/ret-schedules-readme 
Schedules app readme
 2017-11-15 17:06:23 -05:00
Stuart Young
feeec8f0f4 stop writing linting violations to console 2017-11-15 16:33:00 -05:00
Michael Terry
8270cda12b Merge pull request #16577 from mikix/mikix/notes-a11y 
Fix low contrast on Notes page
 2017-11-15 16:29:27 -05:00
Anthony Mangano
49244d77ac Fix Spanish translations 2017-11-15 16:05:40 -05:00
Michael Terry
7622898d33 Merge pull request #16573 from mikix/mikix/design-link-fixes 
Fix some broken links in CSS comments
 2017-11-15 15:24:47 -05:00
Carol Tong
b58de56ad3 DOC-3822 Make 2 steps more obvious in credit eligible email 2017-11-15 15:15:13 -05:00
sandroroux
d08d7252f8 Edited according to the comments in my review. 2017-11-15 14:52:37 -05:00
bmedx
31f11709e3 Change OpaqueKeyField's get_prep_lookup to a Lookup 
get_prep_lookup in a Field is deprecated in Django 1.11. This is the new way of doing this check.
 2017-11-15 14:22:49 -05:00
Jeremy Bowman
6088725d66 Merge pull request #16572 from edx/jmbowman/common_test_fixes 
Fixes for common/lib tests in Django 1.9+
 2017-11-15 14:21:04 -05:00
John Eskew
1bf74c7d32 Add disabled request limits implemented in Django 1.11 2017-11-15 14:19:31 -05:00
Gabe Mulley
4366a15ecf Merge pull request #16530 from edx/ga-tracking-for-ace 
Generalized google analytics tracking for ACE emails
 2017-11-15 14:13:01 -05:00
John Eskew
461fadb2b9 Remove unused direct reference to specific course in common settings. 2017-11-15 14:02:26 -05:00
Michael Terry
c5882520ec Fix low contrast on Notes page 
In the edxnotes view, a few bits of text had low contrast (page
subtitle, tab label, and a link). Now they are each a little darker.

LEARNER-3203
 2017-11-15 13:33:14 -05:00
David Ormsbee
255dc79254 Remove collection of JS bundles for themes. 
Comprehensive themes used to allow you to override JS within one of the
bundles created for Studio and LMS (specified in the common.py env
files). So for instance, the bundle that becomes lms-base-application.js
is defined like this:

base_application_js = [
    'js/src/utility.js',
    'js/src/logger.js',
    'js/user_dropdown_v1.js',
    'js/dialog_tab_controls.js',
    'js/src/string_utils.js',
    'js/form.ext.js',
    'js/src/ie_shim.js',
    'js/src/accessibility_tools.js',
    'js/toggle_login_modal.js',
    'js/src/lang_edx.js',
]

You could not add a custom file to this list in your theme, but if you
created a themes/mytheme/lms/static/js/dialog_tab_controls.js, then your
theme's version of that file would be wrapped into the bundle, which
would be created at {staticfiles}/mytheme/js/lms-base-application.js

It doesn't appear that this functionality has seen much use in practice,
and it adds minutes to the compile time for sites compiling multiple
themes, so this commit removes this capability. It is still possible to
create and invoke custom JavaScript that is theme specific, and will
compile out to {staticfiles}/mytheme/js -- it's just not possible to
override a file that becomes part of the standard Studio/LMS bundles.
 2017-11-15 13:29:30 -05:00
Michael Terry
5646762ef5 Fix some broken links in CSS comments 
ux.edx.org/elements -> ux.edx.org/design_elements
 2017-11-15 13:08:08 -05:00
Gabe Mulley
b6e12224c6 move helper function to theming helpers 2017-11-15 12:58:09 -05:00
Gabe Mulley
a031bf9587 extract tracking_id logic into a method 2017-11-15 12:56:14 -05:00
Gabe Mulley
46c7327211 make image_url a function instead of a property 2017-11-15 12:37:13 -05:00
Jeremy Bowman
d6dc209569 Fixes for common/lib tests in Django 1.9+ 2017-11-15 11:00:39 -05:00
Gabe Mulley
52c33107e6 request can be retrieved via crum 2017-11-15 10:24:55 -05:00
Gabe Mulley
53544a708e always include num_courses in the event 2017-11-15 10:21:19 -05:00
Gabe Mulley
6f20cd5cf2 support a GA tracking pixel 2017-11-15 08:35:35 -05:00
Waheed Ahmed
68890dabf3 Merge pull request #16559 from edx/waheed/LEARNER-2862-tag-enterprise-tickets 
Added tag enterprise tickets functionality.
 2017-11-15 11:48:49 +00:00