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

43698 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
asadiqbal
e5c55a8945 ENT-729 2017-11-16 16:28:31 +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
a4095e49b2 fix discussion notifications emails 2017-11-15 21:06:46 -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
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
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
sandroroux
d08d7252f8 Edited according to the comments in my review. 2017-11-15 14:52:37 -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
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
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
Waheed Ahmed
a119d5b977 Added tag enterprise tickets functionality. 
New support form should tag enterprise tickets.

LEARNER-2862
 2017-11-15 16:24:12 +05:00
Hasnain Naveed
787df105f3 Merge pull request #16535 from edx/hasnain-naveed/WL-1257 
WL-1257 | Site aware context variables.
 2017-11-15 14:21:17 +05:00
Tasawer Nawaz
25b75467be Merge pull request #16554 from edx/tasawer/learner-2736/integrate-zendesk-with-single-support-form 
integrate Zendesk with new single support form
 2017-11-15 13:06:07 +05:00
Hasnain
71ae2247fb WL-1257 | Site aware context variables. 2017-11-15 11:56:51 +05:00
Tyler Hallada
ee27f7886b Address Gabe's comments 2017-11-14 22:12:51 -05:00
Matt Tuchfarber
c16d8db1dd Merge pull request #16549 from edx/tuchfarber/program_marketing_tweaks_2 
Fix URLs in program marketing page
 2017-11-14 17:35:23 -05:00
sandroroux
98bf627efc Revised content above "Configuration flags". 2017-11-14 16:43:16 -05:00
Uzair Rasheed
aa1f3df369 Merge pull request #16513 from edx/uzairr/LEARNER-2981-program-detail-fragment 
Create program detail fragment for mobile app
 2017-11-15 02:08:00 +05:00
Adam
9520fe0342 Merge pull request #16553 from edx/adam/fix-branch-versioning-issues-coursegraph 
addresses issue where branch information was not being stripped from …
 2017-11-14 15:36:25 -05:00
Christopher Lee
c411b6b8f8 Merge pull request #16565 from edx/clee/LEARNER-2892 
Make redundant course dashboard course link unfocusable
 2017-11-14 14:29:06 -05:00
Anthony Mangano
52e0ab9201 Merge pull request #16564 from edx/amangano/update-spanish-translations 
Update Spanish translations
 2017-11-14 14:16:10 -05:00
Sofiya Semenova
3b6e5f89c6 Merge pull request #16562 from edx/sofiya/wl-email-response-notifications 
White label support for email response notifications
 2017-11-14 14:02:05 -05:00
Christopher Lee
6dcce5a80e Merge pull request #16552 from edx/clee/LEARNER-2894 
Remove aria-label for fields in Account Settings and Profile
 2017-11-14 13:41:48 -05:00
christopher lee
b7ff46c325 Make redundant course dashboard course link unfocusable 2017-11-14 13:11:24 -05:00
Tyler Hallada
d3cc7e9bd3 Schedules readme: switch from markdown to rst 2017-11-14 13:04:24 -05:00
Douglas Hall
4d58ee0b5e Merge pull request #16551 from edx/douglashall/add_enterprise_logging 
Added logging to help debug Enterprise API throttling issue.
 2017-11-14 13:03:02 -05:00
Alex Dusenbery
b35450decc EDUCATOR-1729 | Control forum notifications with SiteConfiguration, too. 2017-11-14 12:59:46 -05:00
John Eskew
f790766c26 Merge pull request #16548 from edx/jeskew/more_mgmt_cmd_conv_from_optparse 
Move more mgmt commands from optparse to argparse.
 2017-11-14 12:29:57 -05:00
Brian Mesick
dad73637aa Merge pull request #16495 from edx/bmedx/django111_startup_fixes 
Changes necessary for Django 1.11 tests to start
 2017-11-14 12:19:21 -05:00
Matt Drayer
d9970ef937 Merge pull request #16563 from edx/mattdrayer/ENT-686-4 
Revise SuccessFactors OData exception logging
 2017-11-14 12:12:00 -05:00
Anthony Mangano
84a3d47acb update Spanish translations 2017-11-14 12:04:10 -05:00
John Eskew
27315f442a Move more mgmt commands from optparse to argparse. 2017-11-14 11:26:46 -05:00
sanfordstudent
4d0ce28fa9 Merge pull request #16560 from edx/sstudent/EDUCATOR-1624 
EDUCATOR-1624 logging
 2017-11-14 11:20:42 -05:00
Matt Drayer
8ee0366203 Revise OData exception logging 2017-11-14 11:16:17 -05:00
Brian Mesick
7ccc498800 Merge pull request #16561 from edx/bmedx/django111_select_related 
Remove use of non-relational fields in select_related queries
 2017-11-14 11:04:41 -05:00
Tasawer Nawaz
a89042ab7c integrate zendesk with new single support form 
LEARNER-2736
 2017-11-14 20:43:08 +05:00
Sofiya Semenova
a1692f2b7b White label support for email response notifications 2017-11-14 10:22:59 -05:00
bmedx
09e5156543 Remove use of non-relational fields in select_related queries 
These changes should not change the actual queries at all, and those
will throw errors in Django 1.11.
 2017-11-14 10:10:08 -05:00