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

6631 Commits

Author SHA1 Message Date
Mushtaq Ali
b94204a8a4 Merge pull request #11452 from edx/mushtaq/ECOM-3615-fix-self-paced-scheduled-content 
Fix self paced course content visiblity
 2016-02-17 18:59:41 +05:00
Mushtaq Ali
5485d0c236 make is_course_self_paced default to False 2016-02-17 15:54:54 +05:00
Mushtaq Ali
d3fc2625d0 Code refactor pass store_type in course create method 2016-02-17 12:53:12 +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
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
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
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
Toby Lawrence
fe545e058f Quality fixes. 2016-02-16 10:12:29 -05:00
Toby Lawrence
e2cbb547b1 Switch to SharedModuleStoreTestCase in the 'contentstore' app where possible. 2016-02-16 09:39:00 -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
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
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
jsa
8a620640c2 Disable credentials-related settings/tests under cms. 2016-02-12 13:25:44 -05:00
Usman Khalid
ec6a786400 Add Randomize XBlock to DEPRECATED_BLOCK_TYPES. 2016-02-12 19:54:41 +05:00
Mushtaq Ali
df0b983ea3 Improve is_self_paced method 2016-02-12 17:31:00 +05:00
Mushtaq Ali
f9c3759571 Fix self-paced course displaying "published, not yet released" issue in Studio ECOM-3615 2016-02-11 17:42:17 +05: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
Sylvia Pearce
97228f3b92 Update help text for Pages page in Studio to reflect Courseware-Course etc change 2016-02-10 13:26:47 -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
Asad Iqbal
64291d3c01 Merge pull request #11391 from edx/asadiqbal08/WL-272 
asadiqbal08/WL-272 - Studio Language Selection
 2016-02-10 18:30:29 +05:00
asadiqbal
64778cdf69 WL-272 2016-02-10 14:33:38 +05:00
Ben Patterson
f12c415ed6 Merge pull request #11470 from edx/benp/remove-ruby-deps 
[S&B] Remove ruby dependencies.
 2016-02-09 10:56:21 -05:00
Ben Patterson
ffa089a9c6 Remove ruby reference in pipeline arguments. 2016-02-08 18:18:37 -05:00
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05:00
jsa
92aa346fdf Implement celery task to award program certs. 
ECOM-3354
 2016-02-05 12:21:20 -05:00
Robert Raposa
29fe2c7b0c Move markup helpers to djangolib 2016-02-05 02:42:43 -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
M. Rehan
9d5a4a244b Merge pull request #11336 from edx/mrehan/wrong-units-in-group-tnl-3727 
Fix - skip orphans from content group usage information for split
 2016-02-04 14:13:05 +05:00
Muhammad Rehan
50c7b7ceb8 TNL-3727 Skip orphans from content group usage information for split 2016-02-04 12:18:18 +05:00
Robert Raposa
f555ffd585 Refactor and improve js_utils helpers 
- Rename escape_json_dumps to dump_js_escaped_json
- Rename escape_js_string to js_escaped_string
- Update js_escaped_string to output empty string for None
- Introduce dump_html_escaped_json
- Move dump_js_escaped_json after the pipe as new best practice
- Introduce additional uses of helpers
- Introduce new djangolib directory and move js_utils
 2016-02-03 17:13:21 -05:00
Bill DeRusha
e75f7950d4 Updates XBlock renders its own template. Adds expand and collapse JS + jasmine tests. 
ECOM-2809
 2016-02-03 13:58:23 -05:00
Ahsan Ulhaq
96d030b6d9 Reverse and Rename Courseware and Course Info Tabs 
ECOM-2678
 2016-02-03 12:20:53 -05: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
69e3267941 Merge pull request #11408 from edx/diana/exclude-i18n-js 
Be specific about JS files for cms-squire.
 2016-02-03 09:15:08 -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
Chris Rodriguez
81d86eea42 Changing H2 to H3 in problem templates 2016-02-02 15:41:02 -05:00
Peter Fogg
ce769b363d Convert PARTNER_SUPPORT_EMAIL to a setting. 2016-02-02 15:18:16 -05:00
Matjaz Gregoric
bb0c2901c7 Merge pull request #11319 from open-craft/remove-comprehensive-theme-finders 
Remove ThemingAware storage mixins and ComprehensiveThemeFinder
 2016-02-02 17:57:36 +01:00
Calen Pennington
dffbc69a3c Merge pull request #11329 from cpennington/fix-cert-type-names 
Fix the help text for cert_name_short and cert_name_long
 2016-02-02 11:19:09 -05:00
Calen Pennington
1d60c40bd2 Merge pull request #11215 from CredoReference/xblock_aside_example 
XBlockAsides: little example of usage
 2016-02-02 10:45:20 -05:00
Peter Desjardins
d6a76125c9 Merge pull request #11401 from edx/pdesjardins/PHX-248 
Edited wording of UI labels for configuring subsection prerequisites …
 2016-02-02 10:05:47 -05:00
Peter Desjardins
2a5b6c9aa3 Edited wording of UI labels for configuring subsection prerequisites (gating) 2016-02-01 17:32:48 -05:00
Diana Huang
4b1a37ef02 Merge pull request #11370 from edx/diana/static-i18n-compiled-files 
Complete static i18n PR
 2016-02-01 17:13:43 -05:00
Calen Pennington
4191ea0013 Add a management command for cleaning up cert_name_short and cert_name_long 2016-02-01 17:02:14 -05:00
Diana Huang
1e1f5abe10 Check in new static i18n JS files. 2016-02-01 15:54:14 -05:00