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

6353 Commits

Author SHA1 Message Date
Matt Drayer
5ed97e90f3 Merge pull request #10248 from edx/ziafazal/SOL-1319 
SOL-1319: removed  entrance exam dependency on ENABLE_MKTG_SITE
 2015-10-21 10:16:56 -04:00
Christina Roberts
125930cf59 Merge pull request #10223 from edx/christina/upgrade-mathjax 
Upgrade to MathJax 2.5.
 2015-10-21 09:44:44 -04:00
Renzo Lucioni
99e6cab282 Merge pull request #10253 from edx/renzo/studio-entity-plugins 
Groundwork for Studio extensibility
 2015-10-21 09:19:17 -04:00
Zia Fazal
80abf159ee removed entrance exam dependency on ENABLE_MKTG_SITE 
changes after feedback from Matt D

set default value of entrance_exams feature flags to false
 2015-10-21 15:21:26 +05:00
Renzo Lucioni
32460a990e Groundwork for Studio extensibility 
Implement a Studio tab plugin manager, define a namespace for Studio tab plugins, and introduce an abstract base class used to represent Studio tabs. This does not introduce changes required to inject such plugins into the Studio UI. ECOM-2187.
 2015-10-20 14:57:33 -04:00
cahrens
90b61f8ef8 Upgrade to MathJax 2.5. 
TNL-3495
 2015-10-20 11:54:09 -04:00
Adam
ab78069a33 Merge pull request #10246 from edx/merge-release-into-master 
Merge release into master
 2015-10-19 11:13:49 -05:00
Matt Drayer
1eab25f292 mattdrayer/increment-edx-lint: Bump to v0.2.9 and address pylint/pep8 violations 
* Fix paver violations to stablize edx-lint update
* Parens, Line2Long
* Fix missing docstrings
* Fix PEP8 issues
* Address PR feedback (thanks @nedbat!)
 2015-10-19 10:11:59 -04:00
Matt Drayer
c30960cc85 Merge pull request #10215 from edx/ziafazal/SOL-1317 
SOL-1317: check MILESTONES_APP also when checking prerequisite courses enabled
 2015-10-19 09:47:20 -04:00
Adam Palay
9b3841f62c Merge remote-tracking branch 'origin/release' into merge-release-into-master 
Conflicts:
	lms/djangoapps/teams/views.py
	lms/templates/courseware/progress.html
 2015-10-19 08:35:33 -05:00
Zia Fazal
0f637fdc95 check MILESTONES_APP when checking prerequisite courses enabled 2015-10-16 12:53:55 +05:00
Saleem Latif
5f766f3806 Changes after testing on staging 2015-10-16 10:19:43 +05:00
frances botsford
a2bb8ed96c Merge pull request #10120 from edx/frances/fix/repo-cert-template-bugs 
Platform Web Cert template fixes
 2015-10-13 16:51:56 -04:00
Awais Jibran
2813b1269e Published orphans in split breaks preview button in Studio 2015-10-12 15:00:49 +05:00
Frances Botsford
06df341f56 web cert template rendering - adjust signature image sizing 2015-10-09 15:12:50 -04:00
Sarina Canelake
a693feb836 Add Oppia XBlock 2015-10-09 14:41:27 -04:00
Matt Drayer
994f8bd7b4 Merge pull request #10075 from edx/saleem-latif/SOL-1266 
SOL-1266: Display course numbers in certificate configuration
 2015-10-08 08:30:40 -04:00
Usman Khalid
f6193c872e Merge pull request #10059 from edx/usman/use-included-staticfiles-app 
Upgrade django pipeline to v.1.5.3.
 2015-10-08 16:10:36 +05:00
Saleem Latif
9799d15373 course-number and override course-number added in Certificate Editor View 2015-10-08 11:29:14 +05:00
Calen Pennington
624bc9a734 Merge pull request #9911 from cpennington/fix-plat-858 
Delete DIRECT_ONLY_CATEGORIES from both draft and published branches by default
 2015-10-07 14:41:40 -04:00
mushtaqali
296f75a07c Add template escaping in forums, progress page and course container TNL-2395, TNL-2394, TNL-2393 2015-10-07 11:20:51 -04:00
Diana Huang
0248f8af6d Add new clickjacking decorator that whitelists LTI consumers. 2015-10-07 11:20:51 -04:00
Afeef Janjua
ee203ed930 Merge pull request #10015 from edx/afeef/bugfix/tnl-3258-fix-confirm-navigation-popup-unmodified-group-configurations 
TNL-3258 Reset group configuration model when a child content group i…
 2015-10-07 11:13:46 +05:00
Mark Hoeber
dc5ed68420 Merge pull request #10062 from edx/markhoeber-doc2326 
Add Video File Size Warning to Upload Template
 2015-10-06 15:50:11 -04:00
