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

3993 Commits

Author SHA1 Message Date
Mushtaq Ali
5485d0c236 make is_course_self_paced default to False 2016-02-17 15:54:54 +05:00
Amir Qayyum Khan
91bf48fc8c Added staff role on ccx to staff of master course and added a data migration for existing ccx courses. 2016-02-17 15:54:28 +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
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
Toby Lawrence
af102a6919 Remove duplicate test setup. 2016-02-16 11:30:46 -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
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
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
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
Ehtesham
b9c8b3308d [TNL-3962] moving DEPRECATED_ADVANCED_COMPONENT_TYPES to dJango admin 2016-02-08 17:26:49 +05: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
Chris Rodriguez
4ae40e7bdd Updating icons on problem type editor 2016-02-02 15:41:04 -05: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
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
Douglas Hall
7c923355b2 Remove gating api import from course xmodule to avoid importing django related code into non-django related code 2016-01-29 18:42:04 -05:00
Douglas Hall
37a7fdc0f2 Added subsection gating feature 2016-01-28 14:05:20 -05:00
Ahsan Ulhaq
0c55f17d81 Merge pull request #11347 from edx/ahsan/credentials-feature-changes 
Credentials Feature changes reverted in release
 2016-01-28 15:28:49 +05:00
Ahsan Ulhaq
70eaf18936 caching for requests to credentials service 
ECOM-3278
 2016-01-28 13:05:50 +05:00
Ahsan Ulhaq
5181513629 Show message for earned programs credentials 
ECOM-3015
 2016-01-28 13:05:50 +05:00
Awais Jibran
793f916712 TNL-4049 
Specific user cannot access studio.edge.edx.org/home
 2016-01-27 14:12:26 +05:00
Adam Palay
c37715a7c7 Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	requirements/edx/base.txt
	requirements/edx/github.txt
 2016-01-26 11:25:41 -05:00
Adam
5a5b5e8026 Merge pull request #11279 from edx/remove-old-mgmnt-commands 
remove old  management commands
 2016-01-26 09:23:25 -05:00
Adam Palay
bb2d75d80e Revert "Merge pull request #11241 from edx/feature/credentials-phase-1" 
This reverts commit 46df454536, reversing
changes made to 039e6cdfe6.
 2016-01-25 12:46:57 -05:00
Ahsan Ulhaq
46df454536 Merge pull request #11241 from edx/feature/credentials-phase-1 
Feature/credentials phase 1
 2016-01-22 18:39:53 +05:00
Piotr Mitros
3b2e0ddb83 Merge pull request #11229 from edx/pmitros/minor-studio-settings-cleanup 
Minor cleanup of Studio settings
 2016-01-21 14:38:24 -05:00
Adam Palay
9981c86718 remove old management commands 2016-01-20 14:11:54 -05:00
Mushtaq Ali
d8b902ad58 Merge pull request #11200 from edx/mushtaq/ecom2082-fix-enrollment-msg 
Escape Course Name in enrolment message
 2016-01-20 20:04:23 +05:00
Mushtaq Ali
8f76f3385a Fix enrollment message 2016-01-20 15:59:27 +05:00
Ahsan Ulhaq
8fb998fee7 caching for requests to credentials service 
ECOM-3278
 2016-01-20 12:51:28 +05:00
Ahsan Ulhaq
4ce58a6f67 Show message for earned programs credentials 
ECOM-3015
 2016-01-20 12:50:30 +05:00
Piotr Mitros
6b6248b44a Minor cleanup of Studio settings: removing extra indirection, and advanced components list 2016-01-15 11:21:52 -05:00
Dmitry Viskov
efb86f2169 XBlockAsides Hello world example 2016-01-14 03:19:23 +03:00
M. Rehan
0b685d8983 fix for course number display string as none 2016-01-12 09:49:18 -05:00
cahrens
85ff219e1d Delete lettuce tests already converted to bok choy. 
TNL-3915
 2016-01-06 14:22:10 -05:00
AlasdairSwan
da7830db99 Merge pull request #11101 from edx/alasdair/ECOM-3047-programs-ida-integration-update 
ECOM-3047 update DOM to include the data-attributes that the programs…
 2015-12-30 16:43:07 -05:00
AlasdairSwan
a1d81ed781 ECOM-3047 update DOM to include the data-attributes that the programs IDA expects 2015-12-30 14:43:52 -05:00
Awais Jibran
c32823dfa6 Render cms course listing using CourseSummary class. 2015-12-29 17:35:12 +05:00
Ben Patterson
d460eb62a9 Merge pull request #11075 from edx/benp/fix-flaky-hello 
Fix flaky condition.
 2015-12-28 13:34:58 -05:00
Ben Patterson
056158d72b Fix flaky condition in lettuce test. 2015-12-28 10:50:45 -05:00
Ben Patterson
d522068265 Fix flaky condition. TNL-3937. 2015-12-26 19:42:59 -05:00
Robert Raposa
5e69224c32 Deprecate escaping in display_name_with_default 
- Remove escaping in display_name_with_default
- Move escaped version to deprecated display_name_with_default_escaped
- Does not include any other changes to remove double-escaping

Thanks to agaylard who initiated this work:
https://github.com/edx/edx-platform/pull/10756

TNL-3425
 2015-12-22 11:52:04 -05:00