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

35669 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Toby Lawrence
d3c88d7079 Merge pull request #11552 from edx/perf/speed-up-contentstore-tests 
Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible.
 2016-02-16 14:10:22 -05:00
Nimisha Asthagiri
c7b049bef0 Merge pull request #11558 from edx/aamir-khan/ECOM-3706-verify-now-button-issue-fix-rc 
Aamir khan/ecom 3706 verify now button fix
 2016-02-16 13:54:05 -05:00
srpearce
b9ccff7549 Merge pull request #11557 from edx/sylvia/DOC-2692-2 
Update screenshot for Help modal on Pages page
 2016-02-16 13:37:11 -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
aamir-khan
b6604a3a70 ECOM-3706: Updated the hard coded datetimes in tests and also added the test for restricting credit direct sale 2016-02-16 13:14:44 -05:00
aamir-khan
f7be42a135 ECOM-3706: Restricted the enrollment in credit modes directly in upgradeAndVerified flow 2016-02-16 13:14:44 -05:00
Nimisha Asthagiri
52b39ca4f5 Merge pull request #11554 from edx/revert-old-commits 
Undo inadvertent commits
 2016-02-16 13:06:42 -05:00
Simon Chen
3fa62a6ff6 Merge pull request #11416 from edx/schen/ECOM-3177 
ECOM-3177 fix flaky js tests on dashboard.TrackEvents
 2016-02-16 12:45:22 -05:00
Kelketek
ddd7b61734 Merge pull request #11364 from edx/kelketek/drag-and-drop 
Add Drag-and-drop XBlock to requirements.
 2016-02-16 10:46:31 -06:00
Sylvia Pearce
a858bb9b0f Update screenshot for Help modal on Pages page 2016-02-16 11:41:46 -05:00
Toby Lawrence
af102a6919 Remove duplicate test setup. 2016-02-16 11:30:46 -05:00
srpearce
b68beea4df Merge pull request #11508 from edx/sylvia/DOC-2692 
Update help text for Pages page in Studio to reflect Courseware-Course etc change
 2016-02-16 11:12:04 -05:00
Simon Chen
4b8a737168 Merge pull request #11553 from edx/schen/ECOM-3640 
ECOM-3640 add a new info log message on program certificate task to mark successful task completion
 2016-02-16 10:58:38 -05:00
Simon Chen
f6fc711cb6 ECOM-3177 fix the flaky js test by doing dependency injection 2016-02-16 15:58:23 +00:00
Toby Lawrence
0d040bc051 Fix a mistake with initializing something in the test setup. 2016-02-16 10:20:57 -05:00
Toby Lawrence
fe545e058f Quality fixes. 2016-02-16 10:12:29 -05:00
Toby Lawrence
9654449302 Merge pull request #11465 from edx/perf/speed-up-courseware-tests 
Switch to SharedModuleStoreTestCase in the 'courseware' app where possible.
 2016-02-16 10:06:53 -05:00
Nimisha Asthagiri
ed19789708 Undo inadvertent commits. 2016-02-16 09:59:50 -05:00
Simon Chen
2f595c111f ECOM-3640 add a new info log message on program certificate task to mark successful task completion 2016-02-16 14:48:55 +00:00
Toby Lawrence
e2cbb547b1 Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible. 2016-02-16 09:39:00 -05:00
Dmitry Viskov
d532f8de0e Render LMS main navigation (tabs) with template, override templates for a specific list item 2016-02-16 17:03:53 +03:00
Awais Jibran
31853d49cc Merge pull request #11495 from edx/aj/tnl4115-improve-log-get-course-section 
Use Course ID in logging an exception
 2016-02-16 18:56:50 +05:00
Zia Fazal
57af11c0f0 Merge pull request #11548 from edx/ziafazal/fix-get-template-path 
WL-320: fixed get_template_path to work with absolute path also
 2016-02-16 18:47:45 +05:00
Toby Lawrence
49d3a7d35d More quality fixes. 2016-02-16 07:58:33 -05:00
Saleem Latif
cd101d5dec Merge pull request #11494 from edx/saleem-latif/WL-307 
WL-307: correct FAVICON_PATH setting for comprehensive theming
 2016-02-16 14:39:13 +05:00
Zia Fazal
6cd265751a fixed get_template_path to work with absolute path also 
fixed quality violation

skipped test in CMS

changes after feedback from mattd
 2016-02-16 11:52:19 +05:00
Toby Lawrence
ead2f0477b Quality fixes. 2016-02-15 21:18:53 -05:00
Toby Lawrence
84ed280417 Quality fixes! 2016-02-15 21:11:35 -05:00
Jonathan Piacenti
97593f1966 Add Drag-and-drop XBlock to requirements. 2016-02-15 16:28:34 -06: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
Mushtaq Ali
3559bd1e69 Refactor test to check support for both modulestore and is_self_paced method improvement 2016-02-15 18:18:46 +05:00
Saleem Latif
75f17ecc8e correct FAVICON_PATH setting for comprehensive theming 2016-02-15 17:13:19 +05:00
Omar Khan
510dd90c07 Remove newrelic logging handler 
It was introduced back in 2012, and is not used in the default
configuration.
 2016-02-15 11:04:55 +07:00
Peter Fogg
5e9577bf43 Merge pull request #11535 from edx/peter-fogg/add-lettuce-cache 
Add accidentally deleted lettuce DB cache.
 2016-02-12 16:22:44 -05:00
Christina Roberts
36fc6162f2 Merge pull request #11534 from edx/christina/jquery-npm 
Install underscore from npm.
 2016-02-12 16:05:30 -05:00
Jim Abramson
a052a304a7 Merge pull request #11539 from edx/jsa/fix-retry-comment 
adjust comment about program certification retry
 2016-02-12 15:53:28 -05:00
Jim Abramson
f71e7cac93 adjust comment about program certification retry 2016-02-12 14:59:25 -05:00
Gabe Mulley
fcfb0f4a3c Merge pull request #11522 from edx/gabe/remove-ga-fields 
copy event on write
 2016-02-12 14:34:29 -05:00
Jim Abramson
fb3a09e68e Merge pull request #11520 from edx/jsa/ecom-3638 
Specify high priority queue for credentials generation task.
 2016-02-12 14:29:49 -05:00
Toby Lawrence
dacdbae1a5 Fix up some broken tests. 
We added the ability here to check if a role has a user in with the ability to refresh the role cache before checking.  Since some tests will make inline requests, which in turn put a user into a new role, we have to refresh afterwards otherwise we won't see that new role in place.  Since we don't want to automatically refresh ever, we just added a way to request it, since we know in this test that we're doing something, effectively, out-of-band, which necessitates it.
 2016-02-12 14:17:51 -05:00
Peter Fogg
b6ca05d939 Add accidentally deleted lettuce DB cache. 2016-02-12 14:16:54 -05:00
Ben Patterson
526e174846 Merge pull request #11510 from edx/benp/TE-1194-example 
TE-1194 update for test_teams.
 2016-02-12 14:01:46 -05:00
cahrens
c69226841d Install underscore from npm. 
FEDX-47
 2016-02-12 13:45:41 -05:00
Andy Armstrong
b46648eebf Merge pull request #11528 from edx/andya/add-js-monitoring-package 
Add monitoring version of package.json
 2016-02-12 13:40:07 -05:00
jsa
46ad8a3399 specify routing / queue for program credentials task. 
ECOM-3638
 2016-02-12 13:25:52 -05:00
jsa
8a620640c2 Disable credentials-related settings/tests under cms. 2016-02-12 13:25:44 -05:00
Andy Armstrong
7a6495ce2f Add monitoring version of package.json 2016-02-12 12:40:01 -05:00
Renzo Lucioni
4c79aba087 Merge pull request #11527 from edx/renzo/unclosed-p-tag 
Close unclosed p tag
 2016-02-12 12:15:27 -05:00
Kevin Falcone
4037b16af6 Merge pull request #11519 from edx/jibsheet/document-nose-breakpoints-twice 
Copy this doc up from the bok_choy tests.
 2016-02-12 11:41:22 -05:00