Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
58,450 Commits 1 Branch 0 Tags
079f43f40d399cfc0da17039b6dede4e06bda2fb
Commit Graph

2914 Commits

Author SHA1 Message Date
Akiva Leffert
91c0517b7a Merge pull request #11918 from edx/aleffert/remove-unit-coffee 
Remove unused empty file
 2016-03-24 17:01:10 -04:00
Ned Batchelder
026ac6636f Update translations (autogenerated message) 2016-03-24 18:04:37 +00:00
Akiva Leffert
2876076677 Remove unused empty file 2016-03-23 16:05:08 -04:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform 
UITK-75
 2016-03-22 15:31:27 -04:00
cahrens
358ed2559a Fix improper escaping. 2016-03-21 16:01:04 -04:00
Andy Armstrong
76b8e2e897 Merge pull request #11631 from edx/fedx/upgrade-libraries 
Upgrade Underscore.js and Underscore.string.js
 2016-03-18 16:32:16 -04:00
Ned Batchelder
6883f21542 Update translations (autogenerated message) 2016-03-17 10:54:37 +00:00
cahrens
dd2a203677 Upgrade underscore to newest version. 
FEDX-24
 2016-03-16 17:08:27 -04:00
Andy Armstrong
7ead068a4e Merge pull request #11813 from edx/andya/upgrade-requirejs 
Upgrade RequireJS
 2016-03-16 14:24:27 -04:00
Andy Armstrong
06daf79b94 Upgrade RequireJS 
FEDX-105
 2016-03-16 12:42:00 -04:00
Jesse Zoldak
f891d27cbb Revert "ziafazal/WL-328: Multi-Site Comprehensive Theming" 
This reverts commit 954dae584a.
 2016-03-16 11:19:36 -04:00
Zia Fazal
954dae584a ziafazal/WL-328: Multi-Site Comprehensive Theming 
ziafazal: improvements need for multi-tenancy
ziafazal: fixed broken tests
ziafazal: no need to add setting in test.py
ziafazal: added hostname validation
ziafazal: changes after feedback from mattdrayer
ziafazal: fixed branding and microsite broken tests
ziafazal: make STATICFILES_DIRS to list
ziafazal: added theme directory to mako lookup for tests
ziafazal: added more protection in test_util
saleem-latif: Enable SCSS Overrides for Comprehensive Theming
saleem-latif: Incoporate feedback changes, Correct test failures, add tests and enable theming for django templates
saleem-latif: Correct errors in python tests
mattdrayer: Fix invalid release reference
mattdrayer: Update django-wiki reference to latest release
 2016-03-14 13:42:53 -04:00
Ned Batchelder
5e7bc8ac11 Update translations (autogenerated message) 2016-03-10 18:15:09 +00:00
Calen Pennington
f092550945 Merge pull request #11562 from CredoReference/tags-selectbox-in-studio-based-on-xblockasides 
XBlockAside improvement. Difficulty selectbox in Studio (based on new XBlockAside functionality)
 2016-03-10 10:32:22 -05:00
Chris Rodriguez
08937ce5a8 Lessening specificity for headings 2016-03-07 13:07:56 -05:00
Chris Rodriguez
fed1d4b455 Removing importants from heading styles 2016-03-07 10:48:56 -05:00
Ned Batchelder
09a220cb43 Update translations (autogenerated message) 2016-03-03 16:10:12 +00:00
Dmitry Viskov
209ddc700d Difficulty selectbox in Studio (based on new XBlockAside functionality). Include: 
- adaptation asides to be imported from the XML
- updating SplitMongo to handle XBlockAsides (CRUD operations)
- updating Studio to handle XBlockAsides handler calls
- updating xblock/core.js to properly init XBlockAsides JavaScript
 2016-03-02 03:37:13 +03:00
clrux
650c95f9c3 Merge pull request #11501 from edx/clrux/ac-328-uxpl 
AC-328 adding UXPL classnames to headings
 2016-03-01 07:23:07 -05:00
Chris Rodriguez
c619e1ec6b Adding UXPL classnames to headings 2016-02-29 15:43:17 -05:00
Braden MacDonald
cfa7cd3d87 Revert "Pass DOM element, not jQuery object to XBlock initialisation." 2016-02-26 09:06:13 -08:00
Mushtaq Ali
78b6983666 Merge pull request #11597 from edx/mushtaq/ECOM-3760-fix-self-paced-subsection-config 
Fix subsection config for self-paced course
 2016-02-25 20:50:07 +05:00
Michael Frey
860dd1bd5a Merge pull request #11651 from edx/release 
Release
 2016-02-24 16:15:16 -05:00
Ned Batchelder
d8fbdafd90 Update translations (autogenerated message) 2016-02-24 17:59:51 +00:00
Adam Palay
c63dcf0dfe render mathjax in svg by default (TNL-4145) 
mathjax preview should be inline by default
 2016-02-24 12:51:30 -05:00
Mushtaq Ali
2da452b839 ECOM-3760 fix editors not showing up on subsection config popup for self-paced course 2016-02-24 00:35:05 +05:00
Christine Lytwynec
41febaa875 Merge pull request #11565 from edx/clytwynec/ac-234 
Remove hgroup usage
 2016-02-19 16:06:22 -05:00
Adam
4dbcf9a1d3 Merge pull request #11587 from edx/release 
Release
 2016-02-18 17:19:29 -05:00
Adam Palay
e57487db83 update mathjax to 2.6 (TNL-4104) and (TNL-4094) 
update mathjax class names to support common html, html-css, and svg
 2016-02-18 14:13:34 -05:00
Ned Batchelder
6c3ae8245f Update translations (autogenerated message) 2016-02-17 20:12:36 +00:00
Christine Lytwynec
57b7034e5b Remove hgroup usage 2016-02-17 12:05:15 -05:00
clrux
21aa7edd1c Merge pull request #9909 from edx/clrux/ac-179 
AC-179 fixing skip links
 2016-02-17 09:09:27 -05:00
Chris Rodriguez
2a4e141e0e LMS: fixing skip links and adding a11y tests 2016-02-17 07:46:42 -05:00
Robert Raposa
6cc8bbffb6 Merge pull request #11059 from edx/robrap/TNL-3425 
Properly escape Studio base.html
 2016-02-16 16:19:45 -05:00
Robert Raposa
b69c6d62bf Make base.html Mako template safe by default 
Make base.html Mako template safe by default by:
1. Add page-level default of html escaping
2. Fix escaping of all variables in base.html
3. Fix escaping of all dependent underscore templates
Also includes additional best practices for certificates and
textbooks JavaScript/Underscore in order to complete that work.

TNL-3425
 2016-02-16 13:19:24 -05:00
Sylvia Pearce
a858bb9b0f Update screenshot for Help modal on Pages page 2016-02-16 11:41:46 -05:00
Sven Marnach
8280e224f5 Merge pull request #11433 from open-craft/smarnach/studio-add-xblock 
Pass DOM element, not jQuery object to XBlock initialisation.
 2016-02-15 17:24:10 +01:00
Ned Batchelder
4b7dcb2bdd Update translations (autogenerated message) 2016-02-11 12:23:55 +00:00
cahrens
30c42e724d Ensure that window.course is avaiable before anyone accesses it. 
TNL-4106
 2016-02-10 15:59:45 -05:00
Sven Marnach
982c3e623b Pass DOM element, not jQuery object to XBlock initialisation. 
The function initializeXBlock() expects a DOM element, and is passed one in most
cases.  However, when adding a new XBlock component in Studio, the function is
passed a jQuery object, which ends up being forwarded to the actual
initialisation function of the XBlock.
 2016-02-10 18:54:30 +01:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Ned Batchelder
bd377587ac Update translations (autogenerated message) 2016-02-04 15:50:17 +00:00
Ned Batchelder
3dcb4b0793 Update translations (autogenerated message) 2016-02-04 14:51:33 +00:00
clrux
8a2d989369 Merge pull request #11247 from edx/clrux/ac-313-fixup 
CMS: Removing H1 and H2 from editor options; updating editor icons
 2016-02-03 09:28:44 -05:00
Diana Huang
f00841d38e Be specific about JS files for cms-squire. 2016-02-02 17:16:31 -05:00
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00
Diana Huang
cd0bb4c7e0 Add ability to generate static i18n files. 2016-02-01 15:54:10 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
J. Cliff Dyer
90493ac3a2 Track push notification activity in analytics 
When a course is updated, track whether or not a push notification is
sent.
 2016-01-27 20:33:21 +00:00