Mark Hoeber
34820aba24 Add Video File Size Warning to Upload Template 2015-10-06 13:59:40 -04:00
Usman Khalid
111a45664c Use settings.PIPELINE_ENABLED instead of settings.FEATURES[USE_DJANGO_PIPELINE]. 2015-10-06 19:52:38 +05:00
Usman Khalid
dbcd1bf430 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-06 19:52:38 +05:00
Usman Khalid
130bbd7993 Upgrade to django-pipeline v1.5.3. 
TNL-3137
 2015-10-06 19:52:38 +05:00
asadiqbal
0b28fd23f8 SOL-1225 2015-10-06 14:52:38 +05:00
Brian Beggs
0ca679e244 Revert "Upgrade django-pipeline and staticfiles" 2015-10-05 14:40:28 -04:00
asadiqbal
aec1b95945 SOL-1262 2015-10-05 16:28:28 +05:00
Usman Khalid
0ce679fc06 Merge pull request #9934 from edx/usman/use-included-staticfiles-app 
Upgrade django-pipeline and staticfiles.
 2015-10-02 22:37:24 +05:00
David Baumgold
0219e18fa8 Merge pull request #10023 from edx/release 
Release into master
 2015-10-02 12:58:50 -04:00
Afeef Janjua
6cc8c47ca0 TNL-3258 Reset group configuration model when a child content group is deleted (+5 squashed commits) 
Squashed commits:
[450761c] found an alternative way to restore model when any of the nested model is deleted
[1b7eb85] passed the context to the inner functions
[c87dafd] refactored the model access using encapsulation instead of directly accessing it
[5d025ff] return the promise
[d8d1f50] fixup! quality (+1 squashed commit)
Squashed commits:
[daa7f81] reset the configuration when the model is deleted (+1 squashed commit)
Squashed commits:
[c7f41f7] reverted: skip test_can_delete_unused_content_group due to flakiness
 2015-10-02 21:57:32 +05:00
Usman Khalid
2b59d46a31 Use django.contrib.staticfiles instead of django-staticfiles. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Usman Khalid
98df2336f3 Upgrade to django-pipeline v.1.5.3. 
TNL-3137
 2015-10-02 18:26:25 +05:00
Bill DeRusha
bcb71a3255 Rename SEGMENT_KEY to have a unique key name for both CMS and LMS 2015-10-01 19:40:27 -04:00
Calen Pennington
8267a762c0 Move *ModuleStoreBuilders into xmodule.modulestore.tests.utils 2015-10-01 16:52:39 -04:00
Mushtaq Ali
42c02c8036 Merge pull request #9809 from edx/mushtaq/force-publish-command 
'force_publish' command for publishing a course forcefully by making …
 2015-10-01 22:42:54 +05:00
Matt Drayer
635e54918d Merge pull request #9968 from edx/asadiqbal08/SOL-1225 
SOL-1225: Pressing tab button does not takes user to next field
 2015-10-01 10:02:38 -04:00
Mushtaq Ali
11741f118f 'force_publish' command for publishing a course forcefully by making the published branch point to the same structure as the draft branch. add force_publish functionality to split courses. 2015-10-01 15:46:37 +05:00
asadiqbal
b09c20f02f SOL-1225 2015-10-01 15:12:13 +05:00
Christine Lytwynec
4aceb33c70 Merge pull request #9985 from edx/clytwynec/html-fixes 
fix typo in course_info.html
 2015-09-30 16:18:18 -04:00
Christine Lytwynec
90b9a73763 fix typo in course_info.html 2015-09-30 15:11:15 -04:00
Matt Drayer
65831c887d Merge pull request #9806 from edx/ziafazal/SOL-1185 
ziafazal/SOL-1185: move SOCIAL_SHARING_SETTINGS out of FEATURES
 2015-09-30 14:12:33 -04:00
David Baumgold
aa8ecca536 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 12:18:01 -04:00
David Baumgold
116ca29189 Remove the edx.org comprehensive theme 
There's a lot of useful things in PR #8271 that provide a framework
for the comprehensive theming system. If we need to remove the edx.org
theme from the codebase, we can leave most of PR #8271 in, to make it
easier to build on top of and get this feature back in.
 2015-09-30 11:04:28 -04:00
Bill DeRusha
a6873cb883 Merge pull request #9875 from edx/bderusha/segment-cleanup 
Segment Clean Up
 2015-09-29 10:33:03 -04:00
Brian Beggs
a4c99964cc Merge pull request #9937 from edx/bbeggs/2015-09-22-release-to-master 
Merge patch/2015-09-22 (Django rest framework) to master
 2015-09-29 09:24:01 -04:00
Matt Drayer
d3c50ee3a2 Merge pull request #9884 from edx/saleem-latif/SOL-1190 
SOL-1190: line breaks in signatory title are not reflected in the cert
 2015-09-29 08:50:25 -04:00