Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into socialTest
José Loguercio
9 years ago
commit
a3e86a2ad7
@ -0,0 +1,46 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
namespace Application\Migrations\Schema\V111; |
||||
|
||||
use Application\Migrations\AbstractMigrationChamilo; |
||||
use Doctrine\DBAL\Schema\Schema; |
||||
use Doctrine\DBAL\Types\Type; |
||||
|
||||
/** |
||||
* Class Version20160603113100 |
||||
* Add association mapping for Language class |
||||
* @package Application\Migrations\Schema\V111 |
||||
*/ |
||||
class Version20160603113100 extends AbstractMigrationChamilo |
||||
{ |
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function up(Schema $schema) |
||||
{ |
||||
$languageTable = $schema->getTable('language'); |
||||
$languageTable |
||||
->getColumn('parent_id') |
||||
->setType(Type::getType(Type::INTEGER)) |
||||
->setNotnull(false); |
||||
$languageTable->addForeignKeyConstraint('language', ['parent_id'], ['id'], [], 'language_parent'); |
||||
} |
||||
|
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function down(Schema $schema) |
||||
{ |
||||
$languageTable = $schema->getTable('language'); |
||||
$languageTable->removeForeignKey('language_parent'); |
||||
$languageTable |
||||
->getColumn('parent_id') |
||||
->setType(Type::getType(Type::BOOLEAN)) |
||||
->setNotnull(false); |
||||
} |
||||
} |
||||
@ -0,0 +1,92 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
namespace Application\Migrations\Schema\V111; |
||||
|
||||
use Application\Migrations\AbstractMigrationChamilo; |
||||
use Doctrine\DBAL\Schema\Schema; |
||||
use Doctrine\DBAL\Types\Type; |
||||
|
||||
/** |
||||
* Class Version20160610142700 |
||||
* Integrate the Skype plugin and create new settings current to enable it |
||||
* @package Application\Migrations\Schema\V111 |
||||
*/ |
||||
class Version20160610142700 extends AbstractMigrationChamilo |
||||
{ |
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function up(Schema $schema) |
||||
{ |
||||
$dataList = $this |
||||
->connection |
||||
->executeQuery(" |
||||
SELECT id FROM extra_field |
||||
WHERE variable = 'skype' AND extra_field_type = 1 |
||||
") |
||||
->fetchAll(); |
||||
|
||||
if (empty($dataList)) { |
||||
$this->addSql(" |
||||
INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) |
||||
VALUES (1, 1, 'skype', 'Skype', 1, 1, now()) |
||||
"); |
||||
} |
||||
|
||||
$this->addSql(" |
||||
INSERT INTO extra_field (extra_field_type, field_type, variable, display_text, visible, changeable, created_at) |
||||
VALUES (1, 1, 'linkedin_url', 'LinkedInUrl', 1, 1, now()) |
||||
"); |
||||
|
||||
$this->addSettingCurrent( |
||||
'allow_show_skype_account', |
||||
null, |
||||
'radio', |
||||
'Platform', |
||||
'true', |
||||
'AllowShowSkypeAccountTitle', |
||||
'AllowShowSkypeAccountComment', |
||||
null, |
||||
null, |
||||
1, |
||||
true, |
||||
false, |
||||
[ |
||||
['value' => 'false', 'text' => 'No'], |
||||
['value' => 'true', 'text' => 'Yes'] |
||||
] |
||||
); |
||||
|
||||
$this->addSettingCurrent( |
||||
'allow_show_linkedin_url', |
||||
null, |
||||
'radio', |
||||
'Platform', |
||||
'true', |
||||
'AllowShowLinkedInUrlTitle', |
||||
'AllowShowLinkedInUrlComment', |
||||
null, |
||||
null, |
||||
1, |
||||
true, |
||||
false, |
||||
[ |
||||
['value' => 'false', 'text' => 'No'], |
||||
['value' => 'true', 'text' => 'Yes'] |
||||
] |
||||
); |
||||
} |
||||
|
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function down(Schema $schema) |
||||
{ |
||||
|
||||
} |
||||
} |
||||
@ -0,0 +1,36 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
namespace Application\Migrations\Schema\V111; |
||||
|
||||
use Application\Migrations\AbstractMigrationChamilo; |
||||
use Doctrine\DBAL\Schema\Schema; |
||||
use Doctrine\DBAL\Types\Type; |
||||
|
||||
/** |
||||
* Class Version20160623143200 |
||||
* Remove chatcall_date, chatcall_text, chatcall_user_id from User table |
||||
* @package Application\Migrations\Schema\V111 |
||||
*/ |
||||
class Version20160623143200 extends AbstractMigrationChamilo |
||||
{ |
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function up(Schema $schema) |
||||
{ |
||||
$schema |
||||
->getTable('user') |
||||
->dropColumn('chatcall_user_id') |
||||
->dropColumn('chatcall_date') |
||||
->dropColumn('chatcall_text'); |
||||
} |
||||
|
||||
/** |
||||
* @param Schema $schema |
||||
*/ |
||||
public function down(Schema $schema) |
||||
{ |
||||
} |
||||
} |
||||
@ -0,0 +1,47 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
namespace Application\Migrations\Schema\V111; |
||||
|
||||
use Application\Migrations\AbstractMigrationChamilo; |
||||
use Doctrine\DBAL\Schema\Schema; |
||||
use Doctrine\DBAL\Types\Type; |
||||
|
||||
/** |
||||
* Class Version20160628220000 |
||||
* Integrate the Skype plugin and create new settings current to enable it |
||||
* @package Application\Migrations\Schema\V111 |
||||
*/ |
||||
class Version20160628220000 extends AbstractMigrationChamilo |
||||
{ |
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function up(Schema $schema) |
||||
{ |
||||
$this |
||||
->connection |
||||
->executeQuery("UPDATE c_lp_item SET item_type = 'dir' WHERE item_type = 'dokeos_chapter'"); |
||||
$this |
||||
->connection |
||||
->executeQuery("UPDATE c_lp_item SET item_type = 'dir' WHERE item_type = 'dokeos_module'"); |
||||
$this |
||||
->connection |
||||
->executeQuery("UPDATE c_lp_item SET item_type = 'dir' WHERE item_type = 'chapter'"); |
||||
$this |
||||
->connection |
||||
->executeQuery("UPDATE c_lp_item SET item_type = 'dir' WHERE item_type = 'module'"); |
||||
} |
||||
|
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function down(Schema $schema) |
||||
{ |
||||
|
||||
} |
||||
} |
||||
@ -0,0 +1,39 @@ |
||||
<?php |
||||
/* For licensing terms, see /license.txt */ |
||||
|
||||
namespace Application\Migrations\Schema\V111; |
||||
|
||||
use Application\Migrations\AbstractMigrationChamilo; |
||||
use Doctrine\DBAL\Schema\Schema; |
||||
use Doctrine\DBAL\Types\Type; |
||||
|
||||
/** |
||||
* Class Version20160701110000 |
||||
* Add option to remove splash screen on course creation |
||||
* @package Application\Migrations\Schema\V111 |
||||
*/ |
||||
class Version20160701110000 extends AbstractMigrationChamilo |
||||
{ |
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function up(Schema $schema) |
||||
{ |
||||
$this->addSql("INSERT INTO settings_current (variable, subkey, type, category, selected_value, title, comment, scope, subkeytext, access_url_changeable) VALUES ('course_creation_splash_screen',NULL,'radio','Course','true','CourseCreationSplashScreenTitle','CourseCreationSplashScreenComment','',NULL, 1)"); |
||||
$this->addSql("INSERT INTO settings_options (variable, value, display_text) VALUES ('course_creation_splash_screen','true','Yes') "); |
||||
$this->addSql("INSERT INTO settings_options (variable, value, display_text) VALUES ('course_creation_splash_screen','false','No') "); |
||||
} |
||||
|
||||
/** |
||||
* @param Schema $schema |
||||
* @throws \Doctrine\DBAL\DBALException |
||||
* @throws \Doctrine\DBAL\Schema\SchemaException |
||||
*/ |
||||
public function down(Schema $schema) |
||||
{ |
||||
$this->addSql("DELETE FROM settings_current WHERE variable = 'course_creation_splash_screen'"); |
||||
$this->addSql("DELETE FROM settings_options WHERE variable = 'course_creation_splash_screen'"); |
||||
} |
||||
} |
||||
@ -1,14 +1,14 @@ |
||||
{ |
||||
"name": "blueimp-tmpl", |
||||
"homepage": "https://github.com/blueimp/JavaScript-Templates", |
||||
"version": "3.3.0", |
||||
"_release": "3.3.0", |
||||
"version": "3.4.0", |
||||
"_release": "3.4.0", |
||||
"_resolution": { |
||||
"type": "version", |
||||
"tag": "v3.3.0", |
||||
"commit": "f09f47c368e0dc7871be35119ef3eab9bb25bdf2" |
||||
"tag": "v3.4.0", |
||||
"commit": "dcb7a7b44c733c5df0b6000e777bc6942646607e" |
||||
}, |
||||
"_source": "git://github.com/blueimp/JavaScript-Templates.git", |
||||
"_source": "https://github.com/blueimp/JavaScript-Templates.git", |
||||
"_target": ">=2.5.4", |
||||
"_originalSource": "blueimp-tmpl" |
||||
} |
||||
@ -1,20 +1,20 @@ |
||||
SCAYT plugin for CKEditor 4 Changelog |
||||
==================== |
||||
### CKEditor 4.5.6 |
||||
|
||||
New Features: |
||||
* CKEditor [language addon](http://ckeditor.com/addon/language) support |
||||
* CKEditor [placeholder addon](http://ckeditor.com/addon/placeholder) support |
||||
* Drag and Drop support |
||||
* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25 |
||||
|
||||
Fixed issues: |
||||
* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core. |
||||
* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements |
||||
* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting |
||||
* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page |
||||
* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content |
||||
* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe |
||||
* SCAYT stops working when CKEditor Undo plug-in not enabled |
||||
* Issue with pasting SCAYT markup in CKEditor |
||||
* [#32](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/32) SCAYT stops working after pressing Cancel button in WSC dialog |
||||
SCAYT plugin for CKEditor 4 Changelog |
||||
==================== |
||||
### CKEditor 4.5.6 |
||||
|
||||
New Features: |
||||
* CKEditor [language addon](http://ckeditor.com/addon/language) support |
||||
* CKEditor [placeholder addon](http://ckeditor.com/addon/placeholder) support |
||||
* Drag and Drop support |
||||
* *Experimental* GRAYT functionality http://www.webspellchecker.net/samples/scayt-ckeditor-plugin.html#25 |
||||
|
||||
Fixed issues: |
||||
* [#98](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/98) SCAYT Affects Dialog Double Click. Fixed in SCAYT Core. |
||||
* [#102](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/102) SCAYT Core performance enhancements |
||||
* [#104](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/104) SCAYT's spans leak into the clipboard and after pasting |
||||
* [#105](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/105) Javascript error fired in case of multiple instances of CKEditor in one page |
||||
* [#107](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/107) SCAYT should not check non-editable parts of content |
||||
* [#108](https://github.com/WebSpellChecker/ckeditor-plugin-scayt/issues/108) Latest SCAYT copies id of editor element to the iframe |
||||
* SCAYT stops working when CKEditor Undo plug-in not enabled |
||||
* Issue with pasting SCAYT markup in CKEditor |
||||
* [#32](https://github.com/WebSpellChecker/ckeditor-plugin-wsc/issues/32) SCAYT stops working after pressing Cancel button in WSC dialog |
||||
|
||||
@ -1,28 +1,28 @@ |
||||
Software License Agreement |
||||
========================== |
||||
|
||||
**CKEditor SCAYT Plugin** |
||||
Copyright © 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved. |
||||
|
||||
Licensed under the terms of any of the following licenses at your choice: |
||||
|
||||
* GNU General Public License Version 2 or later (the "GPL"): |
||||
http://www.gnu.org/licenses/gpl.html |
||||
|
||||
* GNU Lesser General Public License Version 2.1 or later (the "LGPL"): |
||||
http://www.gnu.org/licenses/lgpl.html |
||||
|
||||
* Mozilla Public License Version 1.1 or later (the "MPL"): |
||||
http://www.mozilla.org/MPL/MPL-1.1.html |
||||
|
||||
You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice. |
||||
|
||||
Sources of Intellectual Property Included in this plugin |
||||
-------------------------------------------------------- |
||||
|
||||
Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission. |
||||
|
||||
Trademarks |
||||
---------- |
||||
|
||||
CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders. |
||||
Software License Agreement |
||||
========================== |
||||
|
||||
**CKEditor SCAYT Plugin** |
||||
Copyright © 2012, [CKSource](http://cksource.com) - Frederico Knabben. All rights reserved. |
||||
|
||||
Licensed under the terms of any of the following licenses at your choice: |
||||
|
||||
* GNU General Public License Version 2 or later (the "GPL"): |
||||
http://www.gnu.org/licenses/gpl.html |
||||
|
||||
* GNU Lesser General Public License Version 2.1 or later (the "LGPL"): |
||||
http://www.gnu.org/licenses/lgpl.html |
||||
|
||||
* Mozilla Public License Version 1.1 or later (the "MPL"): |
||||
http://www.mozilla.org/MPL/MPL-1.1.html |
||||
|
||||
You are not required to, but if you want to explicitly declare the license you have chosen to be bound to when using, reproducing, modifying and distributing this software, just include a text file titled "legal.txt" in your version of this software, indicating your license choice. |
||||
|
||||
Sources of Intellectual Property Included in this plugin |
||||
-------------------------------------------------------- |
||||
|
||||
Where not otherwise indicated, all plugin content is authored by CKSource engineers and consists of CKSource-owned intellectual property. In some specific instances, the plugin will incorporate work done by developers outside of CKSource with their express permission. |
||||
|
||||
Trademarks |
||||
---------- |
||||
|
||||
CKEditor is a trademark of CKSource - Frederico Knabben. All other brand and product names are trademarks, registered trademarks or service marks of their respective holders. |
||||
|
||||
@ -1,71 +1,71 @@ |
||||
a |
||||
{ |
||||
text-decoration:none; |
||||
padding: 2px 4px 4px 6px; |
||||
display : block; |
||||
border-width: 1px; |
||||
border-style: solid; |
||||
margin : 0px; |
||||
} |
||||
|
||||
a.cke_scayt_toogle:hover, |
||||
a.cke_scayt_toogle:focus, |
||||
a.cke_scayt_toogle:active |
||||
{ |
||||
border-color: #316ac5; |
||||
background-color: #dff1ff; |
||||
color : #000; |
||||
cursor: pointer; |
||||
margin : 0px; |
||||
} |
||||
a.cke_scayt_toogle { |
||||
color : #316ac5; |
||||
border-color: #fff; |
||||
} |
||||
.scayt_enabled a.cke_scayt_item { |
||||
color : #316ac5; |
||||
border-color: #fff; |
||||
margin : 0px; |
||||
} |
||||
.scayt_disabled a.cke_scayt_item { |
||||
color : gray; |
||||
border-color : #fff; |
||||
} |
||||
.scayt_enabled a.cke_scayt_item:hover, |
||||
.scayt_enabled a.cke_scayt_item:focus, |
||||
.scayt_enabled a.cke_scayt_item:active |
||||
{ |
||||
border-color: #316ac5; |
||||
background-color: #dff1ff; |
||||
color : #000; |
||||
cursor: pointer; |
||||
} |
||||
.scayt_disabled a.cke_scayt_item:hover, |
||||
.scayt_disabled a.cke_scayt_item:focus, |
||||
.scayt_disabled a.cke_scayt_item:active |
||||
{ |
||||
border-color: gray; |
||||
background-color: #dff1ff; |
||||
color : gray; |
||||
cursor: no-drop; |
||||
} |
||||
.cke_scayt_set_on, .cke_scayt_set_off |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_enabled .cke_scayt_set_on |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_disabled .cke_scayt_set_on |
||||
{ |
||||
display: inline; |
||||
} |
||||
.scayt_disabled .cke_scayt_set_off |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_enabled .cke_scayt_set_off |
||||
{ |
||||
display: inline; |
||||
} |
||||
a |
||||
{ |
||||
text-decoration:none; |
||||
padding: 2px 4px 4px 6px; |
||||
display : block; |
||||
border-width: 1px; |
||||
border-style: solid; |
||||
margin : 0px; |
||||
} |
||||
|
||||
a.cke_scayt_toogle:hover, |
||||
a.cke_scayt_toogle:focus, |
||||
a.cke_scayt_toogle:active |
||||
{ |
||||
border-color: #316ac5; |
||||
background-color: #dff1ff; |
||||
color : #000; |
||||
cursor: pointer; |
||||
margin : 0px; |
||||
} |
||||
a.cke_scayt_toogle { |
||||
color : #316ac5; |
||||
border-color: #fff; |
||||
} |
||||
.scayt_enabled a.cke_scayt_item { |
||||
color : #316ac5; |
||||
border-color: #fff; |
||||
margin : 0px; |
||||
} |
||||
.scayt_disabled a.cke_scayt_item { |
||||
color : gray; |
||||
border-color : #fff; |
||||
} |
||||
.scayt_enabled a.cke_scayt_item:hover, |
||||
.scayt_enabled a.cke_scayt_item:focus, |
||||
.scayt_enabled a.cke_scayt_item:active |
||||
{ |
||||
border-color: #316ac5; |
||||
background-color: #dff1ff; |
||||
color : #000; |
||||
cursor: pointer; |
||||
} |
||||
.scayt_disabled a.cke_scayt_item:hover, |
||||
.scayt_disabled a.cke_scayt_item:focus, |
||||
.scayt_disabled a.cke_scayt_item:active |
||||
{ |
||||
border-color: gray; |
||||
background-color: #dff1ff; |
||||
color : gray; |
||||
cursor: no-drop; |
||||
} |
||||
.cke_scayt_set_on, .cke_scayt_set_off |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_enabled .cke_scayt_set_on |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_disabled .cke_scayt_set_on |
||||
{ |
||||
display: inline; |
||||
} |
||||
.scayt_disabled .cke_scayt_set_off |
||||
{ |
||||
display: none; |
||||
} |
||||
.scayt_enabled .cke_scayt_set_off |
||||
{ |
||||
display: inline; |
||||
} |
||||
|
||||
|
After Width: | Height: | Size: 2.8 KiB |
|
After Width: | Height: | Size: 839 B |
@ -0,0 +1,13 @@ |
||||
/* |
||||
Copyright (c) 2003-2015, CKSource - Frederico Knabben. All rights reserved. |
||||
For licensing, see LICENSE.html or http://ckeditor.com/license
|
||||
*/ |
||||
CKEDITOR.plugins.setLang( 'scayt', 'zh', { |
||||
btn_about: '關於即時拼寫檢查', |
||||
btn_dictionaries: '字典', |
||||
btn_disable: '關閉即時拼寫檢查', |
||||
btn_enable: '啟用即時拼寫檢查', |
||||
btn_langs: '語言', |
||||
btn_options: '選項', |
||||
text_title: '即時拼寫檢查' |
||||
}); |
||||
File diff suppressed because it is too large
Load Diff
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue