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

40279 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Zoldak
6f0d1157f1 Add h filter page directive to cms mako templates without variables 
The files to change were found with:
`ack --literal --type=html --match '${' --files-without-matches cms/templates`
 2016-03-23 12:05:12 -04:00
Peter Fogg
6661063b5a Minor fixes to the safe template linter. 2016-03-23 11:38:45 -04:00
Michael Katz
4d6c787930 add filter 2016-03-23 11:34:21 -04:00
Toby Lawrence
e62a8da457 Set the correct names for overridden dependencies. 2016-03-23 11:28:25 -04:00
Daniel Friedman
48e2299e47 Make CMS activation_invalid template safe by default 2016-03-23 11:21:50 -04:00
Peter Fogg
11bb281019 Remove old teams example templates. 2016-03-23 11:19:01 -04:00
Calen Pennington
2607f8a98c XSS escape cms/templates/activation_active.html 2016-03-23 11:17:17 -04:00
Daniel Friedman
ea347c7a9b Make CMS activation_complete template safe by default 2016-03-23 11:11:08 -04:00
Muhammad Rehan
771a7d06ca Implement 'from_string_or_404' util and its example usage. 2016-03-23 20:10:32 +05:00
Michael Katz
9a94b106f8 safe template 2016-03-23 10:49:35 -04:00
Toby Lawrence
f8ddfb5945 Use a module/path mapping for RequireJS overrides instead of just paths. 
Instead of attempting to derive the module portion of a RequireJS
override strictly from the path to the JS file, we now use a dictionary
where the module name must be explicitly specified.  This allows us to
compensate for files which do not follow a naming scheme that is
compatible with RequireJS without having to normalize all files.  This
is extremely important when using third-party dependencies.
 2016-03-23 10:34:58 -04:00
attiyaIshaque
1e74f942f1 Merge branch 'master' into ai/tnl3964-forum-vote-button 2016-03-23 19:00:01 +05:00
Ehtesham
5ad2eb300c [TNL-4073][TNL-4273] Make sure that domain defined for preview exists in 
HOSTNAME_MODULESTORE_DEFAULT_MAPPINGS,
 2016-03-23 18:52:32 +05:00
Vedran Karačić
88aa4a9055 Merge pull request #11852 from edx/vkaracic/SOL-1712 
Change EcommerceService's is_enabled to accept User instead of request
 2016-03-23 09:40:56 +01:00
vkaracic
3c8ae7c3b2 Change EcommerceService's is_enabled to accept User instead of request 
. And change the verification link in the sidebar to redirect to new basket if the EcommerceService is enabled.
 2016-03-23 07:44:55 +00:00
Mushtaq Ali
5deb07d904 Merge pull request #11884 from edx/mushtaq/edx-ora2-version-1.1.1 
ORA2 version update
 2016-03-23 02:26:26 +05:00
Andy Armstrong
c7336b3d68 Merge pull request #11880 from edx/andya/add-ui-toolkit-only 
Add the UI Toolkit to edx-platform
 2016-03-22 16:34:54 -04:00
M. Rehan
c9e1a86086 Merge pull request #11860 from edx/adam/fix-math-input-ajax 
TNL-4217 – Initialize preview once for an input for the first time
 2016-03-23 00:58:18 +05:00
Andy Armstrong
0177eeded4 Add the UI Toolkit to edx-platform 
UITK-75
 2016-03-22 15:31:27 -04:00
Mushtaq Ali
1b60f73119 ORA2 version update to 1.1.1. Includes bug fixes for TNL-4268 2016-03-23 00:24:26 +05:00
Adam Palay
d3a467d366 Only add event listener if it hasn't been added yet 2016-03-23 00:00:27 +05:00
Toby Lawrence
85304b8b9d Make CDNifying of course over image URLs only happen for relative URLs. 
We don't want to blindly assemble the base CDN URL with whatever an
image URL happens to be, since it might be an absolute URL and now the
result is a broken URL.  We take a more selective approach now.
 2016-03-22 13:56:40 -04:00
Ben Patterson
3332721948 Merge pull request #11867 from edx/benp/courseteam-flaky-fix 
Fix flaky condition that's showing up in firefox 42.
 2016-03-22 13:55:59 -04:00
Jesse Zoldak
a77000a89c Merge pull request #11881 from edx/zoldak/TE-1235 
Remove executable bit from test file  TE-1235
 2016-03-22 13:40:34 -04:00
Eric Fischer
c97a6a5178 Merge pull request #11758 from edx/christina/xss-tests 
Bok choy XSS changes
 2016-03-22 13:02:47 -04:00
Ben Patterson
44c7c927ed Merge pull request #11869 from edx/benp/bok-choy-race-condition 
Wait for numerical selection to load before continuing.
 2016-03-22 12:55:33 -04:00
Simon Chen
f2b7ca6f18 Merge pull request #11873 from edx/release 
Merge release 2016-03-22 back to master
 2016-03-22 12:12:56 -04:00
Andy Armstrong
4796d4f70a Merge pull request #11876 from edx/andya/revert-underscore-string-upgrade 
Revert "Upgrade underscore.string.min.js."
 2016-03-22 11:55:34 -04:00
Adam
6fc8da2769 Merge pull request #11875 from edx/adam/fix-typo 
fix typo on testing.rst page
 2016-03-22 11:54:41 -04:00
Ben Patterson
c6a2afa037 Wait for numerical selection to load before continuing. 
TNL-4272
 2016-03-22 11:53:54 -04:00
Jesse Zoldak
7e79d335a6 Remove executable bit from test file TE-1235 2016-03-22 11:46:06 -04:00
Andy Armstrong
e854690a99 Revert "Upgrade underscore.string.min.js." 
This reverts commit e5c7fdda03.

Unfortunately this change broke bundling on sandboxes, so reverting
it so that master isn't left in a bad state.
 2016-03-22 10:44:19 -04:00
Robert Raposa
f150fd9b3a Merge pull request #11800 from edx/robrap/safe-template-linter 
TNL-4214: Add safe template linter
 2016-03-22 10:40:29 -04:00
Adam Palay
82aad56e62 fix typo on testing.rst page 2016-03-22 10:25:01 -04:00
Eric Fischer
6bb06e5055 Update bok-choy requirement 2016-03-22 10:16:30 -04:00
Eric Fischer
be00a96129 Get environment variable for bok-choy-custom runs 2016-03-22 10:16:30 -04:00
cahrens
0c9937889b Enabling XSS vulnerability flag for bok choy tests 2016-03-22 10:16:27 -04:00
Eric Fischer
b95dadcf29 Merge pull request #11874 from edx/efischer/mark_flaky 
Mark test as flaky TNL-4272
 2016-03-22 10:01:52 -04:00
Eric Fischer
9e71e3f311 Mark test as flaky TNL-4272 2016-03-22 09:56:37 -04:00
Simon Chen
2be8191d5b Merge pull request #77 from edx/rc/2016-03-22 
Release Candidate rc/2016-03-22
 2016-03-22 08:53:42 -04:00
Simon Chen
8f8ed776a8 Merge pull request #11853 from edx/rc/2016-03-22 
Release Candidate rc/2016-03-22
 2016-03-22 08:52:55 -04:00
Eric Fischer
e2c4131a5d Merge pull request #11797 from edx/christina/fix-improper-escaping 
Fix improper escaping.
 2016-03-22 08:49:20 -04:00
Muddasser
cfdaae9d36 Removed commented out and single textbook test scenario 2016-03-22 17:06:59 +05:00
Muddasser
6da296e454 Extract hint from html instead of text 2016-03-22 16:28:43 +05:00
Awais Qureshi
4f5589e356 Merge pull request #11759 from edx/awais786/ECOM-2931-update-credit-eligible-email 
Add the providers information in the email.
 2016-03-22 16:03:14 +05:00
Awais
a154e7f1c3 Adding the ecom api functionality for the credentials. 
ECOM-2931
 2016-03-22 14:01:54 +05:00
Robert Raposa
52efa68b8b Change to output as you go 2016-03-21 22:51:15 -04:00
Robert Raposa
0538dea994 Fix review comments 
Changes include:
- Fix code review comments
- Add comments
- Rename variables and files
 2016-03-21 22:31:57 -04:00
Ben Patterson
66cf6ffb0a Fix flaky condition that's showing up in firefox 42. 2016-03-21 16:45:06 -04:00
cahrens
358ed2559a Fix improper escaping. 2016-03-21 16:01:04 -04:00