Menu
▾
▴
tikiwiki-cvs
|
From: <kr...@us...> - 2016-08-18 10:14:14
|
Revision: 59463
http://sourceforge.net/p/tikiwiki/code/59463
Author: kroky6
Date: 2016-08-18 10:14:12 +0000 (Thu, 18 Aug 2016)
Log Message:
-----------
[ENH] make all composer packages download from composer.tiki.org
Modified Paths:
--------------
trunk/composer.json
trunk/composer.lock
Modified: trunk/composer.json
===================================================================
--- trunk/composer.json 2016-08-18 09:19:21 UTC (rev 59462)
+++ trunk/composer.json 2016-08-18 10:14:12 UTC (rev 59463)
@@ -5,8 +5,6 @@
"homepage": "https://tiki.org",
"minimum-stability": "stable",
"require": {
- "twitter/bootstrap": "3.3.6",
- "fortawesome/font-awesome": "4.5.0",
"adodb/adodb": "5.18",
"aFarkas/html5shiv": "3.7.3",
"alxlit/bootstrap-chosen": "1.0.1",
@@ -23,6 +21,7 @@
"cwspear/bootstrap-hover-dropdown": "2.1.3",
"dompdf/dompdf": "0.6.1",
"ezyang/htmlpurifier": "4.7.0",
+ "fortawesome/font-awesome": "4.5.0",
"google/apiclient":"1.1.6",
"jcapture-applet/jcapture-applet": "dev-master",
"jquery/jquery": "2.2.2",
@@ -59,8 +58,8 @@
"jquery/plugins/zoom": "1.7.13",
"mediumjs/mediumjs": "1.0.1",
"morteza/bootstrap-rtl": "3.3.2",
- "nnnick/chartjs": "dev-master",
- "openlayers/ol3": ">=3.6.0",
+ "nnnick/chartjs": "dev-master",
+ "openlayers/ol3": ">=3.6.0",
"oyejorge/less.php": "1.7.0.10",
"phpcas/phpcas": "1.3.3",
"phpseclib/phpseclib": "0.3.6",
@@ -72,13 +71,14 @@
"smarty/smarty": "3.1.21",
"sorich87/bootstrap-tour": "0.10.3",
"svg-edit/svg-edit": "2.8.1",
+ "symfony/console": "2.6.4",
+ "symfony/dependency-injection": "2.6.4",
+ "symfony/config": "2.6.4",
"tijsverkoyen/css-to-inline-styles": "1.2.1",
+ "twitter/bootstrap": "3.3.6",
"undojs/undojs": "1",
"zetacomponents/base": "1.8",
"zetacomponents/webdav": "1.1.3",
- "symfony/console": "2.6.4",
- "symfony/dependency-injection": "2.6.4",
- "symfony/config": "2.6.4",
"zendframework/zend-config": "~2.4",
"zendframework/zend-validator": "~2.4",
"zendframework/zend-filter": "~2.4",
Modified: trunk/composer.lock
===================================================================
--- trunk/composer.lock 2016-08-18 09:19:21 UTC (rev 59462)
+++ trunk/composer.lock 2016-08-18 10:14:12 UTC (rev 59463)
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "471359c825a4bcb0df2ebfb4e12e41c0",
- "content-hash": "d754d5da8a063a30f5ed11b890c50b3c",
+ "hash": "296569b924c7f1d1e6403e729aa9eb79",
+ "content-hash": "3ba52a862bb9231542ba9da8d44f0f6b",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -252,20 +252,20 @@
},
{
"name": "components/bootstrap",
- "version": "3.3.6",
+ "version": "3.3.7",
"source": {
"type": "git",
"url": "https://github.com/components/bootstrap.git",
- "reference": "fb4923919c620b8b2aa8a11eda16b49b0a9e8a27"
+ "reference": "fe6e7683be66ba45a725816efdb51d4566733043"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/components/bootstrap/zipball/fb4923919c620b8b2aa8a11eda16b49b0a9e8a27",
- "reference": "fb4923919c620b8b2aa8a11eda16b49b0a9e8a27",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/components-bootstrap-fe6e7683be66ba45a725816efdb51d4566733043-zip-b28361.zip",
+ "reference": "fe6e7683be66ba45a725816efdb51d4566733043",
+ "shasum": "fd4b8de953bca65a1b683bf576165a65052bd4d8"
},
"require": {
- "components/jquery": "1.9.1 - 2"
+ "components/jquery": "1.9.1 - 3"
},
"suggest": {
"components/bootstrap-default": "Provide a theme for Bootstrap as components/bootstrap only provides the CSS as file assets"
@@ -316,21 +316,21 @@
"responsive",
"web"
],
- "time": "2015-11-24 20:19:41"
+ "time": "2016-07-26 05:59:20"
},
{
"name": "components/jquery",
- "version": "2.2.4",
+ "version": "3.1.0",
"source": {
"type": "git",
"url": "https://github.com/components/jquery.git",
- "reference": "981036fcb56668433a7eb0d1e71190324b4574df"
+ "reference": "39192bee49ceb98f36e9592ee2fc5116a414b6cc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/components/jquery/zipball/981036fcb56668433a7eb0d1e71190324b4574df",
- "reference": "981036fcb56668433a7eb0d1e71190324b4574df",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/components-jquery-39192bee49ceb98f36e9592ee2fc5116a414b6cc-zip-92b012.zip",
+ "reference": "39192bee49ceb98f36e9592ee2fc5116a414b6cc",
+ "shasum": "1b747afbc5fab4fedaba48413969d4f4c5a32dbd"
},
"type": "component",
"extra": {
@@ -340,9 +340,7 @@
],
"files": [
"jquery.min.js",
- "jquery.min.map",
- "jquery-migrate.js",
- "jquery-migrate.min.js"
+ "jquery.min.map"
]
}
},
@@ -358,7 +356,7 @@
],
"description": "jQuery JavaScript Library",
"homepage": "http://jquery.com",
- "time": "2016-05-25 06:43:59"
+ "time": "2016-07-08 05:56:55"
},
{
"name": "container-interop/container-interop",
@@ -370,9 +368,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/container-interop/container-interop/zipball/fc08354828f8fd3245f77a66b9e23a6bca48297e",
+ "url": "https://composer.tiki.org/dist/container-interop-container-interop-fc08354828f8fd3245f77a66b9e23a6bca48297e-zip-55a405.zip",
"reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
- "shasum": ""
+ "shasum": "9498e98ac8888e7235611f16fb420b9df5349a45"
},
"type": "library",
"autoload": {
@@ -530,9 +528,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/fddd2c240452e6c8990c4ef75e0265b455aa7968",
+ "url": "https://composer.tiki.org/dist/fortawesome-font-awesome-fddd2c240452e6c8990c4ef75e0265b455aa7968-zip-85d023.zip",
"reference": "fddd2c240452e6c8990c4ef75e0265b455aa7968",
- "shasum": ""
+ "shasum": "7c22c8c15abfd89748245f65605136860fed408f"
},
"require-dev": {
"jekyll": "1.0.2",
@@ -566,7 +564,7 @@
"font",
"icon"
],
- "time": "2015-11-23 14:42:32"
+ "time": "2015-11-30 17:28:02"
},
{
"name": "google/apiclient",
@@ -578,9 +576,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/google/google-api-php-client/zipball/a25dc9d5c109ebb02945ba1ff6336cc937c27628",
+ "url": "https://composer.tiki.org/dist/google-apiclient-a25dc9d5c109ebb02945ba1ff6336cc937c27628-zip-f50c1c.zip",
"reference": "a25dc9d5c109ebb02945ba1ff6336cc937c27628",
- "shasum": ""
+ "shasum": "61a496fd946d55ea158caca0d8a67bded1a69213"
},
"require": {
"php": ">=5.2.1"
@@ -1061,13 +1059,13 @@
"source": {
"type": "git",
"url": "https://github.com/chartjs/Chart.js.git",
- "reference": "885eeb091a0908cf80767f2af515ac73f3abe52d"
+ "reference": "349a8a33ea2a3216bcb41666afe945944132e1b9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/chartjs/Chart.js/zipball/885eeb091a0908cf80767f2af515ac73f3abe52d",
- "reference": "885eeb091a0908cf80767f2af515ac73f3abe52d",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/nnnick-chartjs-349a8a33ea2a3216bcb41666afe945944132e1b9-zip-6d7fc2.zip",
+ "reference": "349a8a33ea2a3216bcb41666afe945944132e1b9",
+ "shasum": "15feec18f2c9c44625c6b55d7d251af0a938c8eb"
},
"require": {
"php": ">=5.3.3"
@@ -1094,7 +1092,7 @@
"JS",
"chart"
],
- "time": "2016-07-12 15:33:48"
+ "time": "2016-08-12 16:31:54"
},
{
"name": "openlayers/ol3",
@@ -1117,9 +1115,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/oyejorge/less.php/zipball/a1e2d3c20794b37ac4d0baeb24613e579584033b",
+ "url": "https://composer.tiki.org/dist/oyejorge-less-php-a1e2d3c20794b37ac4d0baeb24613e579584033b-zip-8e000d.zip",
"reference": "a1e2d3c20794b37ac4d0baeb24613e579584033b",
- "shasum": ""
+ "shasum": "1d1ad0d9a0e4fa69fac4c5ab6d9a97bc37ee77d0"
},
"require": {
"php": ">=5.3"
@@ -1170,54 +1168,6 @@
"time": "2015-12-30 05:47:36"
},
{
- "name": "paragonie/random_compat",
- "version": "v2.0.2",
- "source": {
- "type": "git",
- "url": "https://github.com/paragonie/random_compat.git",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf"
- },
- "dist": {
- "type": "zip",
- "url": "https://api.github.com/repos/paragonie/random_compat/zipball/088c04e2f261c33bed6ca5245491cfca69195ccf",
- "reference": "088c04e2f261c33bed6ca5245491cfca69195ccf",
- "shasum": ""
- },
- "require": {
- "php": ">=5.2.0"
- },
- "require-dev": {
- "phpunit/phpunit": "4.*|5.*"
- },
- "suggest": {
- "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
- },
- "type": "library",
- "autoload": {
- "files": [
- "lib/random.php"
- ]
- },
- "notification-url": "https://packagist.org/downloads/",
- "license": [
- "MIT"
- ],
- "authors": [
- {
- "name": "Paragon Initiative Enterprises",
- "email": "sec...@pa...",
- "homepage": "https://paragonie.com"
- }
- ],
- "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
- "keywords": [
- "csprng",
- "pseudorandom",
- "random"
- ],
- "time": "2016-04-03 06:00:07"
- },
- {
"name": "phenx/php-font-lib",
"version": "0.2.2",
"source": {
@@ -1227,9 +1177,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PhenX/php-font-lib/zipball/c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82",
+ "url": "https://composer.tiki.org/dist/phenx-php-font-lib-c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82-zip-44e847.zip",
"reference": "c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82",
- "shasum": ""
+ "shasum": "946cf5adaee797b4ad103d14579fc24e59527534"
},
"type": "library",
"autoload": {
@@ -1389,9 +1339,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/php-fig/log/zipball/fe0936ee26643249e916849d48e3a51d5f5e278b",
+ "url": "https://composer.tiki.org/dist/psr-log-fe0936ee26643249e916849d48e3a51d5f5e278b-zip-e71523.zip",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
- "shasum": ""
+ "shasum": "c2c58680b9f7103bfb5cc1e20a805e9e5a528a4b"
},
"type": "library",
"autoload": {
@@ -1539,13 +1489,13 @@
"source": {
"type": "git",
"url": "https://github.com/symfony/config.git",
- "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408"
+ "reference": "17330c1d667edbbcca10616df82e8ade03bc1b33"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/symfony-config-a9f781ba1221067d1f07c8cec0bc50f81b8d7408-zip-a2a4ca.zip",
- "reference": "a9f781ba1221067d1f07c8cec0bc50f81b8d7408",
- "shasum": "a27bd9460559a877596ed93e46ec270e37a4ac71"
+ "url": "https://composer.tiki.org/dist/symfony-config-17330c1d667edbbcca10616df82e8ade03bc1b33-zip-3fa418.zip",
+ "reference": "17330c1d667edbbcca10616df82e8ade03bc1b33",
+ "shasum": "3b2f66c491464d9de0e0f629f8dcde86b5e186b4"
},
"require": {
"php": ">=5.3.3",
@@ -1699,17 +1649,17 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.8.8",
+ "version": "v2.8.9",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "7258ddd6f987053f21fa43d03430580ba54e6096"
+ "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/filesystem/zipball/7258ddd6f987053f21fa43d03430580ba54e6096",
- "reference": "7258ddd6f987053f21fa43d03430580ba54e6096",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/symfony-filesystem-ab4c3f085c8f5a56536845bf985c4cef30bf75fd-zip-02d8cb.zip",
+ "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
+ "shasum": "eba7ce75ed484a1f6bf906605fba7aa3b1b44b35"
},
"require": {
"php": ">=5.3.9"
@@ -1744,7 +1694,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-06-29 05:31:50"
+ "time": "2016-07-20 05:41:28"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -1795,9 +1745,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twbs/bootstrap/zipball/81df608a40bf0629a1dc08e584849bb1e43e0b7a",
+ "url": "https://composer.tiki.org/dist/twitter-bootstrap-81df608a40bf0629a1dc08e584849bb1e43e0b7a-zip-bc9c50.zip",
"reference": "81df608a40bf0629a1dc08e584849bb1e43e0b7a",
- "shasum": ""
+ "shasum": "2d7778dd1745f4202a82f40ee87d3de4a8210aa9"
},
"replace": {
"twitter/bootstrap": "self.version"
@@ -1857,9 +1807,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-captcha/zipball/9a1197bc5b8aa4fad104c22f6d9b2a3d4bdda0c6",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-captcha-9a1197bc5b8aa4fad104c22f6d9b2a3d4bdda0c6-zip-964e85.zip",
"reference": "9a1197bc5b8aa4fad104c22f6d9b2a3d4bdda0c6",
- "shasum": ""
+ "shasum": "ba481a17cd90df97af3bfef8a6e78c8fedbd3360"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -1906,17 +1856,17 @@
},
{
"name": "zendframework/zend-code",
- "version": "3.0.4",
+ "version": "2.6.3",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-code.git",
- "reference": "c5272131d3acb0f470a2462ed088fca3b6ba61c2"
+ "reference": "95033f061b083e16cdee60530ec260d7d628b887"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-code/zipball/c5272131d3acb0f470a2462ed088fca3b6ba61c2",
- "reference": "c5272131d3acb0f470a2462ed088fca3b6ba61c2",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-code-95033f061b083e16cdee60530ec260d7d628b887-zip-627e89.zip",
+ "reference": "95033f061b083e16cdee60530ec260d7d628b887",
+ "shasum": "b62bfc4242bb4b78e596ebf91f0bc2ee4fca1653"
},
"require": {
"php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
@@ -1924,9 +1874,8 @@
},
"require-dev": {
"doctrine/annotations": "~1.0",
- "ext-phar": "*",
+ "fabpot/php-cs-fixer": "1.7.*",
"phpunit/phpunit": "^4.8.21",
- "squizlabs/php_codesniffer": "^2.5",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"suggest": {
@@ -1936,8 +1885,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
}
},
"autoload": {
@@ -1955,7 +1904,7 @@
"code",
"zf2"
],
- "time": "2016-06-30 22:35:27"
+ "time": "2016-04-20 17:26:42"
},
{
"name": "zendframework/zend-config",
@@ -1967,9 +1916,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-config/zipball/2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-config-2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d-zip-cfb12d.zip",
"reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
- "shasum": ""
+ "shasum": "e73278a91e8dc55fc62b7263159eaddee59e2b41"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2015,37 +1964,36 @@
},
{
"name": "zendframework/zend-crypt",
- "version": "3.0.0",
+ "version": "2.6.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-crypt.git",
- "reference": "ed348e3e87c945759d11edae5316125c3582bc72"
+ "reference": "1b2f5600bf6262904167116fa67b58ab1457036d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-crypt/zipball/ed348e3e87c945759d11edae5316125c3582bc72",
- "reference": "ed348e3e87c945759d11edae5316125c3582bc72",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-crypt-1b2f5600bf6262904167116fa67b58ab1457036d-zip-529b97.zip",
+ "reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
+ "shasum": "736012ab55fdc603bfab2270d47ee094f8394a3c"
},
"require": {
"container-interop/container-interop": "~1.0",
- "ext-mbstring": "*",
- "php": "^5.6 || ^7.0",
- "zendframework/zend-math": "^3.0",
+ "php": "^5.5 || ^7.0",
+ "zendframework/zend-math": "^2.6",
"zendframework/zend-stdlib": "^2.7 || ^3.0"
},
"require-dev": {
- "phpunit/phpunit": "~4.8",
- "squizlabs/php_codesniffer": "^2.3.1"
+ "fabpot/php-cs-fixer": "1.7.*",
+ "phpunit/phpunit": "~4.0"
},
"suggest": {
- "ext-openssl": "Required for most features of Zend\\Crypt"
+ "ext-mcrypt": "Required for most features of Zend\\Crypt"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "2.6-dev",
+ "dev-develop": "2.7-dev"
}
},
"autoload": {
@@ -2062,7 +2010,7 @@
"crypt",
"zf2"
],
- "time": "2016-06-21 18:15:32"
+ "time": "2016-02-03 23:46:30"
},
{
"name": "zendframework/zend-escaper",
@@ -2074,9 +2022,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-escaper/zipball/2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-escaper-2dcd14b61a72d8b8e27d579c6344e12c26141d4e-zip-0742ef.zip",
"reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
- "shasum": ""
+ "shasum": "e965949da579e0430e0bf972fb5cb77b4e502280"
},
"require": {
"php": ">=5.5"
@@ -2118,9 +2066,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/3d41b6129fb4916d483671cea9f77e4f90ae85d3",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-eventmanager-3d41b6129fb4916d483671cea9f77e4f90ae85d3-zip-df5f20.zip",
"reference": "3d41b6129fb4916d483671cea9f77e4f90ae85d3",
- "shasum": ""
+ "shasum": "99c7d4193368bfc06063cb4b054f304d3ef8256e"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2165,9 +2113,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-feed/zipball/12b328d382aa5200f1de53d4147033b885776b67",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-feed-12b328d382aa5200f1de53d4147033b885776b67-zip-ec1dc8.zip",
"reference": "12b328d382aa5200f1de53d4147033b885776b67",
- "shasum": ""
+ "shasum": "6b7020fef4e5e962df06d38201b4c88a055eb2e3"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2226,9 +2174,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-filter/zipball/84c50246428efb0a1e52868e162dab3e149d5b80",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-filter-84c50246428efb0a1e52868e162dab3e149d5b80-zip-a06e43.zip",
"reference": "84c50246428efb0a1e52868e162dab3e149d5b80",
- "shasum": ""
+ "shasum": "3df3768e2a498500af7a8af370877ba0ea6cdb41"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2278,17 +2226,17 @@
},
{
"name": "zendframework/zend-http",
- "version": "2.5.4",
+ "version": "2.5.5",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-http.git",
- "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c"
+ "reference": "98b1cac0bc7a91497c5898184281abcd0e24c8d6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-http/zipball/7b920b4ec34b5ee58f76eb4e8c408b083121953c",
- "reference": "7b920b4ec34b5ee58f76eb4e8c408b083121953c",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-http-98b1cac0bc7a91497c5898184281abcd0e24c8d6-zip-8a2699.zip",
+ "reference": "98b1cac0bc7a91497c5898184281abcd0e24c8d6",
+ "shasum": "5ad60304f1dfbaa498b34b7c71b6f5b515a75ae1"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2324,7 +2272,7 @@
"http",
"zf2"
],
- "time": "2016-02-04 20:36:48"
+ "time": "2016-08-08 15:01:54"
},
{
"name": "zendframework/zend-hydrator",
@@ -2336,9 +2284,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-hydrator/zipball/22652e1661a5a10b3f564cf7824a2206cf5a4a65",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-hydrator-22652e1661a5a10b3f564cf7824a2206cf5a4a65-zip-a42ae9.zip",
"reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
- "shasum": ""
+ "shasum": "6a355789c7178ec131c0cbde7e5e4ce3316a4507"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2394,9 +2342,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-i18n/zipball/b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-i18n-b2db0d8246a865c659f93199f90f5fc2cd2f3cd8-zip-f21086.zip",
"reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
- "shasum": ""
+ "shasum": "be2646c96d8d0dc6753013f6439073c8a914fde2"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2461,9 +2409,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-json/zipball/4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-json-4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28-zip-718720.zip",
"reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
- "shasum": ""
+ "shasum": "f3bc39072581d144712162a3c89dcec6ec332a8c"
},
"require": {
"php": "^5.5 || ^7.0"
@@ -2516,9 +2464,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-loader/zipball/c5fd2f071bde071f4363def7dea8dec7393e135c",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-loader-c5fd2f071bde071f4363def7dea8dec7393e135c-zip-6cb83f.zip",
"reference": "c5fd2f071bde071f4363def7dea8dec7393e135c",
- "shasum": ""
+ "shasum": "e469d64b045a8ff38781557fa112ba04834f7ba1"
},
"require": {
"php": ">=5.3.23"
@@ -2552,17 +2500,17 @@
},
{
"name": "zendframework/zend-log",
- "version": "2.9.0",
+ "version": "2.9.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-log.git",
- "reference": "0325ad00505b8f39d79f26e666dc851bfd25fdaa"
+ "reference": "115d75db1f8fb29efbf1b9a49cb91c662b7195dc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-log/zipball/0325ad00505b8f39d79f26e666dc851bfd25fdaa",
- "reference": "0325ad00505b8f39d79f26e666dc851bfd25fdaa",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-log-115d75db1f8fb29efbf1b9a49cb91c662b7195dc-zip-7964d2.zip",
+ "reference": "115d75db1f8fb29efbf1b9a49cb91c662b7195dc",
+ "shasum": "dc4d05b75615691a3d797294f0511600f2df6f3d"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -2574,10 +2522,9 @@
"psr/log-implementation": "1.0.0"
},
"require-dev": {
- "fabpot/php-cs-fixer": "1.7.*",
+ "friendsofphp/php-cs-fixer": "~1.7.0",
"mikey179/vfsstream": "^1.6",
"phpunit/phpunit": "~4.0",
- "zendframework/zend-console": "^2.6",
"zendframework/zend-db": "^2.6",
"zendframework/zend-escaper": "^2.5",
"zendframework/zend-filter": "^2.5",
@@ -2585,6 +2532,7 @@
"zendframework/zend-validator": "^2.6"
},
"suggest": {
+ "ext-mongo": "mongo extension to use Mongo writer",
"ext-mongodb": "mongodb extension to use MongoDB writer",
"zendframework/zend-console": "Zend\\Console component to use the RequestID log processor",
"zendframework/zend-db": "Zend\\Db component to use the database log writer",
@@ -2619,7 +2567,7 @@
"logging",
"zf2"
],
- "time": "2016-06-22 22:25:25"
+ "time": "2016-08-11 13:44:10"
},
{
"name": "zendframework/zend-mail",
@@ -2631,9 +2579,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mail/zipball/2e817b58ebaa2b422a25d854106a91f74b6a7976",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-mail-2e817b58ebaa2b422a25d854106a91f74b6a7976-zip-3e3116.zip",
"reference": "2e817b58ebaa2b422a25d854106a91f74b6a7976",
- "shasum": ""
+ "shasum": "b08ad4b79d6d189aa6e042cb6d69f58c4d947d9e"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2683,36 +2631,36 @@
},
{
"name": "zendframework/zend-math",
- "version": "3.0.0",
+ "version": "2.7.0",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-math.git",
- "reference": "fda3b4e6c3bb15c35adc6db38b2eacabaa243e65"
+ "reference": "f4358090d5d23973121f1ed0b376184b66d9edec"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-math/zipball/fda3b4e6c3bb15c35adc6db38b2eacabaa243e65",
- "reference": "fda3b4e6c3bb15c35adc6db38b2eacabaa243e65",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-math-f4358090d5d23973121f1ed0b376184b66d9edec-zip-c875e3.zip",
+ "reference": "f4358090d5d23973121f1ed0b376184b66d9edec",
+ "shasum": "c67ed4ff968bc7e3ee06acbf8fe6a5f7f1540c35"
},
"require": {
- "ext-mbstring": "*",
- "paragonie/random_compat": "^2.0.2",
"php": "^5.5 || ^7.0"
},
"require-dev": {
"fabpot/php-cs-fixer": "1.7.*",
+ "ircmaxell/random-lib": "~1.1",
"phpunit/phpunit": "~4.0"
},
"suggest": {
"ext-bcmath": "If using the bcmath functionality",
- "ext-gmp": "If using the gmp functionality"
+ "ext-gmp": "If using the gmp functionality",
+ "ircmaxell/random-lib": "Fallback random byte generator for Zend\\Math\\Rand if Mcrypt extensions is unavailable"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "2.7-dev",
+ "dev-develop": "2.8-dev"
}
},
"autoload": {
@@ -2729,7 +2677,7 @@
"math",
"zf2"
],
- "time": "2016-04-28 17:37:42"
+ "time": "2016-04-07 16:29:53"
},
{
"name": "zendframework/zend-mime",
@@ -2741,9 +2689,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-mime/zipball/340769c3d962ac4d9d3cf9da7e75419368e56fcc",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-mime-340769c3d962ac4d9d3cf9da7e75419368e56fcc-zip-20700b.zip",
"reference": "340769c3d962ac4d9d3cf9da7e75419368e56fcc",
- "shasum": ""
+ "shasum": "fb36c5c37f02afeb2027bf6a09ff797bde1c9553"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2790,9 +2738,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-server/zipball/7cb617ca3e9b24579f544a244ee79ae61f480914",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-server-7cb617ca3e9b24579f544a244ee79ae61f480914-zip-c40014.zip",
"reference": "7cb617ca3e9b24579f544a244ee79ae61f480914",
- "shasum": ""
+ "shasum": "82be276812dc47d54e00d473ce62cec207d19b18"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -2828,17 +2776,17 @@
},
{
"name": "zendframework/zend-servicemanager",
- "version": "3.1.0",
+ "version": "3.1.1",
"source": {
"type": "git",
"url": "https://github.com/zendframework/zend-servicemanager.git",
- "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25"
+ "reference": "f701b0d322741b0c8d8ca1288f249a49438029cd"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-servicemanager/zipball/90b88339a4b937c6bb0055ee04b2567e7e628f25",
- "reference": "90b88339a4b937c6bb0055ee04b2567e7e628f25",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/zendframework-zend-servicemanager-f701b0d322741b0c8d8ca1288f249a49438029cd-zip-f2253c.zip",
+ "reference": "f701b0d322741b0c8d8ca1288f249a49438029cd",
+ "shasum": "e57269cb3c71114338dbd82250caae547ba6cb46"
},
"require": {
"container-interop/container-interop": "~1.0",
@@ -2860,8 +2808,8 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.0-dev",
- "dev-develop": "3.1-dev"
+ "dev-master": "3.1-dev",
+ "dev-develop": "3.2-dev"
}
},
"autoload": {
@@ -2879,7 +2827,7 @@
"servicemanager",
"zf"
],
- "time": "2016-06-01 16:50:58"
+ "time": "2016-07-15 14:59:51"
},
{
"name": "zendframework/zend-session",
@@ -2891,9 +2839,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-session/zipball/346e9709657b81a5d53d70ce754730a26d1f02f2",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-session-346e9709657b81a5d53d70ce754730a26d1f02f2-zip-8eddc7.zip",
"reference": "346e9709657b81a5d53d70ce754730a26d1f02f2",
- "shasum": ""
+ "shasum": "469fbcf90fb5bedf611fc6080a12cbbf814a8ab3"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2957,9 +2905,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-soap/zipball/2d6012e7231cce550219eccfc80836a028d20bf1",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-soap-2d6012e7231cce550219eccfc80836a028d20bf1-zip-a7e97a.zip",
"reference": "2d6012e7231cce550219eccfc80836a028d20bf1",
- "shasum": ""
+ "shasum": "e371776e7e56b16cdb4625c771f9b251f19ab7d4"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3009,9 +2957,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-stdlib/zipball/0e44eb46788f65e09e077eb7f44d2659143bcc1f",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-stdlib-0e44eb46788f65e09e077eb7f44d2659143bcc1f-zip-65b1cb.zip",
"reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
- "shasum": ""
+ "shasum": "86b295f520379a888bf363c8682cef22d15f45ca"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3068,9 +3016,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-tag/zipball/4429ca5016361f12eff920370170391a0f4adbff",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-tag-4429ca5016361f12eff920370170391a0f4adbff-zip-0c1020.zip",
"reference": "4429ca5016361f12eff920370170391a0f4adbff",
- "shasum": ""
+ "shasum": "10245c16f057224f442a9cf1d29ce81753962c83"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3119,9 +3067,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-uri/zipball/0bf717a239432b1a1675ae314f7c4acd742749ed",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-uri-0bf717a239432b1a1675ae314f7c4acd742749ed-zip-9617a6.zip",
"reference": "0bf717a239432b1a1675ae314f7c4acd742749ed",
- "shasum": ""
+ "shasum": "61054f6713a0ee57de905e692c15ebb7eca0f59b"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3166,9 +3114,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-validator/zipball/8ec9f57a717dd37340308aa632f148a2c2be1cfc",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-validator-8ec9f57a717dd37340308aa632f148a2c2be1cfc-zip-0ead33.zip",
"reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc",
- "shasum": ""
+ "shasum": "b9c0879dcb9b2be991dc641a029ebc76a11d9944"
},
"require": {
"container-interop/container-interop": "^1.1",
@@ -3237,9 +3185,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/zend-version/zipball/e30c55dc394eaf396f0347887af0a7bef471fe08",
+ "url": "https://composer.tiki.org/dist/zendframework-zend-version-e30c55dc394eaf396f0347887af0a7bef471fe08-zip-7a6e69.zip",
"reference": "e30c55dc394eaf396f0347887af0a7bef471fe08",
- "shasum": ""
+ "shasum": "0fd55fcf1057a1350e9b2d944ff5f7478c3aee9a"
},
"require": {
"php": ">=5.3.23",
@@ -3287,9 +3235,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendGData/zipball/333312548b2471642284a75d8804957b58fa26ab",
+ "url": "https://composer.tiki.org/dist/zendframework-zendgdata-333312548b2471642284a75d8804957b58fa26ab-zip-d1615a.zip",
"reference": "333312548b2471642284a75d8804957b58fa26ab",
- "shasum": ""
+ "shasum": "b328b7da2d339df6aab8914cb69679e9aeeb1cc0"
},
"require": {
"php": ">=5.3.3",
@@ -3333,9 +3281,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendOAuth/zipball/36defad317aa80ac9366f5e5171dc0316f009f13",
+ "url": "https://composer.tiki.org/dist/zendframework-zendoauth-36defad317aa80ac9366f5e5171dc0316f009f13-zip-846df7.zip",
"reference": "36defad317aa80ac9366f5e5171dc0316f009f13",
- "shasum": ""
+ "shasum": "d605334306b49d7ef5efeba3dc37d0292aabf144"
},
"require": {
"php": ">=5.3.3",
@@ -3380,9 +3328,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendOpenId/zipball/16648e1b2acf760d0c67a8c1dd913fed0c0f61f7",
+ "url": "https://composer.tiki.org/dist/zendframework-zendopenid-16648e1b2acf760d0c67a8c1dd913fed0c0f61f7-zip-038e8c.zip",
"reference": "16648e1b2acf760d0c67a8c1dd913fed0c0f61f7",
- "shasum": ""
+ "shasum": "ab590750fb3d401e3e1350b114c9f01ad5dbf31c"
},
"require": {
"php": ">=5.3.3",
@@ -3426,9 +3374,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendSearch/zipball/c8de2508d3413bf9d701b40c1092c1ffbdd8fc63",
+ "url": "https://composer.tiki.org/dist/zendframework-zendsearch-c8de2508d3413bf9d701b40c1092c1ffbdd8fc63-zip-2d79c6.zip",
"reference": "c8de2508d3413bf9d701b40c1092c1ffbdd8fc63",
- "shasum": ""
+ "shasum": "5f6409f374e20fc04e6817172f5c573a67f4c7ae"
},
"require": {
"php": ">=5.3.3",
@@ -3462,9 +3410,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendService_Akismet/zipball/fdfc3fc21103cafa4658ed92d813ab38a0f1ddad",
+ "url": "https://composer.tiki.org/dist/zendframework-zendservice-akismet-fdfc3fc21103cafa4658ed92d813ab38a0f1ddad-zip-89db1d.zip",
"reference": "fdfc3fc21103cafa4658ed92d813ab38a0f1ddad",
- "shasum": ""
+ "shasum": "c27d65678e1d59d86ebdc99e66e8632f91b14f6c"
},
"require": {
"php": ">=5.3.3",
@@ -3505,9 +3453,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendService_ReCaptcha/zipball/4324cca8502d9f47b3b43a18acdd3fdbeb965536",
+ "url": "https://composer.tiki.org/dist/zendframework-zendservice-recaptcha-4324cca8502d9f47b3b43a18acdd3fdbeb965536-zip-8c45bf.zip",
"reference": "4324cca8502d9f47b3b43a18acdd3fdbeb965536",
- "shasum": ""
+ "shasum": "31428f0e860c6367c1ca4e7b8f4c75a2b3122ee2"
},
"require": {
"php": ">=5.3.3",
@@ -3548,9 +3496,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/zendframework/ZendService_Twitter/zipball/b3be44fa3f2285e4ee9811ce5c518e3eab020732",
+ "url": "https://composer.tiki.org/dist/zendframework-zendservice-twitter-b3be44fa3f2285e4ee9811ce5c518e3eab020732-zip-4f4b9f.zip",
"reference": "b3be44fa3f2285e4ee9811ce5c518e3eab020732",
- "shasum": ""
+ "shasum": "b7713232c144e3d81d3767e51ee503968bcd5688"
},
"require": {
"php": ">=5.3.3",
@@ -3720,9 +3668,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/BafS/Testify.php/zipball/52dda3459096976689d255d44250c6f8f30e62a0",
+ "url": "https://composer.tiki.org/dist/bafs-testify-52dda3459096976689d255d44250c6f8f30e62a0-zip-faf2a3.zip",
"reference": "52dda3459096976689d255d44250c6f8f30e62a0",
- "shasum": ""
+ "shasum": "fc1b4ce1910fa70978891f757774230000df6a5e"
},
"require": {
"php": ">=5.3.0"
@@ -3755,9 +3703,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
+ "url": "https://composer.tiki.org/dist/doctrine-instantiator-8e884e78f9f0eb1329e445619e04456e64d8051d-zip-681b88.zip",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
- "shasum": ""
+ "shasum": "2e0c587f800f92eaaea87673ce82fd3e834daca8"
},
"require": {
"php": ">=5.3,<8.0-DEV"
@@ -3809,9 +3757,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/mikey179/vfsStream/zipball/fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
+ "url": "https://composer.tiki.org/dist/mikey179-vfsstream-fc0fe8f4d0b527254a2dc45f0c265567c881d07e-zip-a90953.zip",
"reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
- "shasum": ""
+ "shasum": "8a25f38cd2084e3946f1deb27715be11215ebe70"
},
"require": {
"php": ">=5.3.0"
@@ -3839,9 +3787,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
+ "url": "https://composer.tiki.org/dist/phpdocumentor-reflection-common-144c307535e82c8fdcaacbcfc1d6d8eeb896687c-zip-c3be2d.zip",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
- "shasum": ""
+ "shasum": "534319b01e0ba2a25f0b001fe8ea577ea3f6411b"
},
"require": {
"php": ">=5.5"
@@ -3893,9 +3841,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/9270140b940ff02e58ec577c237274e92cd40cdd",
+ "url": "https://composer.tiki.org/dist/phpdocumentor-reflection-docblock-9270140b940ff02e58ec577c237274e92cd40cdd-zip-550863.zip",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
- "shasum": ""
+ "shasum": "e84bbfc31d015a430b78c0786613a0fccc6bd50c"
},
"require": {
"php": ">=5.5",
@@ -3938,9 +3886,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/b39c7a5b194f9ed7bd0dd345c751007a41862443",
+ "url": "https://composer.tiki.org/dist/phpdocumentor-type-resolver-b39c7a5b194f9ed7bd0dd345c751007a41862443-zip-e34c86.zip",
"reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
- "shasum": ""
+ "shasum": "7dd749b370d07d01d168d0f6a228c2da481e36ff"
},
"require": {
"php": ">=5.5",
@@ -3985,9 +3933,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/phpspec/prophecy/zipball/58a8137754bc24b25740d4281399a4a3596058e0",
+ "url": "https://composer.tiki.org/dist/phpspec-prophecy-58a8137754bc24b25740d4281399a4a3596058e0-zip-b71cdf.zip",
"reference": "58a8137754bc24b25740d4281399a4a3596058e0",
- "shasum": ""
+ "shasum": "096dbc089623b5f4cedaed2e7ab1829569536e1f"
},
"require": {
"doctrine/instantiator": "^1.0.2",
@@ -4047,9 +3995,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/dbunit/zipball/390cefcb101e07e1d6400dbdfc3b90ecf2c1279f",
+ "url": "https://composer.tiki.org/dist/phpunit-dbunit-390cefcb101e07e1d6400dbdfc3b90ecf2c1279f-zip-e03a42.zip",
"reference": "390cefcb101e07e1d6400dbdfc3b90ecf2c1279f",
- "shasum": ""
+ "shasum": "5e8f511ae014cdf553151be1fc5706c6c5d565d4"
},
"require": {
"ext-pdo": "*",
@@ -4102,9 +4050,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979",
+ "url": "https://composer.tiki.org/dist/phpunit-php-code-coverage-eabf68b476ac7d0f73793aada060f1c1a9bf8979-zip-36457d.zip",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
- "shasum": ""
+ "shasum": "740943b471e3cf35895acf5a891e4b621170759e"
},
"require": {
"php": ">=5.3.3",
@@ -4164,9 +4112,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
+ "url": "https://composer.tiki.org/dist/phpunit-php-file-iterator-6150bf2c35d3fc379e50c7602b75caceaa39dbf0-zip-a7b18d.zip",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
- "shasum": ""
+ "shasum": "6c0c365bed35ad4a93f284a7be8458eb14ba73c4"
},
"require": {
"php": ">=5.3.3"
@@ -4211,9 +4159,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
+ "url": "https://composer.tiki.org/dist/phpunit-php-text-template-31f8b717e51d9a2afca6c9f046f5d69fc27c8686-zip-c6bcbd.zip",
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
- "shasum": ""
+ "shasum": "018a51f248d6495957bf7ad8a0cc32ecb0523e22"
},
"require": {
"php": ">=5.3.3"
@@ -4252,9 +4200,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/38e9124049cf1a164f1e4537caf19c99bf1eb260",
+ "url": "https://composer.tiki.org/dist/phpunit-php-timer-38e9124049cf1a164f1e4537caf19c99bf1eb260-zip-cb2ac7.zip",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
- "shasum": ""
+ "shasum": "f8b9251bca1f4a80a92aa0ce5770dad6e33c2be6"
},
"require": {
"php": ">=5.3.3"
@@ -4296,9 +4244,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
+ "url": "https://composer.tiki.org/dist/phpunit-php-token-stream-3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da-zip-cd5a07.zip",
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "shasum": ""
+ "shasum": "a52d650d1853e2db77ce37cac7662c9a1f18255e"
},
"require": {
"ext-tokenizer": "*",
@@ -4337,17 +4285,17 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.8.26",
+ "version": "4.8.27",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74"
+ "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fc1d8cd5b5de11625979125c5639347896ac2c74",
- "reference": "fc1d8cd5b5de11625979125c5639347896ac2c74",
- "shasum": ""
+ "url": "https://composer.tiki.org/dist/phpunit-phpunit-c062dddcb68e44b563f66ee319ddae2b5a322a90-zip-e04c6d.zip",
+ "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
+ "shasum": "704ce8b94992d45e84d0ef1a29cce2e57d217b7d"
},
"require": {
"ext-dom": "*",
@@ -4405,7 +4353,7 @@
"testing",
"xunit"
],
- "time": "2016-05-17 03:09:28"
+ "time": "2016-07-21 06:48:14"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -4417,9 +4365,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983",
+ "url": "https://composer.tiki.org/dist/phpunit-phpunit-mock-objects-ac8e7a3db35738d56ee9a76e78a4e03d97628983-zip-83ccd8.zip",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
- "shasum": ""
+ "shasum": "ee9f57f3a9a2c81b9f9148298c27047890728c16"
},
"require": {
"doctrine/instantiator": "^1.0.2",
@@ -4473,9 +4421,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/2bad798ec0daf20d2854400e3bc5329ee0a7b2d1",
+ "url": "https://composer.tiki.org/dist/phpunit-phpunit-selenium-2bad798ec0daf20d2854400e3bc5329ee0a7b2d1-zip-cb6ef8.zip",
"reference": "2bad798ec0daf20d2854400e3bc5329ee0a7b2d1",
- "shasum": ""
+ "shasum": "daf5d6cb16b4b5f0e2b9020915b0a8ea965ad31d"
},
"require": {
"ext-curl": "*",
@@ -4537,9 +4485,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22",
+ "url": "https://composer.tiki.org/dist/sebastian-comparator-937efb279bd37a375bcadf584dec0726f84dbf22-zip-275d2d.zip",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
- "shasum": ""
+ "shasum": "3f469376c97f5c4d72dbbb138fba34856e163cbc"
},
"require": {
"php": ">=5.3.3",
@@ -4601,9 +4549,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e",
+ "url": "https://composer.tiki.org/dist/sebastian-diff-13edfd8706462032c2f52b4b862974dd46b71c9e-zip-13c115.zip",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
- "shasum": ""
+ "shasum": "84fc8f87dbc18189794c1eadac79c7dd2bb86318"
},
"require": {
"php": ">=5.3.3"
@@ -4653,9 +4601,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/4e8f0da10ac5802913afc151413bc8c53b6c2716",
+ "url": "https://composer.tiki.org/dist/sebastian-environment-4e8f0da10ac5802913afc151413bc8c53b6c2716-zip-65fddb.zip",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
- "shasum": ""
+ "shasum": "b1885a2705ca3792f3d8f11ab24f4e47f703e984"
},
"require": {
"php": ">=5.3.3"
@@ -4703,9 +4651,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/42c4c2eec485ee3e159ec9884f95b431287edde4",
+ "url": "https://composer.tiki.org/dist/sebastian-exporter-42c4c2eec485ee3e159ec9884f95b431287edde4-zip-3c7575.zip",
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
- "shasum": ""
+ "shasum": "7f52c583bc85c792c7159d23d836c350205c0d9c"
},
"require": {
"php": ">=5.3.3",
@@ -4770,9 +4718,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4",
+ "url": "https://composer.tiki.org/dist/sebastian-global-state-bc37d50fea7d017d3d340f230811c9f1d7280af4-zip-c4abec.zip",
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
- "shasum": ""
+ "shasum": "84f68f907e6bad13740951d31e508256ecee07ad"
},
"require": {
"php": ">=5.3.3"
@@ -4821,9 +4769,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/913401df809e99e4f47b27cdd781f4a258d58791",
+ "url": "https://composer.tiki.org/dist/sebastian-recursion-context-913401df809e99e4f47b27cdd781f4a258d58791-zip-205e4a.zip",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791",
- "shasum": ""
+ "shasum": "6a784ebd109411a759a0aa82911dc78204138abb"
},
"require": {
"php": ">=5.3.3"
@@ -4874,9 +4822,9 @@
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
+ "url": "https://composer.tiki.org/dist/sebastian-version-58b3a85e7999757d6ad81c787a1fbf5ff6c628c6-zip-8093ed.zip",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
- "shasum": ""
+ "shasum": "6728e10e8cd38a0c46b8adc86d542082a981e141"
},
"type": "library",
"autoload": {
@@ -4901,17 +4849,17 @@
},
{
"name": "symfony/yaml",
- "version": "v3.1.2",
+ "version": "v3.1.3",
"source": {
"type": "git",
"url": "https://github.com/symfony/yaml.git",
- "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764de"
+ "reference": "1819adf2066880c7967df7180f4f662b6f0567ac"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/symfony/yaml/zipball/2884c26ce4c1d61aebf423a8b912950fe7c764de",
- "reference": "2884c26ce4c1d61aebf423a8b912950fe7c764...
[truncated message content] |
|
From: <jon...@us...> - 2016-08-18 18:52:28
|
Revision: 59465
http://sourceforge.net/p/tikiwiki/code/59465
Author: jonnybradley
Date: 2016-08-18 18:52:26 +0000 (Thu, 18 Aug 2016)
Log Message:
-----------
[ENH] Make svn checkouts work better with secdb part 1
[FIX] Remove (or lessen) the need to have a database connection to create the secdb file during release, and now svnup.sh
Documentation to follow...
Modified Paths:
--------------
trunk/doc/devtools/release.php
trunk/doc/devtools/svnup.sh
trunk/installer/installlib.php
trunk/templates/tiki-admin_security.tpl
trunk/tiki-admin_security.php
Property Changed:
----------------
trunk/db/
Index: trunk/db
===================================================================
--- trunk/db 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/db 2016-08-18 18:52:26 UTC (rev 59465)
Property changes on: trunk/db
___________________________________________________________________
Modified: svn:ignore
## -2,3 +2,4 ##
.htaccess
virtuals.inc
lock
+tiki-secdb_*svn_mysql.sql
Modified: trunk/doc/devtools/release.php
===================================================================
--- trunk/doc/devtools/release.php 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/doc/devtools/release.php 2016-08-18 18:52:26 UTC (rev 59465)
@@ -59,6 +59,16 @@
error("Uncommited changes exist in the working folder.\n");
}
+if ($options['only-secdb']) {
+ include_once('lib/setup/twversion.class.php');
+ $TWV = new TWVersion();
+
+ write_secdb(ROOT . "/db/tiki-secdb_{$TWV->version}_mysql.sql", ROOT, $TWV->version);
+ exit;
+}
+
+
+
$script = $_SERVER['argv'][0];
$version = isset($_SERVER['argv'][1]) ? $_SERVER['argv'][1] : '';
$subrelease = isset($_SERVER['argv'][2]) ? $_SERVER['argv'][2] : '';
@@ -246,12 +256,18 @@
fclose($fp);
+ $svn = preg_match('/svn$/', $version);
+
if ($file_exists) {
info(">> Existing SecDB file '$file' has been updated.");
- `svn add $file 2> /dev/null`;
+ if (! $svn) {
+ `svn add $file 2> /dev/null`;
+ }
} else {
info(">> SecDB file '$file' has been created.");
- `svn add $file`;
+ if (! $svn) {
+ `svn add $file`;
+ }
}
}
@@ -264,23 +280,13 @@
function md5_check_dir($root, $dir, $version, &$queries)
{
$d = dir($dir);
- $link = mysqli_connect();
+ $link = null;
- if (mysqli_connect_errno()) {
- global $phpCommand, $phpCommandArguments;
- error(
- "SecDB step failed because some filenames need escaping but no MySQL connection has been found (" . mysqli_connect_error() . ")."
- . "\nTry this command line instead (replace HOST, USER and PASS by a valid MySQL host, user and password) :"
- . "\n\n\t" . $phpCommand
- . " -d mysqli.default_host=HOST -d mysqli.default_user=USER -d mysqli.default_pw=PASS "
- . $phpCommandArguments . "\n"
- );
- }
while (false !== ($e = $d->read())) {
$entry = $dir . '/' . $e;
if (is_dir($entry)) {
// do not descend and no CVS/Subversion files
- if ($e != '..' && $e != '.' && $e != 'CVS' && $e != '.svn' && $entry!='./templates_c') {
+ if ($e != '..' && $e != '.' && $e != 'CVS' && $e != '.svn' && $entry != $root . '/templates_c' && $entry != $root . '/temp' && $entry != $root . '/vendor_custom') {
md5_check_dir($root, $entry, $version, $queries);
}
} else {
@@ -288,6 +294,22 @@
$file = '.' . substr($entry, strlen($root));
if (! preg_match('/^[a-zA-Z0-9\/ _+.-]+$/', $file) ) {
+
+ if (! $link) {
+ $link = mysqli_connect();
+
+ if (mysqli_connect_errno()) {
+ global $phpCommand, $phpCommandArguments;
+ error(
+ "SecDB step failed because some filenames need escaping but no MySQL connection has been found (" . mysqli_connect_error() . ")."
+ . "\nTry this command line instead (replace HOST, USER and PASS by a valid MySQL host, user and password) :"
+ . "\n\n\t" . $phpCommand
+ . " -d mysqli.default_host=HOST -d mysqli.default_user=USER -d mysqli.default_pw=PASS "
+ . $phpCommandArguments . "\n"
+ );
+ }
+ }
+
$file = @mysqli_real_escape_string($link,$file);
}
@@ -527,7 +549,8 @@
'no-packaging' => false,
'no-tagging' => false,
'force-yes' => false,
- 'debug-packaging' => false
+ 'debug-packaging' => false,
+ 'only-secdb' => false,
);
// Environment variables provide default values for parameter options. e.g. export TIKI_NO_SECDB=true
Modified: trunk/doc/devtools/svnup.sh
===================================================================
--- trunk/doc/devtools/svnup.sh 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/doc/devtools/svnup.sh 2016-08-18 18:52:26 UTC (rev 59465)
@@ -34,7 +34,14 @@
rm -f last.log
svn update > last.log
+
+# update composer and file perms
bash setup.sh -n fix
+
+# update secdb
+php doc/devtools/release.php --only-secdb --no-check-svn
+
+# update the database
php console.php database:update
# uncomment the line below to see the list of all files updated. (ex.: if running manually)
Modified: trunk/installer/installlib.php
===================================================================
--- trunk/installer/installlib.php 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/installer/installlib.php 2016-08-18 18:52:26 UTC (rev 59465)
@@ -94,7 +94,7 @@
}
$TWV = new TWVersion;
- $dbversion_tiki = $TWV->getBaseVersion();
+ $dbversion_tiki = $TWV->version;
// If a Mysql data file exists, use that. Very fast
// If data file is missing or the batch loader is not available, use the single insert method
Modified: trunk/templates/tiki-admin_security.tpl
===================================================================
--- trunk/templates/tiki-admin_security.tpl 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/templates/tiki-admin_security.tpl 2016-08-18 18:52:26 UTC (rev 59465)
@@ -37,7 +37,7 @@
<br>
<h2>{tr}Security checks{/tr}</h2>
<div>
- <a href="tiki-admin_security.php?check_files">{tr}Check all tiki files{/tr}</a>
+ <a href="tiki-admin_security.php?check_files" class="btn btn-default">{tr}Check all tiki files{/tr}</a>
<br>
{remarksbox type="tip" title="{tr}Info{/tr}"}
{tr}Note, that this can take a very long time. You should check your max_execution_time setting in php.ini.{/tr}
@@ -66,7 +66,7 @@
</div>
{/if}
-<a href="tiki-admin_security.php?check_file_permissions">{tr}Check file permissions{/tr}</a>
+<a href="tiki-admin_security.php?check_file_permissions" class="btn btn-default">{tr}Check file permissions{/tr}</a>
{remarksbox type="tip" title="{tr}Info{/tr}"}
{tr}Note, that this can take a very long time. You should check your max_execution_time setting in php.ini.{/tr}
Modified: trunk/tiki-admin_security.php
===================================================================
--- trunk/tiki-admin_security.php 2016-08-18 15:36:55 UTC (rev 59464)
+++ trunk/tiki-admin_security.php 2016-08-18 18:52:26 UTC (rev 59465)
@@ -248,7 +248,7 @@
while (false !== ($e = $d->read())) {
$entry = $dir . '/' . $e;
if (is_dir($entry)) {
- if ($e != '..' && $e != '.' && $entry != './templates_c') { // do not descend and no checking of templates_c since the file based md5 database would grow to big
+ if ($e != '..' && $e != '.' && $entry != './templates_c' && $entry != './temp') { // do not descend and no checking of templates_c since the file based md5 database would grow to big
md5_check_dir($entry, $result);
}
} else if (preg_match('/\.(sql|css|tpl|js|php)$/', $e)) {
@@ -312,6 +312,7 @@
require_once ('lib/setup/twversion.class.php');
$version = new TWVersion();
$tiki_versions = $version->tikiVersions();
+ $tiki_versions[] = $version->version;
$result = array();
md5_check_dir(".", $result);
$smarty->assign('filecheck', true);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <amn...@us...> - 2016-08-22 08:32:12
|
Revision: 59481
http://sourceforge.net/p/tikiwiki/code/59481
Author: amnabilal
Date: 2016-08-22 08:32:09 +0000 (Mon, 22 Aug 2016)
Log Message:
-----------
[Fix]Client side resizing, image_x and image_y parameters needs to be updated just before upload is called. tiki-upload_file.tpl reset resizing information incase gallery is changed from drop down.
Modified Paths:
--------------
trunk/lib/jquery_tiki/tiki-jquery_upload.js
trunk/templates/tiki-upload_file.tpl
Modified: trunk/lib/jquery_tiki/tiki-jquery_upload.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery_upload.js 2016-08-22 05:40:13 UTC (rev 59480)
+++ trunk/lib/jquery_tiki/tiki-jquery_upload.js 2016-08-22 08:32:09 UTC (rev 59481)
@@ -37,14 +37,14 @@
.on('click', function () {
$(this).parents("div.file-list").remove();
});
- var img_x=0;
+ var image_x=0;
if($("#image_max_size_x").val())
- img_x=parseInt($("#image_max_size_x").val());
- var img_y=0;
+ image_x=parseInt($("#image_max_size_x").val());
+ var image_y=0;
if($("#image_max_size_y").val())
- img_y=parseInt($("#image_max_size_y").val());
+ image_y=parseInt($("#image_max_size_y").val());
+
-
$('#fileupload').fileupload({
url: url,
@@ -57,10 +57,7 @@
disableImageResize: /Android(?!.*Chrome)|Opera/
.test(window.navigator.userAgent),
- imageMaxWidth: img_x,
- imageMaxHeight: img_y,
- // imageCrop: true, // Force cropped images
- previewMaxWidth: 100,
+ previewMaxWidth: 100,
previewMaxHeight: 100,
previewCrop: true,
@@ -73,8 +70,14 @@
downloadTemplate: null
}).on('fileuploadadd', function (e, data) {
-
-
+
+ image_x=parseInt($("#image_max_size_y").val());
+ image_y=parseInt($("#image_max_size_y").val());
+ $('#fileupload').fileupload({
+ imageMaxWidth: image_x,
+ imageMaxHeight: image_y
+
+ });
data.context = $('<div/>').addClass("file-list panel panel-default").prependTo('#files');
$.each(data.files, function (index, file) {
Modified: trunk/templates/tiki-upload_file.tpl
===================================================================
--- trunk/templates/tiki-upload_file.tpl 2016-08-22 05:40:13 UTC (rev 59480)
+++ trunk/templates/tiki-upload_file.tpl 2016-08-22 08:32:09 UTC (rev 59481)
@@ -142,7 +142,7 @@
</div>
<div class="form-group">
<label for="imagesize" class="col-md-8 col-md-offset-4">
- <input type="checkbox" id="imagesize" name="imagesize" checked="checked" value="yes" />{tr}Use Gallery default resize settings for images {if $gal_info["image_max_size_x"]}({$gal_info["image_max_size_x"]}px X {$gal_info["image_max_size_y"]} px){else}<div id="imageResizeInfo">(No resize)</div>{/if}{/tr}
+ <input type="checkbox" id="imagesize" name="imagesize" checked="checked" value="yes" />{tr}Use Gallery default resize settings for images <span id="imageResizeInfo">{if $gal_info["image_max_size_x"]}({$gal_info["image_max_size_x"]}px X {$gal_info["image_max_size_y"]} px){else}(No resize){/if}</span>{/tr}
</label>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-08-22 11:34:51
|
Revision: 59482
http://sourceforge.net/p/tikiwiki/code/59482
Author: jonnybradley
Date: 2016-08-22 11:34:49 +0000 (Mon, 22 Aug 2016)
Log Message:
-----------
[FIX] trackers: Use editItemPretty template in item creation as well as edit (thanks marclaporte)
Modified Paths:
--------------
trunk/lib/core/Services/Tracker/Controller.php
trunk/templates/tracker/insert_item.tpl
Modified: trunk/lib/core/Services/Tracker/Controller.php
===================================================================
--- trunk/lib/core/Services/Tracker/Controller.php 2016-08-22 08:32:09 UTC (rev 59481)
+++ trunk/lib/core/Services/Tracker/Controller.php 2016-08-22 11:34:49 UTC (rev 59482)
@@ -815,6 +815,17 @@
$title = $title;
}
+ if ($input->format->word()) {
+ $format = $input->format->word();
+ } else {
+ $format = $definition->getConfiguration('sectionFormat');
+ }
+
+ $editItemPretty = '';
+ if ($format === 'config') {
+ $editItemPretty = $definition->getConfiguration('editItemPretty');
+ }
+
return array(
'title' => $title,
'trackerId' => $trackerId,
@@ -825,7 +836,8 @@
'trackerLogo' => $definition->getConfiguration('logo'),
'modal' => $input->modal->int(),
'status' => $status,
- 'format' => $input->format->word(),
+ 'format' => $format,
+ 'editItemPretty' => $editItemPretty,
);
}
Modified: trunk/templates/tracker/insert_item.tpl
===================================================================
--- trunk/templates/tracker/insert_item.tpl 2016-08-22 08:32:09 UTC (rev 59481)
+++ trunk/templates/tracker/insert_item.tpl 2016-08-22 11:34:49 UTC (rev 59482)
@@ -16,8 +16,8 @@
<img src="{$trackerLogo|escape}" class="pull-left img-responsive img-rounded" alt="{$trackerName|escape}" height="64px" width="64px">
</div>
{/if}
- <form method="post" action="{service controller=tracker action=insert_item format=$format}" id="insertItemForm{$trackerId|escape}" {if ! $trackerId}display="hidden"{/if}>
- {trackerfields trackerId=$trackerId fields=$fields status=$status format=$format}
+ <form method="post" action="{service controller=tracker action=insert_item format=$format editItemPretty=$editItemPretty}" id="insertItemForm{$trackerId|escape}" {if ! $trackerId}display="hidden"{/if}>
+ {trackerfields trackerId=$trackerId fields=$fields status=$status format=$format editItemPretty=$editItemPretty}
{if ! $modal}
<div class="checkbox">
<label>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2016-08-24 10:17:34
|
Revision: 59508
http://sourceforge.net/p/tikiwiki/code/59508
Author: kroky6
Date: 2016-08-24 10:17:31 +0000 (Wed, 24 Aug 2016)
Log Message:
-----------
[ENH] PluginListExecute custom output format enhancing search table formatter with action list and checkboxes
Modified Paths:
--------------
trunk/lib/core/Search/Formatter/Builder.php
trunk/lib/core/Search/Query/WikiBuilder.php
trunk/lib/wiki-plugins/wikiplugin_list.php
trunk/lib/wiki-plugins/wikiplugin_listexecute.php
trunk/templates/search/list/table.tpl
Modified: trunk/lib/core/Search/Formatter/Builder.php
===================================================================
--- trunk/lib/core/Search/Formatter/Builder.php 2016-08-24 02:53:46 UTC (rev 59507)
+++ trunk/lib/core/Search/Formatter/Builder.php 2016-08-24 10:17:31 UTC (rev 59508)
@@ -17,6 +17,7 @@
private $count;
private $tsOn;
private $tsettings;
+ private $actions;
function __construct()
{
@@ -25,6 +26,7 @@
'offset_arg' => 'offset',
'max' => 50,
);
+ $this->actions = array();
}
function setPaginationArguments($arguments)
@@ -37,6 +39,10 @@
$this->formatterPlugin = $plugin;
}
+ function setActions($actions) {
+ $this->actions = $actions;
+ }
+
function apply($matches)
{
foreach ($matches as $match) {
@@ -127,6 +133,9 @@
foreach ($this->paginationArguments as $k => $v) {
$outputData[$k] = $this->paginationArguments[$k];
}
+ if( strstr($arguments['template'], 'table') )
+ $outputData['actions'] = $this->actions;
+
$templateData = file_get_contents($arguments['template']);
$plugin = new Search_Formatter_Plugin_SmartyTemplate($arguments['template']);
Modified: trunk/lib/core/Search/Query/WikiBuilder.php
===================================================================
--- trunk/lib/core/Search/Query/WikiBuilder.php 2016-08-24 02:53:46 UTC (rev 59507)
+++ trunk/lib/core/Search/Query/WikiBuilder.php 2016-08-24 10:17:31 UTC (rev 59508)
@@ -335,5 +335,119 @@
{
return $this->boost == 1;
}
+
+ function applyTablesorter(WikiParser_PluginMatcher $matches, $hasactions = false)
+ {
+ $ret = ['max' => false, 'tsOn' => false];
+ $parser = new WikiParser_PluginArgumentParser;
+ $args = [];
+ $tsc = [];
+ $tsenabled = Table_Check::isEnabled();
+
+ foreach ($matches as $match) {
+ $name = $match->getName();
+ if ($name == 'tablesorter') {
+ $tsargs = $parser->parse($match->getArguments());
+ $ajax = !empty($tsargs['server']) && $tsargs['server'] === 'y';
+ $ret['tsOn'] = Table_Check::isEnabled($ajax);
+ if (!$ret['tsOn']) {
+ Feedback::error(tra('List plugin: Feature "jQuery Sortable Tables" (tablesorter) is not enabled'));
+ return $ret;
+ }
+ if (isset($tsargs['tsortcolumns'])) {
+ $tsc = Table_Check::parseParam($tsargs['tsortcolumns']);
+ }
+ if (isset($tsargs['tspaginate'])) {
+ $tsp = Table_Check::parseParam($tsargs['tspaginate']);
+ if (isset($tsp[0]['max']) && $ajax) {
+ $ret['max'] = (int) $tsp[0]['max'];
+ }
+ }
+ } elseif ($name == 'column') {
+ $args[] = $parser->parse($match->getArguments());
+ } elseif ($name == 'format' && $tsenabled) {
+ // if fields have been "formatted" then get the original field name to filter on
+ $formatArgs = $parser->parse($match->getArguments());
+
+ $subPlugins = WikiParser_PluginMatcher::match($match->getBody());
+ foreach ($subPlugins as $subPlugin) {
+ if ($subPlugin->getName() === 'display') {
+ $displayArgs = $parser->parse($subPlugin->getArguments());
+ foreach($args as & $arg) {
+ if ($arg['field'] === $formatArgs['name']) {
+ $arg['field'] = $displayArgs['name'];
+ break;
+ }
+ }
+ break; // will only work with the first display subplugin
+ }
+ }
+ }
+ }
+
+ if (Table_Check::isSort()) {
+ foreach ($_GET['sort'] as $key => $dir) {
+ if( $hasactions ) {
+ $type = $tsc[$key]['type'];
+ $field = @$args[$key-1]['field'];
+ } else {
+ $type = $tsc[$key]['type'];
+ $field = $args[$key]['field'];
+ }
+ if( !$field )
+ continue;
+ $n = '';
+ switch ($type) {
+ case 'digit':
+ case 'currency':
+ case 'percent':
+ case 'time':
+ case strpos($type, 'date') !== false:
+ $n = 'n';
+ break;
+ }
+ $this->query->setOrder($field . '_' . $n . Table_Check::$dir[$dir]);
+ }
+ }
+
+ if (Table_Check::isFilter()) {
+ foreach ($_GET['filter'] as $key => $filter) {
+ if( $hasactions ) {
+ $type = $tsc[$key]['type'];
+ $field = @$args[$key-1]['field'];
+ } else {
+ $type = $tsc[$key]['type'];
+ $field = $args[$key]['field'];
+ }
+ if( !$field )
+ continue;
+ switch ($type) {
+ case 'digit':
+ case strpos($type, 'date') !== false:
+ $from = 0; $to = 0;
+ $timestamps = explode(' - ', $filter);
+ if (count($timestamps) === 2) {
+ $from = $timestamps[0] / 1000;
+ $to = $timestamps[1] / 1000;
+ } else if (strpos($filter, '>=') === 0) {
+ $from = substr($filter, 2) / 1000;
+ $to = 'now';
+ } else if (strpos($filter, '<=') === 0) {
+ $from = '0000-00-00';
+ $to = substr($filter, 2) / 1000;
+ }
+ if ($from && $to) {
+ $this->query->filterRange($from, $to);
+ break;
+ } // else fall through to default
+ default:
+ $this->query->filterContent($filter, $field);
+ break;
+ }
+ }
+ }
+
+ return $ret;
+ }
}
Modified: trunk/lib/wiki-plugins/wikiplugin_list.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_list.php 2016-08-24 02:53:46 UTC (rev 59507)
+++ trunk/lib/wiki-plugins/wikiplugin_list.php 2016-08-24 10:17:31 UTC (rev 59508)
@@ -47,15 +47,14 @@
$matches = WikiParser_PluginMatcher::match($data);
- $tsret = applyTablesorter($matches, $query);
-
$builder = new Search_Query_WikiBuilder($query);
$builder->enableAggregate();
+ $builder->apply($matches);
+ $tsret = $builder->applyTablesorter($matches);
if (!empty($tsret['max']) || !empty($_GET['numrows'])) {
$max = !empty($_GET['numrows']) ? $_GET['numrows'] : $tsret['max'];
$builder->wpquery_pagination_max($query, $max);
}
- $builder->apply($matches);
$paginationArguments = $builder->getPaginationArguments();
if (!empty($_REQUEST[$paginationArguments['sort_arg']])) {
@@ -90,107 +89,3 @@
return $out;
}
-
-/**
- * Apply tablesorter is enabled
- *
- * @param WikiParser_PluginMatcher $matches
- * @param Search_Query $query
- * @return array
- */
-function applyTablesorter(WikiParser_PluginMatcher $matches, Search_Query $query)
-{
- $ret = ['max' => false, 'tsOn' => false];
- $parser = new WikiParser_PluginArgumentParser;
- $args = [];
- $tsc = [];
- $tsenabled = Table_Check::isEnabled();
-
- foreach ($matches as $match) {
- $name = $match->getName();
- if ($name == 'tablesorter') {
- $tsargs = $parser->parse($match->getArguments());
- $ajax = !empty($tsargs['server']) && $tsargs['server'] === 'y';
- $ret['tsOn'] = Table_Check::isEnabled($ajax);
- if (!$ret['tsOn']) {
- Feedback::error(tra('List plugin: Feature "jQuery Sortable Tables" (tablesorter) is not enabled'));
- return $ret;
- }
- if (isset($tsargs['tsortcolumns'])) {
- $tsc = Table_Check::parseParam($tsargs['tsortcolumns']);
- }
- if (isset($tsargs['tspaginate'])) {
- $tsp = Table_Check::parseParam($tsargs['tspaginate']);
- if (isset($tsp[0]['max']) && $ajax) {
- $ret['max'] = (int) $tsp[0]['max'];
- }
- }
- } elseif ($name == 'column') {
- $args[] = $parser->parse($match->getArguments());
- } elseif ($name == 'format' && $tsenabled) {
- // if fields have been "formatted" then get the original field name to filter on
- $formatArgs = $parser->parse($match->getArguments());
-
- $subPlugins = WikiParser_PluginMatcher::match($match->getBody());
- foreach ($subPlugins as $subPlugin) {
- if ($subPlugin->getName() === 'display') {
- $displayArgs = $parser->parse($subPlugin->getArguments());
- foreach($args as & $arg) {
- if ($arg['field'] === $formatArgs['name']) {
- $arg['field'] = $displayArgs['name'];
- break;
- }
- }
- break; // will only work with the first display subplugin
- }
- }
- }
- }
-
- if (Table_Check::isSort()) {
- foreach ($_GET['sort'] as $key => $dir) {
- $n = '';
- switch ($tsc[$key]['type']) {
- case 'digit':
- case 'currency':
- case 'percent':
- case 'time':
- case strpos($tsc[$key]['type'], 'date') !== false:
- $n = 'n';
- break;
- }
- $query->setOrder($args[$key]['field'] . '_' . $n . Table_Check::$dir[$dir]);
- }
- }
-
- if (Table_Check::isFilter()) {
- foreach ($_GET['filter'] as $key => $filter) {
-
- switch ($tsc[$key]['type']) {
- case 'digit':
- case strpos($tsc[$key]['type'], 'date') !== false:
- $from = 0; $to = 0;
- $timestamps = explode(' - ', $filter);
- if (count($timestamps) === 2) {
- $from = $timestamps[0] / 1000;
- $to = $timestamps[1] / 1000;
- } else if (strpos($filter, '>=') === 0) {
- $from = substr($filter, 2) / 1000;
- $to = 'now';
- } else if (strpos($filter, '<=') === 0) {
- $from = '0000-00-00';
- $to = substr($filter, 2) / 1000;
- }
- if ($from && $to) {
- $query->filterRange($from, $to);
- break;
- } // else fall through to default
- default:
- $query->filterContent($filter, $args[$key]['field']);
- break;
- }
- }
- }
-
- return $ret;
-}
Modified: trunk/lib/wiki-plugins/wikiplugin_listexecute.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_listexecute.php 2016-08-24 02:53:46 UTC (rev 59507)
+++ trunk/lib/wiki-plugins/wikiplugin_listexecute.php 2016-08-24 10:17:31 UTC (rev 59508)
@@ -50,8 +50,20 @@
$matches = WikiParser_PluginMatcher::match($data);
$builder = new Search_Query_WikiBuilder($query);
- $builder->apply($matches);
+ $builder->apply($matches, true);
+ $tsret = $builder->applyTablesorter($matches, true);
+ if (!empty($tsret['max']) || !empty($_GET['numrows'])) {
+ $max = !empty($_GET['numrows']) ? $_GET['numrows'] : $tsret['max'];
+ $builder->wpquery_pagination_max($query, $max);
+ }
+ $paginationArguments = $builder->getPaginationArguments();
+ if (!empty($_REQUEST[$paginationArguments['sort_arg']])) {
+ $query->setOrder($_REQUEST[$paginationArguments['sort_arg']]);
+ }
+
+ $customOutput = false;
+
foreach ($matches as $match) {
$name = $match->getName();
@@ -62,39 +74,40 @@
$actions[$action->getName()] = $action;
}
}
- }
- if (!empty($_REQUEST['sort_mode'])) {
- $query->setOrder($_REQUEST['sort_mode']);
+ if ($name == 'output')
+ $customOutput = true;
}
$index = $unifiedsearchlib->getIndex();
$result = $query->search($index);
+ $result->setId('wplistexecute-' . $iListExecute);
- $plugin = new Search_Formatter_Plugin_SmartyTemplate('templates/wiki-plugins/wikiplugin_listexecute.tpl');
-
- $paginationArguments = $builder->getPaginationArguments();
-
$dataSource = $unifiedsearchlib->getDataSource();
$builder = new Search_Formatter_Builder;
$builder->setPaginationArguments($paginationArguments);
+ $builder->setActions(array_keys($actions) );
+ $builder->setId('wplistexecute-' . $iListExecute);
+ $builder->setCount($result->count());
+ $builder->setTsOn($tsret['tsOn']);
$builder->apply($matches);
- $builder->setFormatterPlugin($plugin);
+ $result->setTsSettings($builder->getTsSettings());
+ $result->setTsOn($tsret['tsOn']);
+
$formatter = $builder->getFormatter();
- $reportSource = new Search_Action_ReportingTransform;
-
if (isset($_POST['list_action'], $_POST['objects'])) {
$action = $_POST['list_action'];
$objects = (array) $_POST['objects'];
if (isset($actions[$action])) {
+ $reportSource = new Search_Action_ReportingTransform;
+
$tx = TikiDb::get()->begin();
$action = $actions[$action];
- $plugin->setFields(array_fill_keys($action->getFields(), null));
$list = $formatter->getPopulatedList($result);
foreach ($list as $entry) {
@@ -110,20 +123,22 @@
}
$tx->commit();
+
+ $result->applyTransform($reportSource);
}
}
- $plugin = new Search_Formatter_Plugin_SmartyTemplate('templates/wiki-plugins/wikiplugin_listexecute.tpl');
- $plugin->setFields(array('report_status' => null));
- $plugin->setData(
- array(
- 'actions' => array_keys($actions),
- 'iListExecute' => $iListExecute
- )
- );
+ if( !$customOutput ) {
+ $plugin = new Search_Formatter_Plugin_SmartyTemplate('templates/wiki-plugins/wikiplugin_listexecute.tpl');
+ $plugin->setFields(array('report_status' => null));
+ $plugin->setData(
+ array(
+ 'actions' => array_keys($actions),
+ 'iListExecute' => $iListExecute
+ )
+ );
+ $formatter = new Search_Formatter($plugin);
+ }
- $formatter = new Search_Formatter($plugin);
- $result->applyTransform($reportSource);
return $formatter->format($result);
}
-
Modified: trunk/templates/search/list/table.tpl
===================================================================
--- trunk/templates/search/list/table.tpl 2016-08-24 02:53:46 UTC (rev 59507)
+++ trunk/templates/search/list/table.tpl 2016-08-24 10:17:31 UTC (rev 59508)
@@ -1,4 +1,7 @@
{* $Id$ *}
+{if $actions}
+<form method="post" action="#{$id}">
+{/if}
<div {if $id}id="{$id}-div" {/if}class="table-responsive ts-wrapperdiv" {if $tsOn}style="visibility:hidden;"{/if}>
<table {if $id}id="{$id}" {/if}class="table normal table-hover table-striped" data-count="{$count}">
<thead>
@@ -12,6 +15,9 @@
{if $header}
{$fieldcount = 0}
<tr>
+ {if $actions}
+ <th><input type="checkbox" name="selectall" value="" class="listexecute-select-all"></th>
+ {/if}
{foreach from=$column item=col}
{$fieldcount = $fieldcount + 1}
<th>
@@ -45,6 +51,16 @@
<tbody>
{foreach from=$results item=row}
<tr>
+ {if $actions}
+ <td>
+ <input type="checkbox" name="objects[]" value="{$row.object_type|escape}:{$row.object_id|escape}">
+ {if $row.report_status eq 'success'}
+ {icon name='ok'}
+ {elseif $row.report_status eq 'error'}
+ {icon name='error'}
+ {/if}
+ </td>
+ {/if}
{foreach from=$column item=col}
{if isset($col.mode) && $col.mode eq 'raw'}
<td>{if !empty($row[$col.field])}{$row[$col.field]}{/if}</td>
@@ -60,3 +76,22 @@
{/if}
</table>
</div>
+{if $actions}
+ <select name="list_action">
+ <option></option>
+ {foreach from=$actions item=action}
+ <option value="{$action|escape}">{$action|escape}</option>
+ {/foreach}
+ </select>
+ <input type="submit" class="btn btn-default btn-sm" title="{tr}Apply Changes{/tr}" value="{tr}Apply{/tr}">
+</form>
+{jq}
+$('.listexecute-select-all').removeClass('listexecute-select-all')
+ .on('click', function (e) {
+ if( this.checked )
+ $(this).closest('form').find(':checkbox:not(:checked)').click();
+ else
+ $(this).closest('form').find(':checkbox:checked').click();
+ });
+{/jq}
+{/if}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2016-08-25 14:57:59
|
Revision: 59517
http://sourceforge.net/p/tikiwiki/code/59517
Author: yonixxx
Date: 2016-08-25 14:57:57 +0000 (Thu, 25 Aug 2016)
Log Message:
-----------
[ENH] Adding a new step into tiki-install to emphasys critical information; subscribe, admin preferences filter and storage system as well as encouragement to join the community (still to be worked on).
Modified Paths:
--------------
trunk/installer/tiki-installer.php
trunk/templates/tiki-install.tpl
Modified: trunk/installer/tiki-installer.php
===================================================================
--- trunk/installer/tiki-installer.php 2016-08-25 13:48:26 UTC (rev 59516)
+++ trunk/installer/tiki-installer.php 2016-08-25 14:57:57 UTC (rev 59517)
@@ -1041,7 +1041,7 @@
}
}
-if ($install_step == '8') {
+if ($install_step == '9') {
if (!isset( $_POST['nolockenter'])) {
touch('db/'.$tikidomainslash.'lock');
}
Modified: trunk/templates/tiki-install.tpl
===================================================================
--- trunk/templates/tiki-install.tpl 2016-08-25 13:48:26 UTC (rev 59516)
+++ trunk/templates/tiki-install.tpl 2016-08-25 14:57:57 UTC (rev 59517)
@@ -22,7 +22,8 @@
<li>{if $install_step eq '4'}<strong>{elseif $dbcon eq 'y' or isset($smarty.post.scratch) or isset($smarty.post.update)}<a href="#" onclick="$('#install_step4').submit();return false;" title="{if $tikidb_created}{tr}Install/Upgrade{/tr}{else}{tr}Install{/tr}{/if}">{/if}{if $tikidb_created}<em>{tr}Install/Upgrade{/tr}</em>{else}{tr}Install{/tr}{/if}{if $install_step eq '4'}</strong>{elseif ($dbcon eq 'y') or (isset($smarty.post.scratch)) or (isset($smarty.post.update))}</a>{/if}</li>
<li>{if $install_step eq '5'}<strong>{elseif $tikidb_is20}<a href="#" onclick="$('#install_step5').submit();return false;" title="{if isset($smarty.post.update)}{tr}Review the Upgrade{/tr}{else}{tr}Review the Installation{/tr}{/if}">{/if}{if isset($smarty.post.update)}{tr}Review the Upgrade{/tr}{else}{tr}Review the Installation{/tr}{/if}{if $install_step eq '5'}</strong>{elseif $tikidb_is20}</a>{/if}</li>
<li>{if $install_step eq '6'}<strong>{elseif $tikidb_is20 and !isset($smarty.post.update)}<a href="#" onclick="$('#install_step6').submit();return false;" title="{tr}Configure the General Settings{/tr}">{/if}{tr}Configure the General Settings{/tr}{if $install_step eq '6'}</strong>{elseif $tikidb_is20 and !isset($smarty.post.update)}</a>{/if}</li>
- <li>{if $install_step eq '7'}<strong>{elseif $tikidb_is20}<a href="#" onclick="$('#install_step7').submit();return false;" title="{tr}Enter Your Tiki{/tr}">{/if}{tr}Enter Your Tiki{/tr}{if $install_step eq '7'}</strong>{elseif $tikidb_is20}</a>{/if}</li>
+ <li>{if $install_step eq '7'}<strong>{elseif $tikidb_is20}<a href="#" onclick="$('#install_step7').submit();return false;" title="{tr}Important Tiki Admin Information{/tr}">{/if}{tr}Important Tiki Admin Information{/tr}{if $install_step eq '7'}</strong>{elseif $tikidb_is20}</a>{/if}</li>
+ <li>{if $install_step eq '8'}<strong>{elseif $tikidb_is20}<a href="#" onclick="$('#install_step8').submit();return false;" title="{tr}Enter Your Tiki{/tr}">{/if}{tr}Enter Your Tiki{/tr}{if $install_step eq '8'}</strong>{elseif $tikidb_is20}</a>{/if}</li>
</ol>
<form method="post" action="tiki-install.php" id="install_step0">
<input type="hidden" name="install_step" value="0">
@@ -64,6 +65,11 @@
{if $multi}<input type="hidden" name="multi" value="{$multi}">{/if}
{if $lang}<input type="hidden" name="lang" value="{$lang}">{/if}
</form>
+ <form method="post" action="tiki-install.php" id="install_step8">
+ <input type="hidden" name="install_step" value="8">
+ {if $multi}<input type="hidden" name="multi" value="{$multi}">{/if}
+ {if $lang}<input type="hidden" name="lang" value="{$lang}">{/if}
+ </form>
</div>
</div><!-- End of install-menu -->
<div class="install-help panel panel-default">
@@ -211,7 +217,6 @@
{/remarksbox}
{/if}
<p>{tr}Tiki uses the GD library to process images for the Image Gallery and CAPTCHA support.{/tr}</p>
- <p>{tr}By default Tiki save your images and files in the database to make the setup as easy as possible.{/tr}<br />{tr}This setting can be changed later in the Control Panels, File Galleries section General Settings.{/tr}<br />{tr}If you need to store a lot of files you should consider switching from "Store to database" to "Store to directory".{/tr}</p>
<form action="tiki-install.php" method="post" role="form">
<div class="form-group text-center">
<input type="hidden" name="install_step" value="3">
@@ -650,12 +655,6 @@
<span class="help-block">
{tr}This is the email address for your administrator account.{/tr}
</span>
- {remarksbox type=error title="{tr}Subscribe to Tiki Releases newsletter{/tr}" close="n"}
- {tr}It is highly recommended for Tiki admins and Tiki system maintainers to subscribe to the Tiki Releases newsletter.{/tr}<br>
- {tr}This newsletter is used to send important notice about Tiki releases and critical security releases.{/tr}<br>
- {tr}We don't share subscribed emails and we send very few newsletter a year using this list.{/tr}<br>
- {tr}Please use the following link and subscribe :{/tr} <a href="https://tiki.org/tiki-newsletters.php?nlId=8&info=1" title="Subscribe" target="_blank" class="alert-link">{tr}Tiki Releases newsletter{/tr}</a>
- {/remarksbox}
</div>
</fieldset>
{if not empty($htaccess_options)}
@@ -722,7 +721,67 @@
</div><!-- End of install-step6 -->
{elseif $install_step eq '7'}
- <div class="install-step7">
+ <div class="install-step7">
+ <h1>{tr}Important Tiki Admin Information{/tr}</h1>
+ <div class="alert alert-danger">
+ {tr}The following information are critical for your website and data protection and health!{/tr}</br></br>
+ {tr}Unless your are used to work with Tiki and you know the Tiki Community it is <strong>very important</strong> you fully read this page.{/tr}
+ {tr}Doing so, you'll find usefull information to avoid loosing time or data while setting and maitaining your Tiki.{/tr}
+ </div>
+ <form action="tiki-install.php" method="post">
+ <div class="clearfix">
+ <fieldset>
+ <legend>
+ {icon name="shield"} {tr}Subscribe to Tiki Releases newsletter{/tr} - {tr}Critical & Security update{/tr}
+ </legend>
+ {tr}It is highly recommended for Tiki admins and Tiki system maintainers to subscribe to the Tiki Releases newsletter.{/tr}<br>
+ {tr}This newsletter is used to send important notice about Tiki releases and critical security releases.{/tr}<br>
+ {tr}We don't share subscribed emails and we send very few newsletter a year using this list.{/tr}<br>
+ {tr}Please use the following link and subscribe :{/tr} <a href="https://tiki.org/tiki-newsletters.php?nlId=8&info=1" title="Subscribe" target="_blank" class="text-danger">{tr}Tiki Releases newsletter{/tr}</a>
+ </fieldset>
+ </br>
+ <fieldset>
+ <legend>
+ {icon name="filter"} {tr}Tiki Admin preferences filter{/tr}
+ </legend>
+ {tr}Tiki contains thousands of options and parameters.{/tr} {tr}To avoid submerging your screen on your first visit to the Control Panels we use filters.{/tr}<br />
+ {tr}Those filters: Basic, Advanced, Experimental and Unavailable helps to hide the setting that you don't need to use.{/tr}
+ {tr}When you don't see a setting that you are expecting to find at a certain place, make sure your admin Preference Filters is properly set.{/tr}<br />
+ {tr}You'll find it at the top of the Admin Navigation Bar by clicking on that icon.{/tr} {icon name="filter"}<br />
+ </fieldset>
+ </br>
+ <fieldset>
+ <legend>
+ {icon name="floppy-o"} {tr}Storing your Tiki files{/tr}
+ </legend>
+ {tr}To ease the install process and first access Tiki save your images and files by default in its database.{/tr}<br />
+ {tr}This work perfectly but is not recommended to save many files or images.{/tr}
+ {tr}To avoid working with inflated database and if you need to store a lot of files you should also consider switching from "Store to database" to "Store to directory".{/tr}<br />
+ {tr}This setting can be changed and files previously saved can be moved using the Control Panels, File Galleries section General Settings.{/tr}<br />
+ </fieldset>
+ </br>
+ <fieldset>
+ <legend>
+ {icon name="group"} {tr}Tiki Community{/tr}
+ </legend>
+ {tr}The Tiki Community is a global network of developers, site operators, consultants and end users.{/tr}<br />
+ <a href='https://tiki.org/Join' target='_blank'>{tr}Join the Community{/tr}</a><br />
+ <a href='https://tiki.org/Help' target='_blank'>{tr}Get Help with Tiki{/tr}</a><br />
+ {tr}Tiki is the collective work of hundreds of people. It works because volunteers.{/tr} <a href='https://dev.tiki.org/Commit+Code' target='_blank'>{tr}take the time to make it better.{/tr}</a><br />
+ </fieldset>
+ </div>
+
+ <div align="center" style="margin-top:1em;">
+ {if $multi}<input type="hidden" name="multi" value="{$multi}">{/if}
+ {if $lang}<input type="hidden" name="lang" value="{$lang}">{/if}
+ <input type="hidden" name="install_step" value="8">
+ <input type="submit" class="btn btn-primary" value="{tr}Continue{/tr}">
+ </div>
+ </form>
+ </div><!-- End of install-step7 -->
+
+ {elseif $install_step eq '8'}
+ <div class="install-step8">
<h1 class="pagetitle">{tr}Enter Your Tiki{/tr}</h1>
<p>{tr}The installation is complete!{/tr} {tr}Your database has been configured and Tiki is ready to run.{/tr} </p>
{remarksbox type='tip' title="{tr}Join us!{/tr}" close="n"}
@@ -760,7 +819,7 @@
<input type="hidden" name="multi" value="{$multi|escape}">
{/if}
<input type="hidden" name="install_type" value="{$install_type}">
- <input type="hidden" name="install_step" value="8">
+ <input type="hidden" name="install_step" value="9">
<input type="submit" value="{tr}Enter Tiki and Lock Installer{/tr} ({tr}Recommended{/tr})" class="btn btn-primary">
</form>
<form method="post" action="tiki-install.php" style="margin-left: 20px; display: inline-block;">
@@ -769,7 +828,7 @@
<input type="hidden" name="multi" value="{$multi|escape}">
{/if}
<input type="hidden" name="install_type" value="{$install_type}">
- <input type="hidden" name="install_step" value="8">
+ <input type="hidden" name="install_step" value="9">
<input type="submit" value="{tr}Enter Tiki Without Locking Installer{/tr}" class="btn btn-default">
<br><em><span class="text-warning">{icon name="warning"}</span> {tr}Not recommended due to security risk{/tr}.</em>
</form>
@@ -826,7 +885,7 @@
</select>
<span class="input-group-btn"><input type="submit" class="btn btn-danger btn-sm" name="fix_double_encoding" value="{tr}Click to fix double encoding (dangerous){/tr}"></span>
</div>
- <input type="hidden" name="install_step" value="7">
+ <input type="hidden" name="install_step" value="8">
</div>
{else}
<p>{tr}Oops. You need to make sure client charset is forced to UTF-8. Reset the database connection to continue.{/tr}</p>
@@ -835,7 +894,7 @@
</form>
{/if}
{/if}
- </div><!-- End of install-step7 -->
+ </div><!-- End of install-step8 -->
{/if}{* end elseif $install_step... *}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rj...@us...> - 2016-08-27 20:58:51
|
Revision: 59532
http://sourceforge.net/p/tikiwiki/code/59532
Author: rjsmelo
Date: 2016-08-27 20:58:48 +0000 (Sat, 27 Aug 2016)
Log Message:
-----------
[NEW] Merge experimental branch for display TOC for only levels under mindepth, https://dev.tiki.org/item6068
Modified Paths:
--------------
trunk/lib/core/Services/Wiki/StructureController.php
trunk/lib/structures/structlib.php
trunk/lib/wiki-plugins/wikiplugin_toc.php
trunk/tiki-edit_structure.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2016-08-27 07:39:40 UTC (rev 59531)
+++ trunk 2016-08-27 20:58:48 UTC (rev 59532)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -3,7 +3,7 ##
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
/branches/14.x:54079-56796,57357,57370,57375
-/branches/15.x:57416-57449,57459,57461-59163,59319,59420
+/branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
## -19,6 +19,7 ##
/branches/experimental/kaltura_integration_two:20962-22011
/branches/experimental/moz-metrics:23452-23480
/branches/experimental/tiki14_themes:53354-53358,53362-53368,53380-53383,53386-53387,53399-53401,53404-53408,53410-53411,53413,53417-53418,53420,53422-53426,53429-53432,53441,53444,53471-53473,53475-53476,53480-53484,53488,53493-53494,53500-53501,53506-53508,53520,53530-53531,53595,53616-53621,53628-53632
+/branches/experimental/tocplugin:59470-59531
/branches/experimental/ui-revamp2:16728-16731,16999-17002
/branches/experimental/wikiLingo:49479-50651
/branches/experimental/wysiwyg_ckeditor_update:28403-28553,29144-29145,29148-29163,29336-29340,29400-29402
\ No newline at end of property
Modified: trunk/lib/core/Services/Wiki/StructureController.php
===================================================================
--- trunk/lib/core/Services/Wiki/StructureController.php 2016-08-27 07:39:40 UTC (rev 59531)
+++ trunk/lib/core/Services/Wiki/StructureController.php 2016-08-27 20:58:48 UTC (rev 59532)
@@ -33,6 +33,7 @@
$params->type,
$params->page,
$params->maxdepth,
+ $params->mindepth,
$params->structurePageName
);
Modified: trunk/lib/structures/structlib.php
===================================================================
--- trunk/lib/structures/structlib.php 2016-08-27 07:39:40 UTC (rev 59531)
+++ trunk/lib/structures/structlib.php 2016-08-27 20:58:48 UTC (rev 59532)
@@ -683,7 +683,7 @@
}
return $back;
}
- public function get_toc($page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0, $structurePageName='')
+ public function get_toc($page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0,$mindepth=0, $structurePageName='')
{
global $user, $prefs;
@@ -720,6 +720,7 @@
'type' => $type,
'page' => $page,
'maxdepth' => $maxdepth,
+ 'mindepth' => $mindepth,
'structurePageName' => $structurePageName
)
);
@@ -728,19 +729,31 @@
}
}
- $nodelist = $this->fetch_toc($structure_tree, $showdesc, $numbering, $type, $page, $maxdepth, 0, $structurePageName);
+ $nodelist = $this->fetch_toc($structure_tree, $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, 0, $structurePageName);
if ($type === 'admin' && empty($nodelist)) {
$nodelist = "<ol class='admintoc' style='min-height: 4em;' data-params='$json_params'></ol>";
}
return $nodelist ."\n";
}
- public function fetch_toc($structure_tree,$showdesc,$numbering,$type='plain',$page='',$maxdepth=0,$cur_depth=0,$structurePageName='')
+ public function fetch_toc($structure_tree,$showdesc,$numbering,$type='plain',$page='',$maxdepth=0,$mindepth=0,$cur_depth=0,$structurePageName='')
{
$smarty = TikiLib::lib('smarty');
global $user;
$ret='';
if ($structure_tree != '') {
- if (($maxdepth <= 0) || ($cur_depth < $maxdepth)) {
+ if ($cur_depth < $mindepth) {
+ if ($cur_depth == 0) {
+ $ret.= $smarty->fetch('structures_toc-startul.tpl')."\n";
+ }
+ foreach ($structure_tree as $leaf) {
+ if (isset($leaf['sub']) && is_array($leaf['sub'])) {
+ $ret .= $this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $cur_depth + 1, $structurePageName)."</li>\n";
+ }
+ }
+ if ($cur_depth == 0) {
+ $ret.= $smarty->fetch('structures_toc-endul.tpl')."\n";
+ }
+ } elseif (($maxdepth <= 0) || ($cur_depth < $maxdepth)) {
$smarty->assign('toc_type', $type);
$ret.= $smarty->fetch('structures_toc-startul.tpl')."\n";
@@ -772,7 +785,7 @@
$smarty->assign('numbering', $numbering);
$ret.=$smarty->fetch('structures_toc-leaf.tpl');
if (isset($leaf['sub']) && is_array($leaf['sub'])) {
- $ret.=$this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $cur_depth+1, $structurePageName)."</li>\n";
+ $ret.=$this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $cur_depth+1, $structurePageName)."</li>\n";
} else {
$ret.=str_repeat("\t", ($cur_depth*2)+1)."</li>\n";
}
Modified: trunk/lib/wiki-plugins/wikiplugin_toc.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_toc.php 2016-08-27 07:39:40 UTC (rev 59531)
+++ trunk/lib/wiki-plugins/wikiplugin_toc.php 2016-08-27 20:58:48 UTC (rev 59532)
@@ -25,6 +25,14 @@
'filter' => 'digits',
'default' => 0,
),
+ 'mindepth' => array(
+ 'name' => tra('Minimum Depth'),
+ 'description' => tr('Hide number of levels below this number to display. %0 means no limit (and is the default).', '<code>0</code>'),
+ 'since' => '15.3.',
+ 'required' => false,
+ 'filter' => 'digits',
+ 'default' => 0,
+ ),
'structId' => array(
'name' => tra('Structure ID'),
'description' => tra('By default, structure for the current page will be displayed. Alternate
@@ -111,6 +119,7 @@
'type' => 'plain',
'structId' => '',
'maxdepth' => 0,
+ 'mindepth' => 0,
'numberPrefix' => '',
'pagename' => '',
);
@@ -154,14 +163,14 @@
$page_info = $structlib->s_get_page_info($pageName_ref_id);
$structure_info = $structlib->s_get_structure_info($pageName_ref_id);
if (isset($page_info)) {
- $html = $structlib->get_toc($pageName_ref_id, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $structure_info['pageName']);
+ $html = $structlib->get_toc($pageName_ref_id, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $structure_info['pageName']);
return "~np~$button $html $button~/np~";
}
}
return '';
} else {
$structure_info = $structlib->s_get_structure_info($structId);
- $html = $structlib->get_toc($structId, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $structure_info['pageName']);
+ $html = $structlib->get_toc($structId, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $structure_info['pageName']);
return "~np~$button $html $button~/np~";
}
Modified: trunk/tiki-edit_structure.php
===================================================================
--- trunk/tiki-edit_structure.php 2016-08-27 07:39:40 UTC (rev 59531)
+++ trunk/tiki-edit_structure.php 2016-08-27 20:58:48 UTC (rev 59532)
@@ -337,8 +337,8 @@
if (!$structure_id) {
$structure_id = $structure_info['page_ref_id'];
}
- $smarty->assign('nodelist', $structlib->get_toc($structure_id, 'asc', false, false, '', 'admin', $page_info['page_ref_id'], 0, ''));
- // $page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0, $structurePageName=''
+ $smarty->assign('nodelist', $structlib->get_toc($structure_id, 'asc', false, false, '', 'admin', $page_info['page_ref_id'], 0, 0, ''));
+ // $page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0,$mindepth=0, $structurePageName=''
$smarty->assign('structure_id', $structure_id);
}
// disallow robots to index page:
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2016-08-29 07:04:09
|
Revision: 59537
http://sourceforge.net/p/tikiwiki/code/59537
Author: giograf
Date: 2016-08-29 07:04:07 +0000 (Mon, 29 Aug 2016)
Log Message:
-----------
[ENH] Autocomplete now can function over input of multiple emails (user names) for, for example, messaging or emailing.
Modified Paths:
--------------
trunk/lib/jquery_tiki/tiki-jquery.js
trunk/tiki-ajax_services.php
Modified: trunk/lib/jquery_tiki/tiki-jquery.js
===================================================================
--- trunk/lib/jquery_tiki/tiki-jquery.js 2016-08-28 13:23:42 UTC (rev 59536)
+++ trunk/lib/jquery_tiki/tiki-jquery.js 2016-08-29 07:04:07 UTC (rev 59537)
@@ -1223,9 +1223,28 @@
lastXhr = $.getJSON( url, request, function( data, status, xhr ) {
xhrCache[ cacheKey ] = data;
if ( xhr === lastXhr ) {
- response( data );
+ response( data, function (item) {
+ return item
+ })
+ }});
+ },
+ select: function(e, ui) {
+ if(type == 'usersandcontacts' || type == 'userrealname'){
+ $focused_input = $('input:focus').val();
+ console.log(ui.item.value);
+ if($focused_input.includes(',') || $focused_input.includes(';')){
+ $names = $focused_input.replace(";", ",");
+ $names_array = $names.split(",");
+ $names_array.pop();
+ $names_array.push(ui.item.value);
+ $previous_names = $names_array.join(', ');
+ setTimeout(function(){
+ $('input:focus').val($previous_names);
+ }, 0);
+ }else{
+ $('input:focus').val(ui.item.value);
}
- });
+ }
}
});
$.extend(opts, options);
Modified: trunk/tiki-ajax_services.php
===================================================================
--- trunk/tiki-ajax_services.php 2016-08-28 13:23:42 UTC (rev 59536)
+++ trunk/tiki-ajax_services.php 2016-08-29 07:04:07 UTC (rev 59537)
@@ -94,62 +94,66 @@
$contactlib = TikiLib::lib('contact');
$listcontact = $contactlib->list_contacts($user);
$listusers = $userlib->get_users();
-
- $contacts = array();
- $query = $_REQUEST['q'];
-
- foreach ($listcontact as $key=>$contact) {
- if (isset($query) && (stripos($contact['firstName'], $query) !== false or stripos($contact['lastName'], $query) !== false or stripos($contact['email'], $query) !== false)) {
- if ($contact['email']<>'') {
- $contacts[] = $contact['email'];
- }
- }
- }
- foreach ($listusers['data'] as $key=>$contact) {
- if (isset($query) && (stripos($contact['firstName'], $query) !== false or stripos($contact['login'], $query) !== false or stripos($contact['lastName'], $query) !== false or stripos($contact['email'], $query) !== false)) {
- if ($prefs['login_is_email'] == 'y') {
- $contacts[] = $contact['login'];
- } else {
- $contacts[] = $contact['email'];
- }
- }
- }
- $contacts = array_unique($contacts);
- sort($contacts);
- $access->output_serialized($contacts);
-
- } elseif ($_REQUEST['listonly'] == 'userrealnames') {
- $groups = '';
- $listusers = $userlib->get_users_light(0, -1, 'login_asc', '', $groups);
- $done = array();
- $finalusers = array();
- foreach ($listusers as $usrId => $usr) {
- if (isset($_REQUEST['q'])) {
- $longusr = $usr . ' (' . $usrId . ')';
- if (array_key_exists($usr, $done)) {
- // disambiguate duplicates
- if (stripos($longusr, $_REQUEST['q']) !== false) {
- $oldkey = array_search($usr, $finalusers);
- if ($oldkey !== false) {
- $finalusers[$oldkey] = $done[$usr];
- }
- }
- if (stripos($longusr, $_REQUEST['q']) !== false) {
- $finalusers[] = $longusr;
- }
- } else {
- if (stripos($longusr, $_REQUEST['q']) !== false) {
- $finalusers[] = $longusr;
- }
- }
- $done[$usr] = $longusr;
- }
- }
-
- // TODO also - proper perms checking
- // tricker for users? Check the group they're in, then tiki_p_group_view_members
-
- $access->output_serialized($finalusers);
+
+ $contacts = array();
+ $query = $_REQUEST['q'];
+ $email_array = explode(',', str_replace(';', ',', $_REQUEST['q']));
+ $last_email = trim(end($email_array));
+
+ foreach ($listcontact as $key=>$contact) {
+ if (isset($last_email) && (stripos($contact['firstName'], $last_email) !== false or stripos($contact['lastName'], $last_email) !== false or stripos($contact['email'], $last_email) !== false)) {
+ if ($contact['email']<>'') {
+ $contacts[] = $contact['email'];
+ }
+ }
+ }
+ foreach ($listusers['data'] as $key=>$contact) {
+ if (isset($last_email) && (stripos($contact['firstName'], $last_email) !== false or stripos($contact['login'], $last_email) !== false or stripos($contact['lastName'], $last_email) !== false or stripos($contact['email'], $query) !== false)) {
+ if ($prefs['login_is_email'] == 'y') {
+ $contacts[] = $contact['login'];
+ } else {
+ $contacts[] = $contact['email'];
+ }
+ }
+ }
+ $contacts = array_unique($contacts);
+ sort($contacts);
+ $access->output_serialized($contacts);
+
+ } elseif ($_REQUEST['listonly'] == 'userrealnames') {
+ $groups = '';
+ $listusers = $userlib->get_users_light(0, -1, 'login_asc', '', $groups);
+ $done = array();
+ $finalusers = array();
+ $names_array = explode(',', str_replace(';', ',', $_REQUEST['q']));
+ $last_name = trim(end($names_array));
+ foreach ($listusers as $usrId => $usr) {
+ if (isset($last_name)) {
+ $longusr = $usr . ' (' . $usrId . ')';
+ if (array_key_exists($usr, $done)) {
+ // disambiguate duplicates
+ if (stripos($longusr, $last_name) !== false) {
+ $oldkey = array_search($usr, $finalusers);
+ if ($oldkey !== false) {
+ $finalusers[$oldkey] = $done[$usr];
+ }
+ }
+ if (stripos($longusr, $last_name) !== false) {
+ $finalusers[] = $longusr;
+ }
+ } else {
+ if (stripos($longusr, $last_name) !== false) {
+ $finalusers[] = $longusr;
+ }
+ }
+ $done[$usr] = $longusr;
+ }
+ }
+
+ // TODO also - proper perms checking
+ // tricker for users? Check the group they're in, then tiki_p_group_view_members
+
+ $access->output_serialized($finalusers);
} elseif ( $_REQUEST['listonly'] == 'tags' ) {
$freetaglib = TikiLib::lib('freetag');
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2016-08-29 11:45:14
|
Revision: 59541
http://sourceforge.net/p/tikiwiki/code/59541
Author: yonixxx
Date: 2016-08-29 11:45:11 +0000 (Mon, 29 Aug 2016)
Log Message:
-----------
[ENH] Added an option to hide the Structure navigation bar.
Modified Paths:
--------------
trunk/lib/prefs/wiki.php
trunk/templates/tiki-show_page.tpl
Modified: trunk/lib/prefs/wiki.php
===================================================================
--- trunk/lib/prefs/wiki.php 2016-08-29 09:18:46 UTC (rev 59540)
+++ trunk/lib/prefs/wiki.php 2016-08-29 11:45:11 UTC (rev 59541)
@@ -564,6 +564,7 @@
'top' => tra('Top'),
'bottom' => tra('Bottom'),
'both' => tra('Both'),
+ 'none' => tra('Neither'),
),
'default' => 'top',
),
Modified: trunk/templates/tiki-show_page.tpl
===================================================================
--- trunk/templates/tiki-show_page.tpl 2016-08-29 09:18:46 UTC (rev 59540)
+++ trunk/templates/tiki-show_page.tpl 2016-08-29 11:45:11 UTC (rev 59541)
@@ -110,7 +110,7 @@
</div>
{/if}
- {if $structure eq 'y' and ($prefs.wiki_structure_bar_position ne 'bottom')}
+ {if $structure eq 'y' and (($prefs.wiki_structure_bar_position ne 'bottom') && ($prefs.wiki_structure_bar_position ne 'none'))}
{include file='tiki-wiki_structure_bar.tpl'}
{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-08-29 13:57:27
|
Revision: 59544
http://sourceforge.net/p/tikiwiki/code/59544
Author: jonnybradley
Date: 2016-08-29 13:57:25 +0000 (Mon, 29 Aug 2016)
Log Message:
-----------
[ENH] admin: Preference filter improvements - add a more visible switch to toggle between basic only and advanced preferences. Many thanks to BSfez for doing most of it :)
Modified Paths:
--------------
trunk/templates/admin/admin_navbar.tpl
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-admin.less
Modified: trunk/templates/admin/admin_navbar.tpl
===================================================================
--- trunk/templates/admin/admin_navbar.tpl 2016-08-29 12:06:39 UTC (rev 59543)
+++ trunk/templates/admin/admin_navbar.tpl 2016-08-29 13:57:25 UTC (rev 59544)
@@ -1,109 +1,117 @@
<nav class="navbar navbar-default" role="navigation">
<div class="navbar-header">
- <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#admin-navbar-collapse-1">
- <span class="sr-only">Toggle navigation</span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- <span class="icon-bar"></span>
- </button>
- <ul class="nav navbar-nav">
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="{tr}Settings{/tr}">
- {icon name="filter"} <span class="caret"></span>
- </a>
- <ul class="dropdown-menu" role="menu">
- <span class="dropdown-title">{tr}Preference Filters{/tr}</span>
- <form method="post" action="" class="form" role="form">
- {foreach from=$pref_filters key=name item=info}
- <li>
- <div class="checkbox">
- <label>
- <input type="checkbox" class="preffilter {$info.type|escape}" name="pref_filters[]" value="{$name|escape}" {if $info.selected}checked="checked"{/if}>{$info.label|escape}
- </label>
- </div>
- </li>
- {/foreach}
- <div class="text-center">
- <input type="submit" value="{tr}Set as my default{/tr}" class="btn btn-primary btn-sm">
- </div>
- {if $prefs.connect_feature eq "y"}
- {capture name=likeicon}{icon name="thumbs-up"}{/capture}
- <label>
- <input type="checkbox" id="connect_feedback_cbx" {if !empty($connect_feedback_showing)}checked="checked"{/if}>
- {tr}Provide Feedback{/tr}
- <a href="https://doc.tiki.org/Connect" target="tikihelp" class="tikihelp" title="{tr}Provide Feedback:{/tr}
- {tr}Once selected, some icon/s will be shown next to all features so that you can provide some on-site feedback about them{/tr}.
- <br/><br/>
- <ul>
- <li>{tr}Icon for 'Like'{/tr} {$smarty.capture.likeicon|escape}</li>
-<!-- <li>{tr}Icon for 'Fix me'{/tr} <img src=img/icons/connect_fix.png></li> -->
-<!-- <li>{tr}Icon for 'What is this for?'{/tr} <img src=img/icons/connect_wtf.png></li> -->
- </ul>
- <br/>
- {tr}Your votes will be sent when you connect with mother.tiki.org (currently only by clicking the 'Connect > <strong>Send Info</strong>' button){/tr}
- <br/><br/>
- {tr}Click to read more{/tr}
- ">
- {icon name="help"}
- </a>
- </label>
- {$headerlib->add_jsfile("lib/jquery_tiki/tiki-connect.js")}
- {/if}
- {jq}
- var updateVisible = function() {
- var show = function (selector) {
- selector.show();
- selector.parents('fieldset:not(.tabcontent)').show();
- selector.closest('fieldset.tabcontent').addClass('filled');
- };
- var hide = function (selector) {
- selector.hide();
- /*selector.parents('fieldset:not(.tabcontent)').hide();*/
- };
+ <form method="post" action="" class="form" role="form">
+ <input type="checkbox" id="preffilter-toggle-1" class="preffilter-toggle preffilter-toggle-round {$pref_filters.advanced.type|escape}" value="advanced"{if $pref_filters.advanced.selected} checked="checked"{/if}>
+ <label for="preffilter-toggle-1"></label>
+ <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#admin-navbar-collapse-1">
+ <span class="sr-only">Toggle navigation</span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ <span class="icon-bar"></span>
+ </button>
+ <ul class="nav navbar-nav filter-menu"{if not $pref_filters.advanced.selected} style="display: none;"{/if}>
+ <li class="dropdown">
+ <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="{tr}Settings{/tr}">
+ {icon name="filter"} <span class="caret"></span>
+ </a>
+ <ul class="dropdown-menu" role="menu">
+ <li><span class="dropdown-title">{tr}Preference Filters{/tr}</span></li>
+ {foreach from=$pref_filters key=name item=info}
+ <li>
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" class="preffilter {$info.type|escape}" name="pref_filters[]" value="{$name|escape}" {if $info.selected}checked="checked"{/if}>{$info.label|escape}
+ </label>
+ </div>
+ </li>
+ {/foreach}
+ <div class="text-center">
+ <input type="submit" value="{tr}Set as my default{/tr}" class="btn btn-primary btn-sm">
+ </div>
+ {if $prefs.connect_feature eq "y"}
+ {capture name=likeicon}{icon name="thumbs-up"}{/capture}
+ <label>
+ <input type="checkbox" id="connect_feedback_cbx" {if !empty($connect_feedback_showing)}checked="checked"{/if}>
+ {tr}Provide Feedback{/tr}
+ <a href="https://doc.tiki.org/Connect" target="tikihelp" class="tikihelp" title="{tr}Provide Feedback:{/tr}
+ {tr}Once selected, some icon/s will be shown next to all features so that you can provide some on-site feedback about them{/tr}.
+ <br/><br/>
+ <ul>
+ <li>{tr}Icon for 'Like'{/tr} {$smarty.capture.likeicon|escape}</li>
+ <!-- <li>{tr}Icon for 'Fix me'{/tr} <img src=img/icons/connect_fix.png></li> -->
+ <!-- <li>{tr}Icon for 'What is this for?'{/tr} <img src=img/icons/connect_wtf.png></li> -->
+ </ul>
+ <br/>
+ {tr}Your votes will be sent when you connect with mother.tiki.org (currently only by clicking the 'Connect > <strong>Send Info</strong>' button){/tr}
+ <br/><br/>
+ {tr}Click to read more{/tr}
+ ">
+ {icon name="help"}
+ </a>
+ </label>
+ {$headerlib->add_jsfile("lib/jquery_tiki/tiki-connect.js")}
+ {/if}
+ {jq}
+ var updateVisible = function() {
+ var show = function (selector) {
+ selector.show();
+ selector.parents('fieldset:not(.tabcontent)').show();
+ selector.closest('fieldset.tabcontent').addClass('filled');
+ };
+ var hide = function (selector) {
+ selector.hide();
+ /*selector.parents('fieldset:not(.tabcontent)').hide();*/
+ };
- var filters = [];
- var prefs = $('.adminoptionbox.preference, .admbox').hide();
- prefs.parents('fieldset:not(.tabcontent)').hide();
- prefs.closest('fieldset.tabcontent').removeClass('filled');
- $('.preffilter').each(function () {
- var targets = $('.adminoptionbox.preference.' + $(this).val() + ',.admbox.' + $(this).val());
- if ($(this).is(':checked')) {
- filters.push($(this).val());
- show(targets);
- } else if ($(this).is('.negative:not(:checked)')) {
- hide(targets);
- }
- });
+ var filters = [];
+ var prefs = $('.adminoptionbox.preference, .admbox').hide();
+ prefs.parents('fieldset:not(.tabcontent)').hide();
+ prefs.closest('fieldset.tabcontent').removeClass('filled');
+ $('.preffilter').each(function () {
+ var targets = $('.adminoptionbox.preference.' + $(this).val() + ',.admbox.' + $(this).val());
+ if ($(this).is(':checked')) {
+ filters.push($(this).val());
+ show(targets);
+ } else if ($(this).is('.negative:not(:checked)')) {
+ hide(targets);
+ }
+ });
- show($('.adminoptionbox.preference.modified'))
+ show($('.adminoptionbox.preference.modified'))
- $('input[name="filters"]').val(filters.join(' '));
- $('.tabset .tabmark a').each(function () {
- var selector = 'fieldset.tabcontent.' + $(this).attr('href').substring(1);
- var content = $(this).closest('.tabset').find(selector);
+ $('input[name="filters"]').val(filters.join(' '));
+ $('.tabset .tabmark a').each(function () {
+ var selector = 'fieldset.tabcontent.' + $(this).attr('href').substring(1);
+ var content = $(this).closest('.tabset').find(selector);
- $(this).parent().toggle(content.is('.filled') || content.find('.preference').length === 0);
+ $(this).parent().toggle(content.is('.filled') || content.find('.preference').length === 0);
+ });
+ };
+
+ updateVisible();
+ $('.preffilter').change(updateVisible);
+ $('.preffilter-toggle').change(function () {
+ var checked = $(this).is(":checked");
+ $("input.preffilter[value=advanced]").prop("checked", checked);
+ $(".filter-menu.nav").css("display", checked ? "block" : "none");
+ updateVisible();
});
- };
-
- updateVisible();
- $('.preffilter').change(updateVisible);
- {/jq}
- </form>
- <li class="divider"></li>
- <li>
- <a href="tiki-admin.php?prefrebuild">
- {tr}Rebuild Admin Index{/tr}
- </a>
- </li>
- <li>
- <a href="tiki-admin.php">
- {tr}Control Panels{/tr}
- </a>
- </li>
- </ul>
- </li>
- </ul>
+ {/jq}
+ <li class="divider"></li>
+ <li>
+ <a href="tiki-admin.php?prefrebuild">
+ {tr}Rebuild Admin Index{/tr}
+ </a>
+ </li>
+ <li>
+ <a href="tiki-admin.php">
+ {tr}Control Panels{/tr}
+ </a>
+ </li>
+ </ul>
+ </li>
+ </ul>
+ </form>
</div>
<div class="collapse navbar-collapse" id="admin-navbar-collapse-1">
{include file="admin/admin_navbar_menu.tpl"}
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2016-08-29 12:06:39 UTC (rev 59543)
+++ trunk/themes/base_files/css/tiki_base.css 2016-08-29 13:57:25 UTC (rev 59544)
@@ -2795,6 +2795,68 @@
.adminoptionboxchild legend {
margin-bottom: 0;
}
+input[type="checkbox"].preffilter-toggle {
+ position: absolute;
+ margin-left: -9999px;
+ visibility: hidden;
+}
+input[type="checkbox"].preffilter-toggle + label {
+ display: block;
+ position: relative;
+ cursor: pointer;
+ outline: none;
+ user-select: none;
+}
+input[type="checkbox"].preffilter-toggle-round + label {
+ width: 100px;
+ height: 30px;
+ background-color: #dddddd;
+ border-radius: 20px;
+ float: left;
+ margin: 7px 0 0 5px;
+}
+input[type="checkbox"].preffilter-toggle-round + label:before,
+input[type="checkbox"].preffilter-toggle-round + label:after {
+ display: block;
+ position: absolute;
+ top: 1px;
+ left: 1px;
+ bottom: 1px;
+ content: "";
+}
+input[type="checkbox"].preffilter-toggle-round + label:before {
+ right: 1px;
+ background-color: #f1f1f1;
+ border-radius: 20px;
+ transition: background 0.4s;
+ content: "Basic";
+ font-size: 0.7em;
+ font-weight: normal;
+ padding-left: 40px;
+ padding-top: 8px;
+}
+input[type="checkbox"].preffilter-toggle-round + label:after {
+ width: 28px;
+ background-color: #fff;
+ border-radius: 100%;
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
+ transition: margin 0.4s;
+}
+input[type="checkbox"].preffilter-toggle-round:checked + label:before {
+ background-color: #8ce196;
+ content: "Advanced";
+ font-size: 0.7em;
+ font-weight: normal;
+ padding-left: 10px;
+ padding-top: 8px;
+}
+input[type="checkbox"].preffilter-toggle-round:checked + label:after {
+ margin-left: 70px;
+}
+.filter-menu.navbar-nav > li > a {
+ padding-top: 12px;
+ padding-bottom: 12px;
+}
form.simple label.error {
padding: 4px 0 0 20px;
margin-left: 0.5em;
Modified: trunk/themes/base_files/less/tiki-admin.less
===================================================================
--- trunk/themes/base_files/less/tiki-admin.less 2016-08-29 12:06:39 UTC (rev 59543)
+++ trunk/themes/base_files/less/tiki-admin.less 2016-08-29 13:57:25 UTC (rev 59544)
@@ -89,3 +89,75 @@
}
}
+// Admin navbar switch
+
+input[type="checkbox"].preffilter-toggle {
+ position: absolute;
+ margin-left: -9999px;
+ visibility: hidden;
+}
+
+input[type="checkbox"].preffilter-toggle + label {
+ display: block;
+ position: relative;
+ cursor: pointer;
+ outline: none;
+ user-select: none;
+}
+
+input[type="checkbox"].preffilter-toggle-round + label {
+ width: 100px;
+ height: 30px;
+ background-color: #dddddd;
+ border-radius: 20px;
+ float: left;
+ margin: 7px 0 0 5px;
+}
+
+input[type="checkbox"].preffilter-toggle-round + label:before,
+input[type="checkbox"].preffilter-toggle-round + label:after {
+ display: block;
+ position: absolute;
+ top: 1px;
+ left: 1px;
+ bottom: 1px;
+ content: "";
+}
+
+input[type="checkbox"].preffilter-toggle-round + label:before {
+ right: 1px;
+ background-color: #f1f1f1;
+ border-radius: 20px;
+ transition: background 0.4s;
+ content: "Basic";
+ font-size: 0.7em;
+ font-weight: normal;
+ padding-left: 40px;
+ padding-top: 8px;
+}
+
+input[type="checkbox"].preffilter-toggle-round + label:after {
+ width: 28px;
+ background-color: #fff;
+ border-radius: 100%;
+ box-shadow: 0 2px 5px rgba(0, 0, 0, 0.3);
+ transition: margin 0.4s;
+}
+
+input[type="checkbox"].preffilter-toggle-round:checked + label:before {
+ background-color: #8ce196;
+ content: "Advanced";
+ font-size: 0.7em;
+ font-weight: normal;
+ padding-left: 10px;
+ padding-top: 8px;
+}
+
+input[type="checkbox"].preffilter-toggle-round:checked + label:after {
+ margin-left: 70px;
+}
+
+.filter-menu.navbar-nav > li > a {
+ padding-top: 12px;
+ padding-bottom: 12px;
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-08-29 16:13:54
|
Revision: 59546
http://sourceforge.net/p/tikiwiki/code/59546
Author: jonnybradley
Date: 2016-08-29 16:13:52 +0000 (Mon, 29 Aug 2016)
Log Message:
-----------
[MOD] admin: Preference filter improvements - allow all prefs to be returned in the pref search, and add labels to ones that would normally be hidden according to the user's current settings
Modified Paths:
--------------
trunk/templates/admin/admin_navbar.tpl
trunk/templates/admin/include_fgal.tpl
trunk/templates/prefs/shared-flags.tpl
trunk/tiki-admin.php
Modified: trunk/templates/admin/admin_navbar.tpl
===================================================================
--- trunk/templates/admin/admin_navbar.tpl 2016-08-29 15:45:05 UTC (rev 59545)
+++ trunk/templates/admin/admin_navbar.tpl 2016-08-29 16:13:52 UTC (rev 59546)
@@ -77,7 +77,7 @@
}
});
- show($('.adminoptionbox.preference.modified'))
+ show($('.adminoptionbox.preference.modified'));
$('input[name="filters"]').val(filters.join(' '));
$('.tabset .tabmark a').each(function () {
@@ -161,7 +161,7 @@
<form method="post" action="" href="tiki-admin.php" class="table" role="form">
<div class="pref_search_results panel-body">
{foreach from=$lm_searchresults item=prefName}
- {preference name=$prefName get_pages="y"}
+ {preference name=$prefName get_pages='y' visible='always'}
{/foreach}
</div>
<div class="panel-footer text-center">
@@ -179,6 +179,7 @@
{/jq}
{elseif $lm_criteria}
{remarksbox type="note" title="{tr}No results{/tr}" icon="magnifier"}
- {tr}No preferences were found for your search query with your <a class='alert-link' target='tikihelp' href='https://doc.tiki.org/Preference+Filters'>current choice of Preference Filters</a> ({icon name="filter"}).{/tr}{if $prefs.unified_engine eq 'lucene'}{tr} Not what you expected? Try {/tr}<a class="alert-link" href="tiki-admin.php?prefrebuild">{tr}rebuild{/tr}</a> {tr}the preferences search index.{/tr}{/if}
+ {tr}No preferences were found for your search query.{/tr}<br>
+ {tr _0='<a class="alert-link" href="tiki-admin.php?prefrebuild">' _1='</a>'}Not what you expected? Try %0rebuilding%1 the preferences search index.{/tr}
{/remarksbox}
{/if}
Modified: trunk/templates/admin/include_fgal.tpl
===================================================================
--- trunk/templates/admin/include_fgal.tpl 2016-08-29 15:45:05 UTC (rev 59545)
+++ trunk/templates/admin/include_fgal.tpl 2016-08-29 16:13:52 UTC (rev 59546)
@@ -35,14 +35,14 @@
<div class="adminoptionboxchild fgal_use_db_childcontainer n">
{preference name='fgal_use_dir'}
</div>
- <div class="col-lg-8 col-sm-offset-4 margin-bottom-md">
+ <div class="col-sm-8 col-sm-offset-4 margin-bottom-md">
{button href="tiki-admin.php?page=fgal&move=to_fs" _text="{tr}Move files from database to directory{/tr}"}
{button href="tiki-admin.php?page=fgal&move=to_db" _text="{tr}Move files from directory to database{/tr}"}
</div>
{preference name='fgal_podcast_dir'}
- <input type="hidden" name="filegalfeatures" />
+ <input type="hidden" name="filegalfeatures">
<fieldset>
<legend>{tr}Features{/tr}{help url="File+Gallery+Config"}</legend>
Modified: trunk/templates/prefs/shared-flags.tpl
===================================================================
--- trunk/templates/prefs/shared-flags.tpl 2016-08-29 15:45:05 UTC (rev 59545)
+++ trunk/templates/prefs/shared-flags.tpl 2016-08-29 16:13:52 UTC (rev 59546)
@@ -32,3 +32,14 @@
{/if}
{$p.pages}
+
+{if not $pref_filters.advanced.selected and in_array('advanced', $p.tags)}
+ <label class="label label-warning tips" title=":{tr}Change your preference filter settings in order to view advanced preferences by default{/tr}">
+ {tr}advanced{/tr}
+ </label>
+{/if}
+{if not $pref_filters.experimental.selected and in_array('experimental', $p.tags)}
+ <label class="label label-danger tips" title=":{tr}Change your preference filter settings in order to view experimental preferences by default{/tr}">
+ {tr}experimental{/tr}
+ </label>
+{/if}
Modified: trunk/tiki-admin.php
===================================================================
--- trunk/tiki-admin.php 2016-08-29 15:45:05 UTC (rev 59545)
+++ trunk/tiki-admin.php 2016-08-29 16:13:52 UTC (rev 59546)
@@ -213,7 +213,7 @@
set_time_limit(0);
try {
$smarty->assign('lm_criteria', $_REQUEST['lm_criteria']);
- $results = $prefslib->getMatchingPreferences($_REQUEST['lm_criteria'], $temp_filters);
+ $results = $prefslib->getMatchingPreferences($_REQUEST['lm_criteria']);
$results = array_slice($results, 0, 50);
$smarty->assign('lm_searchresults', $results);
} catch(ZendSearch\Lucene\Exception\ExceptionInterface $e) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-08-31 14:27:00
|
Revision: 59561
http://sourceforge.net/p/tikiwiki/code/59561
Author: jonnybradley
Date: 2016-08-31 14:26:57 +0000 (Wed, 31 Aug 2016)
Log Message:
-----------
[REF] history: Remove references to the $_REQUEST array from histlib_helper_setup_diff()
Modified Paths:
--------------
trunk/lib/wiki/histlib.php
trunk/tiki-editpage.php
trunk/tiki-pagehistory.php
Modified: trunk/lib/wiki/histlib.php
===================================================================
--- trunk/lib/wiki/histlib.php 2016-08-31 08:26:20 UTC (rev 59560)
+++ trunk/lib/wiki/histlib.php 2016-08-31 14:26:57 UTC (rev 59561)
@@ -1132,7 +1132,7 @@
}
-function histlib_helper_setup_diff( $page, $oldver, $newver )
+function histlib_helper_setup_diff( $page, $oldver, $newver, $diff_style = '' )
{
global $prefs;
$smarty = TikiLib::lib('smarty');
@@ -1192,17 +1192,17 @@
$smarty->assign('diff_summaries', $diff_summaries);
- if (!isset($_REQUEST["diff_style"]) || $_REQUEST["diff_style"] == "old") {
- $_REQUEST["diff_style"] = 'unidiff';
+ if (empty($diff_style) || $diff_style == "old") {
+ $diff_style = $prefs['default_wiki_diff_style'];
}
- $smarty->assign('diff_style', $_REQUEST["diff_style"]);
- if ($_REQUEST["diff_style"] == "sideview") {
+ $smarty->assign('diff_style', $diff_style);
+ if ($diff_style == "sideview") {
$old["data"] = $tikilib->parse_data($old["data"], array('preview_mode' => true));
$new["data"] = $tikilib->parse_data($new["data"], array('preview_mode' => true));
} else {
require_once('lib/diff/difflib.php');
- if ($info['is_html'] == 1 and $_REQUEST["diff_style"] != "htmldiff") {
+ if ($info['is_html'] == 1 and $diff_style != "htmldiff") {
$search[] = "~</(table|td|th|div|p)>~";
$replace[] = "\n";
$search[] = "~<(hr|br) />~";
@@ -1210,7 +1210,7 @@
$old['data'] = strip_tags(preg_replace($search, $replace, $old['data']), '<h1><h2><h3><h4><b><i><u><span>');
$new['data'] = strip_tags(preg_replace($search, $replace, $new['data']), '<h1><h2><h3><h4><b><i><u><span>');
}
- if ($_REQUEST["diff_style"] == "htmldiff" && $old['is_html'] != 1) {
+ if ($diff_style == "htmldiff" && $old['is_html'] != 1) {
$parse_options = array('is_html' => ($old['is_html'] == 1), 'noheadinc' => true, 'suppress_icons' => true, 'noparseplugins' => true);
$old["data"] = $tikilib->parse_data($old["data"], $parse_options);
@@ -1227,7 +1227,7 @@
$new["data"] = preg_replace(';~tc~(.*?)~/tc~;s', '', $new["data"]);
}
- $html = diff2($old["data"], $new["data"], $_REQUEST["diff_style"]);
+ $html = diff2($old["data"], $new["data"], $diff_style);
$smarty->assign_by_ref('diffdata', $html);
}
}
Modified: trunk/tiki-editpage.php
===================================================================
--- trunk/tiki-editpage.php 2016-08-31 08:26:20 UTC (rev 59560)
+++ trunk/tiki-editpage.php 2016-08-31 14:26:57 UTC (rev 59561)
@@ -1420,7 +1420,12 @@
if ( $editlib->isTranslationMode() ) {
$histlib = TikiLib::lib('hist');
- histlib_helper_setup_diff($editlib->sourcePageName, $editlib->oldSourceVersion, $editlib->newSourceVersion);
+ histlib_helper_setup_diff(
+ $editlib->sourcePageName,
+ $editlib->oldSourceVersion,
+ $editlib->newSourceVersion,
+ $_REQUEST['diff_style']
+ );
$smarty->assign('diff_oldver', (int) $editlib->oldSourceVersion);
$smarty->assign('diff_newver', (int) $editlib->newSourceVersion);
$smarty->assign('update_translation', 'y');
Modified: trunk/tiki-pagehistory.php
===================================================================
--- trunk/tiki-pagehistory.php 2016-08-31 08:26:20 UTC (rev 59560)
+++ trunk/tiki-pagehistory.php 2016-08-31 14:26:57 UTC (rev 59561)
@@ -431,7 +431,7 @@
JS
);
if ($comparing) {
- histlib_helper_setup_diff($page, $oldver, $newver);
+ histlib_helper_setup_diff($page, $oldver, $newver, $_REQUEST['diff_style']);
if (isset($approved_versions)) {
$smarty->assign('flaggedrev_compare_approve', ! in_array($newver, $approved_versions));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-08-31 18:41:20
|
Revision: 59570
http://sourceforge.net/p/tikiwiki/code/59570
Author: jonnybradley
Date: 2016-08-31 18:41:17 +0000 (Wed, 31 Aug 2016)
Log Message:
-----------
[UPD] elFinder: Switch over to use the elFinder build now available on composer.tiki.org (originally from packagist.org).
The search input on the toolbar refuses to float to the right so far, but apart from that it seems to work much as before please test.
N.B. run setup.sh after updating to update composer and flush caches.
Modified Paths:
--------------
trunk/composer.json
trunk/composer.lock
trunk/lib/core/Services/File/FinderController.php
trunk/lib/core/Tiki/Composer/CleanVendors.php
trunk/lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php
trunk/themes/base_files/css/tiki_base.css
trunk/themes/base_files/less/tiki-external_scripts_overrides.less
trunk/tiki-setup.php
Removed Paths:
-------------
trunk/vendor_extra/elfinder/
Modified: trunk/composer.json
===================================================================
--- trunk/composer.json 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/composer.json 2016-08-31 18:41:17 UTC (rev 59570)
@@ -70,6 +70,7 @@
"simile_timeline/simile_timeline": "2.3.0",
"smarty/smarty": "3.1.21",
"sorich87/bootstrap-tour": "0.10.3",
+ "studio-42/elfinder": "~2.1",
"svg-edit/svg-edit": "2.8.1",
"symfony/console": "2.6.4",
"symfony/dependency-injection": "2.6.4",
Modified: trunk/composer.lock
===================================================================
--- trunk/composer.lock 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/composer.lock 2016-08-31 18:41:17 UTC (rev 59570)
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "296569b924c7f1d1e6403e729aa9eb79",
- "content-hash": "3ba52a862bb9231542ba9da8d44f0f6b",
+ "hash": "79157abd1d232706135a83b348939d14",
+ "content-hash": "3106904f2a6aa86e746df986a242d69c",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -262,7 +262,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/components-bootstrap-fe6e7683be66ba45a725816efdb51d4566733043-zip-b28361.zip",
"reference": "fe6e7683be66ba45a725816efdb51d4566733043",
- "shasum": "fd4b8de953bca65a1b683bf576165a65052bd4d8"
+ "shasum": "eb249ae82a07010ca2cb7cf7f9077bd5fa1e17f2"
},
"require": {
"components/jquery": "1.9.1 - 3"
@@ -330,7 +330,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/components-jquery-39192bee49ceb98f36e9592ee2fc5116a414b6cc-zip-92b012.zip",
"reference": "39192bee49ceb98f36e9592ee2fc5116a414b6cc",
- "shasum": "1b747afbc5fab4fedaba48413969d4f4c5a32dbd"
+ "shasum": "566e31c223ecc4c86b91c50f0667100705a2912e"
},
"type": "component",
"extra": {
@@ -1059,13 +1059,13 @@
"source": {
"type": "git",
"url": "https://github.com/chartjs/Chart.js.git",
- "reference": "349a8a33ea2a3216bcb41666afe945944132e1b9"
+ "reference": "0ebe388611a8d394750aa6dba5634db26e378742"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/nnnick-chartjs-349a8a33ea2a3216bcb41666afe945944132e1b9-zip-6d7fc2.zip",
- "reference": "349a8a33ea2a3216bcb41666afe945944132e1b9",
- "shasum": "15feec18f2c9c44625c6b55d7d251af0a938c8eb"
+ "url": "https://composer.tiki.org/dist/nnnick-chartjs-0ebe388611a8d394750aa6dba5634db26e378742-zip-e9e8d0.zip",
+ "reference": "0ebe388611a8d394750aa6dba5634db26e378742",
+ "shasum": "772ed77123917636d7ad8655c927aeb40f344ac1"
},
"require": {
"php": ">=5.3.3"
@@ -1092,7 +1092,7 @@
"JS",
"chart"
],
- "time": "2016-08-12 16:31:54"
+ "time": "2016-08-27 12:29:09"
},
{
"name": "openlayers/ol3",
@@ -1472,6 +1472,64 @@
"time": "2016-02-12 11:59:46"
},
{
+ "name": "studio-42/elfinder",
+ "version": "2.1.14",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/Studio-42/elFinder.git",
+ "reference": "02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://composer.tiki.org/dist/studio-42-elfinder-02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9-zip-beaa92.zip",
+ "reference": "02c19ae09a36ec83a837b28eb5b232f5ce7b0bd9",
+ "shasum": "584b64cf653366a31ea690d1aa64dbab5ffda6b0"
+ },
+ "require": {
+ "php": ">=5.2"
+ },
+ "suggest": {
+ "barryvdh/elfinder-flysystem-driver": "VolumeDriver for elFinder to use Flysystem as a root.",
+ "dropbox-php/dropbox-php": "elFinder Volume driver `Dropbox` require `dropbox-php/dropbox-php`.",
+ "nao-pon/flysystem-google-drive": "require in GoogleDrive network volume mounting.",
+ "pear/http_oauth": "dropbox-php require `pear/http_oauth` or `PHP OAuth extension`."
+ },
+ "type": "library",
+ "autoload": {
+ "classmap": [
+ "php"
+ ]
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Dmitry Levashov",
+ "email": "di...@st...",
+ "homepage": "http://std42.ru"
+ },
+ {
+ "name": "Troex Nevelin",
+ "email": "tr...@fu...",
+ "homepage": "http://std42.ru"
+ },
+ {
+ "name": "Naoki Sawada",
+ "email": "hy...@gm...",
+ "homepage": "http://xoops.hypweb.net"
+ },
+ {
+ "name": "Community contributions",
+ "homepage": "https://github.com/Studio-42/elFinder/contributors"
+ }
+ ],
+ "description": "File manager for web",
+ "homepage": "http://elfinder.org",
+ "time": "2016-07-25 00:34:19"
+ },
+ {
"name": "svg-edit/svg-edit",
"version": "2.8.1",
"dist": {
@@ -3670,7 +3728,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/bafs-testify-52dda3459096976689d255d44250c6f8f30e62a0-zip-faf2a3.zip",
"reference": "52dda3459096976689d255d44250c6f8f30e62a0",
- "shasum": "fc1b4ce1910fa70978891f757774230000df6a5e"
+ "shasum": "3b1d858982e72740deebab7a8aee0a120f150c11"
},
"require": {
"php": ">=5.3.0"
@@ -3705,7 +3763,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/doctrine-instantiator-8e884e78f9f0eb1329e445619e04456e64d8051d-zip-681b88.zip",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
- "shasum": "2e0c587f800f92eaaea87673ce82fd3e834daca8"
+ "shasum": "9600c30f4e1c01c19fef7b9b5e7d0020bb76ff10"
},
"require": {
"php": ">=5.3,<8.0-DEV"
@@ -3759,7 +3817,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/mikey179-vfsstream-fc0fe8f4d0b527254a2dc45f0c265567c881d07e-zip-a90953.zip",
"reference": "fc0fe8f4d0b527254a2dc45f0c265567c881d07e",
- "shasum": "8a25f38cd2084e3946f1deb27715be11215ebe70"
+ "shasum": "8eda639de7fa5ca5067a49bbc518ecd4b94ca934"
},
"require": {
"php": ">=5.3.0"
@@ -3789,7 +3847,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpdocumentor-reflection-common-144c307535e82c8fdcaacbcfc1d6d8eeb896687c-zip-c3be2d.zip",
"reference": "144c307535e82c8fdcaacbcfc1d6d8eeb896687c",
- "shasum": "534319b01e0ba2a25f0b001fe8ea577ea3f6411b"
+ "shasum": "e131543cafdf0e40339344ae64e877ebd55dcc8d"
},
"require": {
"php": ">=5.5"
@@ -3843,7 +3901,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpdocumentor-reflection-docblock-9270140b940ff02e58ec577c237274e92cd40cdd-zip-550863.zip",
"reference": "9270140b940ff02e58ec577c237274e92cd40cdd",
- "shasum": "e84bbfc31d015a430b78c0786613a0fccc6bd50c"
+ "shasum": "4fa9352938f5366c577ebc8f6a19d84517543cdd"
},
"require": {
"php": ">=5.5",
@@ -3888,7 +3946,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpdocumentor-type-resolver-b39c7a5b194f9ed7bd0dd345c751007a41862443-zip-e34c86.zip",
"reference": "b39c7a5b194f9ed7bd0dd345c751007a41862443",
- "shasum": "7dd749b370d07d01d168d0f6a228c2da481e36ff"
+ "shasum": "a792d3f4e6dae78e34e64a716857a66b12f66b1d"
},
"require": {
"php": ">=5.5",
@@ -3935,7 +3993,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpspec-prophecy-58a8137754bc24b25740d4281399a4a3596058e0-zip-b71cdf.zip",
"reference": "58a8137754bc24b25740d4281399a4a3596058e0",
- "shasum": "096dbc089623b5f4cedaed2e7ab1829569536e1f"
+ "shasum": "b6303a152a186b73484a2d0651aab27e86dec428"
},
"require": {
"doctrine/instantiator": "^1.0.2",
@@ -3997,7 +4055,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-dbunit-390cefcb101e07e1d6400dbdfc3b90ecf2c1279f-zip-e03a42.zip",
"reference": "390cefcb101e07e1d6400dbdfc3b90ecf2c1279f",
- "shasum": "5e8f511ae014cdf553151be1fc5706c6c5d565d4"
+ "shasum": "18bee3b56ab1129c5062e3c33f9041c3002dba1c"
},
"require": {
"ext-pdo": "*",
@@ -4052,7 +4110,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-php-code-coverage-eabf68b476ac7d0f73793aada060f1c1a9bf8979-zip-36457d.zip",
"reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
- "shasum": "740943b471e3cf35895acf5a891e4b621170759e"
+ "shasum": "8eed712c638698674985209fd37ab7410f606f32"
},
"require": {
"php": ">=5.3.3",
@@ -4114,7 +4172,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-php-file-iterator-6150bf2c35d3fc379e50c7602b75caceaa39dbf0-zip-a7b18d.zip",
"reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0",
- "shasum": "6c0c365bed35ad4a93f284a7be8458eb14ba73c4"
+ "shasum": "480c720a10e25120fc869bd72161d62aee4d1446"
},
"require": {
"php": ">=5.3.3"
@@ -4161,7 +4219,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-php-text-template-31f8b717e51d9a2afca6c9f046f5d69fc27c8686-zip-c6bcbd.zip",
"reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
- "shasum": "018a51f248d6495957bf7ad8a0cc32ecb0523e22"
+ "shasum": "e0435bbd6bafe704614357d644a37353ff4b7e61"
},
"require": {
"php": ">=5.3.3"
@@ -4202,7 +4260,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-php-timer-38e9124049cf1a164f1e4537caf19c99bf1eb260-zip-cb2ac7.zip",
"reference": "38e9124049cf1a164f1e4537caf19c99bf1eb260",
- "shasum": "f8b9251bca1f4a80a92aa0ce5770dad6e33c2be6"
+ "shasum": "b5d8f42e180b98f11b6f28f3795eb45c224f600b"
},
"require": {
"php": ">=5.3.3"
@@ -4246,7 +4304,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-php-token-stream-3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da-zip-cd5a07.zip",
"reference": "3144ae21711fb6cac0b1ab4cbe63b75ce3d4e8da",
- "shasum": "a52d650d1853e2db77ce37cac7662c9a1f18255e"
+ "shasum": "bd09aac0b42f8aa0a1898580f433c85b859a943b"
},
"require": {
"ext-tokenizer": "*",
@@ -4295,7 +4353,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-phpunit-c062dddcb68e44b563f66ee319ddae2b5a322a90-zip-e04c6d.zip",
"reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
- "shasum": "704ce8b94992d45e84d0ef1a29cce2e57d217b7d"
+ "shasum": "667dcf97851e7e66c94dac6e22552a021928b59b"
},
"require": {
"ext-dom": "*",
@@ -4367,7 +4425,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-phpunit-mock-objects-ac8e7a3db35738d56ee9a76e78a4e03d97628983-zip-83ccd8.zip",
"reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
- "shasum": "ee9f57f3a9a2c81b9f9148298c27047890728c16"
+ "shasum": "43d620904735d6ec589acb4bd3476e137fc29908"
},
"require": {
"doctrine/instantiator": "^1.0.2",
@@ -4423,7 +4481,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpunit-phpunit-selenium-2bad798ec0daf20d2854400e3bc5329ee0a7b2d1-zip-cb6ef8.zip",
"reference": "2bad798ec0daf20d2854400e3bc5329ee0a7b2d1",
- "shasum": "daf5d6cb16b4b5f0e2b9020915b0a8ea965ad31d"
+ "shasum": "b6d1ebdca59415e2634ffdd23acbfae0ff281564"
},
"require": {
"ext-curl": "*",
@@ -4487,7 +4545,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-comparator-937efb279bd37a375bcadf584dec0726f84dbf22-zip-275d2d.zip",
"reference": "937efb279bd37a375bcadf584dec0726f84dbf22",
- "shasum": "3f469376c97f5c4d72dbbb138fba34856e163cbc"
+ "shasum": "1aa14cfd8a708d531c8cb83e2371d40037253a70"
},
"require": {
"php": ">=5.3.3",
@@ -4551,7 +4609,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-diff-13edfd8706462032c2f52b4b862974dd46b71c9e-zip-13c115.zip",
"reference": "13edfd8706462032c2f52b4b862974dd46b71c9e",
- "shasum": "84fc8f87dbc18189794c1eadac79c7dd2bb86318"
+ "shasum": "0f7a90213dfc84562da0826e01a8a87941a92484"
},
"require": {
"php": ">=5.3.3"
@@ -4603,7 +4661,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-environment-4e8f0da10ac5802913afc151413bc8c53b6c2716-zip-65fddb.zip",
"reference": "4e8f0da10ac5802913afc151413bc8c53b6c2716",
- "shasum": "b1885a2705ca3792f3d8f11ab24f4e47f703e984"
+ "shasum": "b893d6bab443d2db4852720cae0b3ca70f88986d"
},
"require": {
"php": ">=5.3.3"
@@ -4653,7 +4711,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-exporter-42c4c2eec485ee3e159ec9884f95b431287edde4-zip-3c7575.zip",
"reference": "42c4c2eec485ee3e159ec9884f95b431287edde4",
- "shasum": "7f52c583bc85c792c7159d23d836c350205c0d9c"
+ "shasum": "c507b8c9965cf28e6862e267f69c34ebf14f7cde"
},
"require": {
"php": ">=5.3.3",
@@ -4720,7 +4778,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-global-state-bc37d50fea7d017d3d340f230811c9f1d7280af4-zip-c4abec.zip",
"reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4",
- "shasum": "84f68f907e6bad13740951d31e508256ecee07ad"
+ "shasum": "1e1c757ffecfe527293c974c4f4d56cb20a00321"
},
"require": {
"php": ">=5.3.3"
@@ -4771,7 +4829,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-recursion-context-913401df809e99e4f47b27cdd781f4a258d58791-zip-205e4a.zip",
"reference": "913401df809e99e4f47b27cdd781f4a258d58791",
- "shasum": "6a784ebd109411a759a0aa82911dc78204138abb"
+ "shasum": "d9f2dd0fe3bb05617311a419fcb81dd246d348e6"
},
"require": {
"php": ">=5.3.3"
@@ -4824,7 +4882,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sebastian-version-58b3a85e7999757d6ad81c787a1fbf5ff6c628c6-zip-8093ed.zip",
"reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6",
- "shasum": "6728e10e8cd38a0c46b8adc86d542082a981e141"
+ "shasum": "79371e08c9eb160b13e1ce6562c6aca009c3ddfe"
},
"type": "library",
"autoload": {
@@ -4859,7 +4917,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/symfony-yaml-1819adf2066880c7967df7180f4f662b6f0567ac-zip-f9a05e.zip",
"reference": "1819adf2066880c7967df7180f4f662b6f0567ac",
- "shasum": "53e9e33332185160e08a545634b958ab042fb2cb"
+ "shasum": "7442483f7aba2f07e0927b7438efffaaf9a74b21"
},
"require": {
"php": ">=5.5.9"
@@ -4908,7 +4966,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/webmozart-assert-30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde-zip-03df59.zip",
"reference": "30eed06dd6bc88410a4ff7f77b6d22f3ce13dbde",
- "shasum": "9e46e06f3e8c6ba771e6a0c170820122e8718d5d"
+ "shasum": "d405bb3c7ffdeb1c613890f4f811ac98e6ac96ff"
},
"require": {
"php": ">=5.3.3"
Modified: trunk/lib/core/Services/File/FinderController.php
===================================================================
--- trunk/lib/core/Services/File/FinderController.php 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/lib/core/Services/File/FinderController.php 2016-08-31 18:41:17 UTC (rev 59570)
@@ -5,9 +5,9 @@
// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
// $Id$
-include_once "vendor_extra/elfinder/php/elFinderConnector.class.php";
-include_once "vendor_extra/elfinder/php/elFinder.class.php";
-include_once "vendor_extra/elfinder/php/elFinderVolumeDriver.class.php";
+include_once "vendor/studio-42/elfinder/php/elFinderConnector.class.php";
+include_once "vendor/studio-42/elfinder/php/elFinder.class.php";
+include_once "vendor/studio-42/elfinder/php/elFinderVolumeDriver.class.php";
include_once 'lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php';
include_once 'lib/jquery_tiki/elfinder/tikiElFinder.php';
Modified: trunk/lib/core/Tiki/Composer/CleanVendors.php
===================================================================
--- trunk/lib/core/Tiki/Composer/CleanVendors.php 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/lib/core/Tiki/Composer/CleanVendors.php 2016-08-31 18:41:17 UTC (rev 59570)
@@ -270,6 +270,12 @@
'rangy-textrange.js',
]
);
+ self::removeMultiple($vendors . 'studio-42/elfinder',
+ [
+ 'files',
+ 'elfinder.html',
+ ]
+ );
$fs->remove($vendors . 'smarty/smarty/distribution/demo');
$fs->remove($vendors . 'twitter/bootstrap/docs');
$fs->remove($vendors . 'zetacomponents/base/design');
Modified: trunk/lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php
===================================================================
--- trunk/lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/lib/jquery_tiki/elfinder/elFinderVolumeTikiFiles.class.php 2016-08-31 18:41:17 UTC (rev 59570)
@@ -1136,4 +1136,16 @@
return false;
}
+ /**
+ * Change file mode (chmod)
+ *
+ * @param string $path file path
+ * @param string $mode octal string such as '0755'
+ * @return bool
+ * @author David Bartle,
+ **/
+ protected function _chmod($path, $mode)
+ {
+ // Not used in Tiki
+ }
} // END class
Modified: trunk/themes/base_files/css/tiki_base.css
===================================================================
--- trunk/themes/base_files/css/tiki_base.css 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/themes/base_files/css/tiki_base.css 2016-08-31 18:41:17 UTC (rev 59570)
@@ -3167,6 +3167,26 @@
border-radius: 0;
box-shadow: none;
}
+/* prevents elFinder dialog appearing under the embedded pane */
+.std42-dialog.elfinder-dialog {
+ position: absolute;
+}
+.ui-dialog.elfinder-dialog-error .ui-dialog-content,
+.ui-dialog.elfinder-dialog-confirm .ui-dialog-content {
+ padding-left: 56px;
+ min-height: 35px;
+}
+.elfinder-rtl .ui-dialog.elfinder-dialog-error .ui-dialog-content,
+.elfinder-rtl .ui-dialog.elfinder-dialog-confirm .ui-dialog-content {
+ padding-left: 0;
+ padding-right: 56px;
+}
+.elfinder-quicklook-titlebar {
+ z-index: 1;
+}
+.tiki .elfinder .elfinder-button-search {
+ /* search button appears in the middle of the toolbar, not floated right - why? */
+}
body:not(.fixed_width) .container {
padding-left: 15px;
padding-right: 15px;
Modified: trunk/themes/base_files/less/tiki-external_scripts_overrides.less
===================================================================
--- trunk/themes/base_files/less/tiki-external_scripts_overrides.less 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/themes/base_files/less/tiki-external_scripts_overrides.less 2016-08-31 18:41:17 UTC (rev 59570)
@@ -73,4 +73,30 @@
border: none;
border-radius: 0;
box-shadow: none;
-}
\ No newline at end of file
+}
+
+// elFinder tiki overrrides
+
+/* prevents elFinder dialog appearing under the embedded pane */
+.std42-dialog.elfinder-dialog {
+ position:absolute;
+}
+
+// for the error dialogs
+
+.ui-dialog.elfinder-dialog-error .ui-dialog-content,
+.ui-dialog.elfinder-dialog-confirm .ui-dialog-content { padding-left: 56px; min-height:35px; }
+
+.elfinder-rtl .ui-dialog.elfinder-dialog-error .ui-dialog-content,
+.elfinder-rtl .ui-dialog.elfinder-dialog-confirm .ui-dialog-content { padding-left:0; padding-right: 56px; }
+
+// quicklook titlebar was behind the image
+.elfinder-quicklook-titlebar {
+ z-index: 1;
+}
+
+// toolbar layout fix
+.tiki .elfinder .elfinder-button-search {
+ /* search button appears in the middle of the toolbar, not floated right - why? */
+
+}
Modified: trunk/tiki-setup.php
===================================================================
--- trunk/tiki-setup.php 2016-08-31 17:05:26 UTC (rev 59569)
+++ trunk/tiki-setup.php 2016-08-31 18:41:17 UTC (rev 59570)
@@ -364,14 +364,14 @@
$str = $prefs['tiki_minify_javascript'] === 'y' ? 'min' : 'full';
// elfinder is sensible to js compression - problem is inside elfinder
// see http://stackoverflow.com/questions/11174170/js-invalid-left-hand-side-expression-in-postfix-operation for more general details
- $headerlib->add_jsfile('vendor_extra/elfinder/js/elfinder.' . $str . '.js', true)
- ->add_cssfile('vendor_extra/elfinder/css/elfinder.' . $str . '.css')
+ $headerlib->add_jsfile('vendor/studio-42/elfinder/js/elfinder.' . $str . '.js', true)
+ ->add_cssfile('vendor/studio-42/elfinder/css/elfinder.' . $str . '.css')
->add_jsfile('lib/jquery_tiki/elfinder/tiki-elfinder.js');
$elFinderLang = str_replace(array('cn', 'pt-br'), array('zh_CN', 'pt_BR'), $language);
- if (file_exists('vendor_extra/elfinder/js/i18n/elfinder.' . $elFinderLang . '.js')) {
- $headerlib->add_jsfile('vendor_extra/elfinder/js/i18n/elfinder.' . $elFinderLang . '.js');
+ if (file_exists('vendor/studio-42/elfinder/js/i18n/elfinder.' . $elFinderLang . '.js')) {
+ $headerlib->add_jsfile('vendor/studio-42/elfinder/js/i18n/elfinder.' . $elFinderLang . '.js');
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <yo...@us...> - 2016-09-01 11:11:13
|
Revision: 59573
http://sourceforge.net/p/tikiwiki/code/59573
Author: yonixxx
Date: 2016-09-01 11:11:11 +0000 (Thu, 01 Sep 2016)
Log Message:
-----------
[FIX] Turning a hard-coded filesize limit for image article into a preference.
Modified Paths:
--------------
trunk/lib/prefs/article.php
trunk/templates/admin/include_articles.tpl
trunk/templates/tiki-edit_article.tpl
Modified: trunk/lib/prefs/article.php
===================================================================
--- trunk/lib/prefs/article.php 2016-09-01 09:05:30 UTC (rev 59572)
+++ trunk/lib/prefs/article.php 2016-09-01 11:11:11 UTC (rev 59573)
@@ -99,6 +99,14 @@
'hint' => tra('Number of pixels ("0" to default to the view mode maximum)'),
'default' => '0',
),
+ 'article_image_file_size_max' => array(
+ 'name' => tra('Image article maximum file size'),
+ 'description' => tra('Sets the maximum size for an Image Article in kilobyte (default = 2000000)'),
+ 'type' => 'text',
+ 'size' => '10',
+ 'filter' => 'digits',
+ 'default' => 2000000,
+ ),
'article_custom_attributes' => array(
'name' => tra('Custom attributes for article types'),
'description' => tra('Enable additional custom fields for article types'),
Modified: trunk/templates/admin/include_articles.tpl
===================================================================
--- trunk/templates/admin/include_articles.tpl 2016-09-01 09:05:30 UTC (rev 59572)
+++ trunk/templates/admin/include_articles.tpl 2016-09-01 11:11:11 UTC (rev 59573)
@@ -80,10 +80,10 @@
<input type="hidden" name="articlesfeatures" />
{preference name=article_feature_copyrights}
</fieldset>
- <fieldset>
- <legend>
- {tr}Default maximum dimensions of custom images{/tr}
- </legend>
+ <legend>
+ {tr}Custom (Article Own) images setting{/tr}
+ </legend>
+ {preference name=article_image_file_size_max}
{preference name=article_image_size_x}
{preference name=article_image_size_y}
{preference name=article_default_list_image_size_x}
Modified: trunk/templates/tiki-edit_article.tpl
===================================================================
--- trunk/templates/tiki-edit_article.tpl 2016-09-01 09:05:30 UTC (rev 59572)
+++ trunk/templates/tiki-edit_article.tpl 2016-09-01 11:11:11 UTC (rev 59573)
@@ -197,11 +197,11 @@
{tab name="{tr}Image{/tr}"}
<h2>{tr}Image{/tr}</h2>
<div class="form-group {if $types.$type.show_image neq 'y'}hidden{/if}">
- <input type="hidden" name="MAX_FILE_SIZE" value="1000000">
+ <input type="hidden" name="MAX_FILE_SIZE" value="{$prefs.article_image_file_size_max}">
<label for="userfile1" class="control-label col-md-4">{tr}Own Image{/tr}</label>
<div class="col-md-8">
<input class="form-control" name="userfile1" type="file" onchange="document.getElementById('useImage').checked = true;">
- <span class="help-block">{tr}If not the topic image{/tr}</span>
+ <span class="help-block">{tr}If not the topic image{/tr} - {tr}Max file size : {$prefs.article_image_file_size_max/1000} MB{/tr}</span>
</div>
</div>
{if $hasImage eq 'y'}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gi...@us...> - 2016-09-04 08:18:34
|
Revision: 59589
http://sourceforge.net/p/tikiwiki/code/59589
Author: giograf
Date: 2016-09-04 08:18:32 +0000 (Sun, 04 Sep 2016)
Log Message:
-----------
[ENH] Pagination for Plugin Listpages. (Sorting works badly with the plugin, when pagination enabled doesn't work at all)
Modified Paths:
--------------
trunk/lib/wiki-plugins/wikiplugin_listpages.php
trunk/templates/tiki-listpages_content.tpl
Modified: trunk/lib/wiki-plugins/wikiplugin_listpages.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_listpages.php 2016-09-03 04:07:55 UTC (rev 59588)
+++ trunk/lib/wiki-plugins/wikiplugin_listpages.php 2016-09-04 08:18:32 UTC (rev 59589)
@@ -240,7 +240,25 @@
array('text' => tra('Yes'), 'value' => 'y'),
array('text' => tra('No'), 'value' => 'n')
)
- )
+ ),
+ 'offset_arg' => array(
+ 'required' => false,
+ 'name' => tra('Offset Argument'),
+ 'description' => 'Argument, id of the plugin (if more than one on the page), for pagination',
+ 'since' => '15.3',
+ 'advanced' => true
+ ),
+ 'pagination' => array(
+ 'required' => false,
+ 'name' => tra('Pagination'),
+ 'description' => 'Turn on pagination',
+ 'since' => '15.3',
+ 'options' => array(
+ array('text' => '', 'value' => ''),
+ array('text' => tra('Yes'), 'value' => 'y'),
+ array('text' => tra('No'), 'value' => 'n')
+ )
+ )
)
);
}
@@ -277,6 +295,7 @@
'showCheckbox' => 'y',
'showNumberOfPages' => 'n',
'for_list_pages' => 'y',
+ 'pagination' => 'n'
);
$params = array_merge($default, $params);
extract($params, EXTR_SKIP);
@@ -323,6 +342,21 @@
} elseif (is_array($translations)) {
$lang = $filter['lang'] = reset($translations);
}
+ if (!empty($lang)) {
+ $filter['lang'] = $lang;
+ } elseif (is_array($translations)) {
+ $lang = $filter['lang'] = reset($translations);
+ }
+ if ( $pagination == 'y'){
+ if ( !empty($offset_arg) && !empty($_REQUEST[$offset_arg]) ){
+ $offset_pagination = $_REQUEST[$offset_arg];
+ }
+ else{
+ $offset_pagination = 0;
+ }
+ }
+
+
$exact_match = ( isset($exact_match) && $exact_match == 'y' );
$only_name = ( isset($showNameOnly) && $showNameOnly == 'y' );
$only_orphan_pages = ( isset($only_orphan_pages) && $only_orphan_pages == 'y' );
@@ -368,6 +402,9 @@
sort($listpages['data']);
unset($aIncludetag);
unset($aExcludetag);
+
+ // Count how many pages are left after tag filtering
+ $listpages['cant'] = count($listpages['data']);
}
if ( is_array($translations) ) {
@@ -386,7 +423,6 @@
$smarty->assign('wplp_used', $used);
}
- $smarty->assign_by_ref('listpages', $listpages['data']);
$smarty->assign_by_ref('checkboxes_on', $showCheckbox);
$smarty->assign_by_ref('showNumberOfPages', $showNumberOfPages);
if (!empty($showPageAlias) && $showPageAlias == 'y')
@@ -399,8 +435,26 @@
$listpages['data'][$i]['snippet'] = $tikilib->get_snippet($page['data'], $page['outputType'], ! empty($page['is_html']), '', $length, $start, $end);
}
}
- $ret = $smarty->fetch('tiki-listpages_content.tpl');
+ $smarty->assign("redirectTo", $_REQUEST["page"]);
+
+
+ $smarty->assign("cant", $listpages['cant']);
+ $smarty->assign("pluginlistpages", 'y');
+ $smarty->assign("pagination", $pagination);
+ if ($pagination == 'y'){
+ for ($x = $offset_pagination ; $x < ($offset_pagination + $GLOBALS['maxRecords']) && $x < count($listpages['data']); $x ++){
+ $listpages_for_use[] = $listpages['data'][$x];
+ }
+ $smarty->assign_by_ref('listpages', $listpages_for_use);
+ $smarty->assign("offset", $offset_pagination);
+ $smarty->assign("offset_arg", $offset_arg);
+ }
+ else{
+ $smarty->assign_by_ref('listpages', $listpages['data']);
+ }
+
+ $ret = $smarty->fetch('tiki-listpages_content.tpl');
}
return '~np~'.$ret.'~/np~';
-}
+}
\ No newline at end of file
Modified: trunk/templates/tiki-listpages_content.tpl
===================================================================
--- trunk/templates/tiki-listpages_content.tpl 2016-09-03 04:07:55 UTC (rev 59588)
+++ trunk/templates/tiki-listpages_content.tpl 2016-09-04 08:18:32 UTC (rev 59589)
@@ -486,6 +486,11 @@
{/if}
{if !isset($ts.enabled) or !$ts.enabled}
- {pagination_links cant=$cant step=$maxRecords offset=$offset clean=$clean}{/pagination_links}
+ {if $pluginlistpages eq 'y' and $pagination eq 'y'}
+ {pagination_links cant=$cant step=$maxRecords offset=$offset offset_arg=$offset_arg clean=$clean}{/pagination_links}
+ {elseif $pluginlistpages eq 'y' and $pagination neq 'y'}
+ {else}
+ {pagination_links cant=$cant step=$maxRecords offset=$offset clean=$clean}{/pagination_links}
+ {/if}
{/if}
{/if}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-04 14:59:07
|
Revision: 59591
http://sourceforge.net/p/tikiwiki/code/59591
Author: jonnybradley
Date: 2016-09-04 14:59:05 +0000 (Sun, 04 Sep 2016)
Log Message:
-----------
[FIX] tests: A few minor fixes to make the unit tests run again - missing tra.php include, not found iconsets dir and argv global
Modified Paths:
--------------
trunk/installer/schema/20160817_fix_dymanic_list_field_values_tiki.php
trunk/lib/test/TestRunnerWithBaseline.php
trunk/lib/theme/themelib.php
Modified: trunk/installer/schema/20160817_fix_dymanic_list_field_values_tiki.php
===================================================================
--- trunk/installer/schema/20160817_fix_dymanic_list_field_values_tiki.php 2016-09-04 08:20:48 UTC (rev 59590)
+++ trunk/installer/schema/20160817_fix_dymanic_list_field_values_tiki.php 2016-09-04 14:59:05 UTC (rev 59591)
@@ -14,6 +14,7 @@
{
global $prefs;
$prefs['trackerfield_dynamiclist'] = 'y'; // needed for the fieldFactory when in the installer
+ require_once 'lib/init/tra.php';
/** @var \TrackerLib $trklib */
$trklib = TikiLib::lib('trk');
Modified: trunk/lib/test/TestRunnerWithBaseline.php
===================================================================
--- trunk/lib/test/TestRunnerWithBaseline.php 2016-09-04 08:20:48 UTC (rev 59590)
+++ trunk/lib/test/TestRunnerWithBaseline.php 2016-09-04 14:59:05 UTC (rev 59591)
@@ -461,7 +461,7 @@
}
if (preg_match('/--filter/', $phpunit_options))
{
- $this->usage("You cannot specify '--filter' option in the '--phpunit-options' option. Instead, the --filter option of $argv[0] directely (i.e., '$argv[0] --filter pattern')");
+ $this->usage("You cannot specify '--filter' option in the '--phpunit-options' option. Instead, the --filter option of {$GLOBALS['argv'][0]} directely (i.e., '{$GLOBALS['argv'][0]} --filter pattern')");
}
Modified: trunk/lib/theme/themelib.php
===================================================================
--- trunk/lib/theme/themelib.php 2016-09-04 08:20:48 UTC (rev 59590)
+++ trunk/lib/theme/themelib.php 2016-09-04 14:59:05 UTC (rev 59591)
@@ -250,10 +250,12 @@
$base_iconsets = [];
$iconsetlib = TikiLib::lib('iconset');
- foreach (scandir('themes/base_files/iconsets') as $iconset_file) {
- if ($iconset_file[0] != '.' && $iconset_file != 'index.php') {
- $data = $iconsetlib->loadFile('themes/base_files/iconsets/' . $iconset_file);
- $base_iconsets[substr($iconset_file,0,-4)] = $data['name'];
+ if (is_dir('themes/base_files/iconsets')) {
+ foreach (scandir('themes/base_files/iconsets') as $iconset_file) {
+ if ($iconset_file[0] != '.' && $iconset_file != 'index.php') {
+ $data = $iconsetlib->loadFile('themes/base_files/iconsets/' . $iconset_file);
+ $base_iconsets[substr($iconset_file, 0, -4)] = $data['name'];
+ }
}
}
return $base_iconsets;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2016-09-07 07:08:45
|
Revision: 59610
http://sourceforge.net/p/tikiwiki/code/59610
Author: kroky6
Date: 2016-09-07 07:08:42 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
[ENH] add perspective name as body class besides the perspective id
Modified Paths:
--------------
trunk/lib/perspectivelib.php
trunk/lib/setup/mobile.php
trunk/lib/smarty_tiki/function.html_body_attributes.php
trunk/lib/wiki-plugins/wikiplugin_redirect.php
trunk/tiki-switch_perspective.php
Modified: trunk/lib/perspectivelib.php
===================================================================
--- trunk/lib/perspectivelib.php 2016-09-06 16:58:44 UTC (rev 59609)
+++ trunk/lib/perspectivelib.php 2016-09-07 07:08:42 UTC (rev 59610)
@@ -50,6 +50,7 @@
foreach ( $this->get_domain_map($prefs) as $domain => $perspective ) {
if ( $domain == $currentDomain ) {
$_SESSION['current_perspective'] = trim($perspective);
+ $_SESSION['current_perspective_name'] = $this->get_perspective_name($_SESSION['current_perspective']);
return $perspective;
}
}
@@ -187,8 +188,10 @@
}
if (empty($perspective)) {
unset($_SESSION['current_perspective']);
+ unset($_SESSION['current_perspective_name']);
} else {
$_SESSION['current_perspective'] = $perspective;
+ $_SESSION['current_perspective_name'] = $this->get_perspective_name($_SESSION['current_perspective']);
}
}
@@ -337,5 +340,16 @@
return $db->getOne("SELECT perspectiveId FROM tiki_perspectives WHERE name = ?", array ( $name ));
}
+
+ /**
+ * Returns perspective's name from the Id
+ *
+ */
+ function get_perspective_name ( $id )
+ {
+ $db = TikiDb::get();
+
+ return $db->getOne("SELECT name FROM tiki_perspectives WHERE perspectiveId = ?", array ( $id ));
+ }
}
Modified: trunk/lib/setup/mobile.php
===================================================================
--- trunk/lib/setup/mobile.php 2016-09-06 16:58:44 UTC (rev 59609)
+++ trunk/lib/setup/mobile.php 2016-09-07 07:08:42 UTC (rev 59610)
@@ -73,6 +73,7 @@
$hp = $prefs['wikiHomePage']; // get default non mobile homepage
$_SESSION['current_perspective'] = $persp;
+ $_SESSION['current_perspective_name'] = $perspectivelib->get_perspective_name($_SESSION['current_perspective']);
if ($prefs['tikiIndex'] === 'tiki-index.php' && isset($_REQUEST['page'])) {
Modified: trunk/lib/smarty_tiki/function.html_body_attributes.php
===================================================================
--- trunk/lib/smarty_tiki/function.html_body_attributes.php 2016-09-06 16:58:44 UTC (rev 59609)
+++ trunk/lib/smarty_tiki/function.html_body_attributes.php 2016-09-07 07:08:42 UTC (rev 59610)
@@ -64,6 +64,7 @@
if ($prefs['feature_perspective'] == 'y' && isset($_SESSION['current_perspective'])) {
$class .= ' perspective' . $_SESSION['current_perspective'];
+ $class .= ' perspective_' . preg_replace("/[^a-z0-9]/", "_", strtolower($_SESSION['current_perspective_name']));
}
if ($categories = $smarty->getTemplateVars('objectCategoryIds')) {
Modified: trunk/lib/wiki-plugins/wikiplugin_redirect.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_redirect.php 2016-09-06 16:58:44 UTC (rev 59609)
+++ trunk/lib/wiki-plugins/wikiplugin_redirect.php 2016-09-07 07:08:42 UTC (rev 59610)
@@ -101,6 +101,7 @@
if ( $perspectivelib->perspective_exists($perspective) ) {
$_SESSION['current_perspective'] = $perspective;
+ $_SESSION['current_perspective_name'] = $perspectivelib->get_perspective_name($_SESSION['current_perspective']);
}
if (empty($page) && empty($url)) {
$url = $base_host . $_SERVER['REQUEST_URI'];
Modified: trunk/tiki-switch_perspective.php
===================================================================
--- trunk/tiki-switch_perspective.php 2016-09-06 16:58:44 UTC (rev 59609)
+++ trunk/tiki-switch_perspective.php 2016-09-07 07:08:42 UTC (rev 59610)
@@ -14,6 +14,7 @@
$access->check_feature('feature_perspective');
unset($_SESSION['current_perspective']);
+unset($_SESSION['current_perspective_name']);
if ( isset($_REQUEST['perspective']) ) {
$perspectivelib->set_perspective($_REQUEST['perspective']);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-07 11:34:35
|
Revision: 59615
http://sourceforge.net/p/tikiwiki/code/59615
Author: jonnybradley
Date: 2016-09-07 11:34:33 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
[UPD] testing: Use new version of phpunit (hope the new shasums are ok, kroky6, don;t know why other packages were changed, i ran "php temp/composer.phar update --prefer-dist")
Modified Paths:
--------------
trunk/composer.json
trunk/composer.lock
Modified: trunk/composer.json
===================================================================
--- trunk/composer.json 2016-09-07 09:58:59 UTC (rev 59614)
+++ trunk/composer.json 2016-09-07 11:34:33 UTC (rev 59615)
@@ -105,7 +105,7 @@
"require-dev": {
"mikey179/vfsStream": "1.1.0",
"bafs/testify": "dev-master",
- "phpunit/phpunit": "4.8.*",
+ "phpunit/phpunit": "^5",
"phpunit/phpunit-selenium": ">=1.2",
"phpunit/dbunit": ">=1.2"
},
Modified: trunk/composer.lock
===================================================================
--- trunk/composer.lock 2016-09-07 09:58:59 UTC (rev 59614)
+++ trunk/composer.lock 2016-09-07 11:34:33 UTC (rev 59615)
@@ -4,8 +4,8 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
"This file is @generated automatically"
],
- "hash": "79157abd1d232706135a83b348939d14",
- "content-hash": "3106904f2a6aa86e746df986a242d69c",
+ "hash": "77712f2964b7437d02da02f029e58648",
+ "content-hash": "ce26bad2ec84aa70b80409da44411a06",
"packages": [
{
"name": "Sam152/Javascript-Equal-Height-Responsive-Rows",
@@ -14,7 +14,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sam152-javascript-equal-height-responsive-rows-1.0.0.zip",
"reference": null,
- "shasum": "5b881751ded5e9d01454b77442e16a66d34c9506"
+ "shasum": "0be77b2e2b6ceca06e5dd28b018ad51f589a770c"
},
"type": "library"
},
@@ -25,7 +25,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/adodb-adodb-5.18.zip",
"reference": null,
- "shasum": "a25a0a29bddded00c90971b66403f63786f3a8b8"
+ "shasum": "dad409c584b9bcaaf24e7c8a568a7342a1e9ea8b"
},
"type": "library"
},
@@ -41,7 +41,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/afarkas-html5shiv-ed28c56c071bddfe7d635ad88995674957a016be-zip-332fff.zip",
"reference": "ed28c56c071bddfe7d635ad88995674957a016be",
- "shasum": "cd01ebcfbfc2e2a9e5b7230beebe3553959916ed"
+ "shasum": "58c6c5c79f776034729ae7f87d344dab0a7933cb"
},
"type": "component",
"extra": {
@@ -67,7 +67,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/alxlit-bootstrap-chosen-1.0.1.zip",
"reference": null,
- "shasum": "b0e6435fbe5a59340195bee1da91b96fae290a26"
+ "shasum": "1f80296de6bc167728321e6d01332adee5061a30"
},
"type": "library"
},
@@ -78,7 +78,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/blueimp-javascript-canvas-to-blob-2.2.0.zip",
"reference": null,
- "shasum": "255e55a1763ba7bcbbfd2b2d5d05f6daba821b11"
+ "shasum": "5d9bd20613d66de75b89e04f619ff94ae0fc45b9"
},
"type": "component"
},
@@ -89,7 +89,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/blueimp-javascript-load-image-1.14.0.zip",
"reference": null,
- "shasum": "66c58ee4007356a9288ebb3ba3da3e74bb942da3"
+ "shasum": "fd4dd083295055b9ebadbbf4d7b3d5f1bda2e91c"
},
"type": "library"
},
@@ -105,7 +105,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/blueimp-jquery-file-upload-e6236257b91f4824235ec6941f22878eb9bb1ed2-zip-44acc0.zip",
"reference": "e6236257b91f4824235ec6941f22878eb9bb1ed2",
- "shasum": "2633d19cb573ea7a7cef8d10d950be894586dec9"
+ "shasum": "e39bb4e3da39c0a1acc334ae3aa15b56cd2a22c5"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
@@ -155,7 +155,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-6b2514e803e1cf1df5df3148198aacfb36a2864f-zip-bc9c14.zip",
"reference": "6b2514e803e1cf1df5df3148198aacfb36a2864f",
- "shasum": "0d3a793cff3e2fd0d76007250e2d9820b1c98c39"
+ "shasum": "af24f7867beb3a22edc4e4a56f462161c7ec21c3"
},
"type": "library",
"notification-url": "https://packagist.org/downloads/",
@@ -191,7 +191,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-plugins-divarea-4.5.6.zip",
"reference": null,
- "shasum": "e21acce6ff2e1018e952b4d6f75d8b5415a4cfbf"
+ "shasum": "549337fce4fc79089d6c8245bcd2d5b5ab82c566"
},
"type": "library"
},
@@ -202,7 +202,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-skins-bootstrapck-1.0.zip",
"reference": null,
- "shasum": "06ed4c5721ceafd61156b471e045ef9021f1100d"
+ "shasum": "9473b17009b05cd9365e7f08597001703d2dc503"
},
"type": "library"
},
@@ -213,7 +213,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-skins-kama-4.5.6.zip",
"reference": null,
- "shasum": "96d6aea98a105e2ab1290785a3f78627deca881a"
+ "shasum": "ed917f245e769791867363b037937604d1ef3b08"
},
"type": "library"
},
@@ -224,7 +224,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-skins-minimalist-1.0.zip",
"reference": null,
- "shasum": "a5649308a3d237302b8d875beba38168edc47290"
+ "shasum": "eb5572fa918a5095f8fe1e1a68e890892c596ca4"
},
"type": "library"
},
@@ -235,7 +235,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ckeditor-ckeditor-skins-office2013-1.04.zip",
"reference": null,
- "shasum": "7257ccdc43420e97a6d0f1dc69bc3ca9d37e693d"
+ "shasum": "99d37c6064b19ec7109a0032ce285d51178d7f62"
},
"type": "library"
},
@@ -246,7 +246,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/codemirror-codemirror-4.12.0.zip",
"reference": null,
- "shasum": "c98f52c8c79ab4af8dc3fb96334f096f26963c48"
+ "shasum": "91005536c0a3244a8663a559c88ecda52ddd3b5d"
},
"type": "library"
},
@@ -370,7 +370,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/container-interop-container-interop-fc08354828f8fd3245f77a66b9e23a6bca48297e-zip-55a405.zip",
"reference": "fc08354828f8fd3245f77a66b9e23a6bca48297e",
- "shasum": "0be8a5b63c9c69ff606a97a6f69540338df37532"
+ "shasum": "9498e98ac8888e7235611f16fb420b9df5349a45"
},
"type": "library",
"autoload": {
@@ -397,7 +397,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/cwspear-bootstrap-hover-dropdown-e8bc99836b5ab50816786bbaba2dd2c4d6a0d094-zip-868000.zip",
"reference": "e8bc99836b5ab50816786bbaba2dd2c4d6a0d094",
- "shasum": "c5823bc38b30fd298cf0d0a770464b9519452c35"
+ "shasum": "df2a183a65fa6c3f08263e9c6c5f2cab7d88bbad"
},
"require": {
"components/bootstrap": "~3.0",
@@ -445,7 +445,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/dompdf-dompdf-cf7d8a0a27270418850cc7d7ea532159e5eeb3eb-zip-76f14c.zip",
"reference": "cf7d8a0a27270418850cc7d7ea532159e5eeb3eb",
- "shasum": "44f3c1701e3c7aba0c6c8c065d593b6344e5040c"
+ "shasum": "69fed8dc43ac575395d9ffcd35886b29b543a1a6"
},
"require": {
"phenx/php-font-lib": "0.2.*"
@@ -486,7 +486,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/ezyang-htmlpurifier-ae1828d955112356f7677c465f94f7deb7d27a40-zip-ca0362.zip",
"reference": "ae1828d955112356f7677c465f94f7deb7d27a40",
- "shasum": "8d433f75891498630559a4790dc3844fdc525f8f"
+ "shasum": "610bd96d15685b8e8353c5383ef21aef91d5c419"
},
"require": {
"php": ">=5.2"
@@ -530,7 +530,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/fortawesome-font-awesome-fddd2c240452e6c8990c4ef75e0265b455aa7968-zip-85d023.zip",
"reference": "fddd2c240452e6c8990c4ef75e0265b455aa7968",
- "shasum": "aac351fc7d3c6bb766ea141e2857820826ac4967"
+ "shasum": "7c22c8c15abfd89748245f65605136860fed408f"
},
"require-dev": {
"jekyll": "1.0.2",
@@ -578,7 +578,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/google-apiclient-a25dc9d5c109ebb02945ba1ff6336cc937c27628-zip-f50c1c.zip",
"reference": "a25dc9d5c109ebb02945ba1ff6336cc937c27628",
- "shasum": "81199c8d3011fcddde596430c3e785d827d4d902"
+ "shasum": "61a496fd946d55ea158caca0d8a67bded1a69213"
},
"require": {
"php": ">=5.2.1"
@@ -621,7 +621,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jcapture-applet-jcapture-applet-dev-trunk-56537c.zip",
"reference": "/trunk/@47",
- "shasum": "c4d805469564b110239e8841bcbea5c6dba4fb76"
+ "shasum": "9e4e1c4c8b3cac87f9b53f454cd3acffa16e9137"
},
"type": "library",
"license": [
@@ -658,7 +658,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-2.2.2.zip",
"reference": null,
- "shasum": "3e667e95b47ffe265c36d6ec4d68d276228fad5f"
+ "shasum": "09390bd40059f71014e11a0810b77b575b001020"
},
"type": "library"
},
@@ -669,7 +669,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-min-2.2.2.zip",
"reference": null,
- "shasum": "e31d434e8163eed24283bf3f1c3cb6244839a66d"
+ "shasum": "910c7483da12b97aa9897e5ed59ee349b6b1cacf"
},
"type": "library"
},
@@ -680,7 +680,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-s5-1.0.1.zip",
"reference": null,
- "shasum": "abe9b6ec2b5a1f82b6d957e1a0d3a874fdf4de0a"
+ "shasum": "64f266bd7577add7e7e18360f21f605635a036c2"
},
"type": "library"
},
@@ -691,7 +691,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-sheet-3.1.zip",
"reference": null,
- "shasum": "9ce74dcf186a45995b5cac88cb24bbcfbc7d13e6"
+ "shasum": "37bc99dc45b07751996f3a9386d1197b66d90730"
},
"type": "library"
},
@@ -702,7 +702,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-timepicker-addon-1.5.0.zip",
"reference": null,
- "shasum": "ac0ab50f85f7bd7966f46621e45cd1f4ebcb02a0"
+ "shasum": "2e55f1050dfb4987c996b7b2899383d3e9e3e718"
},
"type": "library"
},
@@ -713,7 +713,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-1.11.4.zip",
"reference": null,
- "shasum": "45d7803805d4adf74105ea1e2e5bd5fbb3a1fe95"
+ "shasum": "2f5e1cfb9b8528547e4b7887205294e1973d6848"
},
"type": "library"
},
@@ -724,7 +724,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jquery-ui-themes-1.11.4.zip",
"reference": null,
- "shasum": "76409ecde4300294a775d6aae7e23426f869d5fd"
+ "shasum": "edf7d9142d82c8931c335d4198667a634bc7d5ea"
},
"type": "library"
},
@@ -735,7 +735,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-jtrack-1.0.zip",
"reference": null,
- "shasum": "854c6786c003f8b10f773e89670d4b699e4aa985"
+ "shasum": "2722410017cb2eb0ee35c43792811e96e1bd6e65"
},
"type": "library"
},
@@ -746,7 +746,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-md5-1.1.zip",
"reference": null,
- "shasum": "0e0d8f9ef915a7537410905cb88f5a788c779f55"
+ "shasum": "194f488d26d3e4601a32653ff67ac57c78989d5b"
},
"type": "library"
},
@@ -757,7 +757,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-minicart-2.6.1.zip",
"reference": null,
- "shasum": "32a4b34606eeae28e5d22de41fe0e79bcf16377d"
+ "shasum": "2938c5bcda96035aa4219629ddd883ba58ba8153"
},
"type": "library"
},
@@ -768,7 +768,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-photoswipe-3.0.5.zip",
"reference": null,
- "shasum": "23c1cb6b3c9b3fb38580e5fac09a9ebbc7db7f01"
+ "shasum": "99c093833df3d5676637ba0585ea8b305ff1dc1d"
},
"type": "library"
},
@@ -790,7 +790,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-async-1.0.zip",
"reference": null,
- "shasum": "4aac613092dfe2d8b53cdd300a4321815cfc53b5"
+ "shasum": "7dd1dbc94b1e40fb3138ae67cf5b93149e2c4b8a"
},
"type": "library"
},
@@ -801,7 +801,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-chosen-1.5.1.zip",
"reference": null,
- "shasum": "d094c081174b05e15d7b45c716e0f84e619a68b2"
+ "shasum": "be674a5c357433d7083014c25cbd741847b56a8f"
},
"type": "library"
},
@@ -812,7 +812,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-colorbox-1.5.14.zip",
"reference": null,
- "shasum": "5d5698c17ca75acba72b317366e9d909bcb9f42e"
+ "shasum": "230e1ab09488aac3f2ccaa7eca98819f7788f463"
},
"type": "library"
},
@@ -823,7 +823,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-fitvidjs-1.1.0.zip",
"reference": null,
- "shasum": "6b05b97779ba4a13bd38e9123bc9bc8a8e780d39"
+ "shasum": "f59bb05b3588ca86d38fa9f5cf4822bb6a10bab2"
},
"type": "library"
},
@@ -834,7 +834,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-form-3.51.zip",
"reference": null,
- "shasum": "c83bd7b1195b7332351d166372469a652e7aa35f"
+ "shasum": "7456f68cf3acdcd0670874fb7ea43e3323b1be82"
},
"type": "library"
},
@@ -845,7 +845,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-galleriffic-2.0.1.zip",
"reference": null,
- "shasum": "79d4a65b66a3716baaffa70f1d433ae4402f6ea5"
+ "shasum": "c02edf52dd0fe155c312132c06793424cf8ae310"
},
"type": "library"
},
@@ -856,7 +856,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-infinitecarousel-3.0.3.zip",
"reference": null,
- "shasum": "53e1855ec72198283235864c47f2edfa49fbb28e"
+ "shasum": "d6d09e6d9a2362b2bbcb7a67650dccfaad8ec0ac"
},
"type": "library"
},
@@ -867,7 +867,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-jquery-json-2.5.1.zip",
"reference": null,
- "shasum": "3bac5980f04369bed400b40de040e48def5ad6b7"
+ "shasum": "2d99a7b26c6aa91f3a7b56a2ae2739c322dbda04"
},
"type": "library"
},
@@ -876,9 +876,9 @@
"version": "1.13.1",
"dist": {
"type": "zip",
- "url": "https://jqueryvalidation.org/files/jquery-validation-1.13.1.zip",
+ "url": "https://composer.tiki.org/dist/jquery-plugins-jquery-validation-1.13.1.zip",
"reference": null,
- "shasum": null
+ "shasum": "aab2a68903eefb706ba620a2441fb35be62da7b2"
},
"type": "library"
},
@@ -889,7 +889,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-media-0.98.zip",
"reference": null,
- "shasum": "31dced89d078c0e0692f4fca23c8983fed41773e"
+ "shasum": "b6122507403b6481a84b88fc0433a845208e3357"
},
"type": "library"
},
@@ -900,7 +900,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-1.4.0.zip",
"reference": null,
- "shasum": "2ea30f734e4b0603bf4cb8acf2c17ee53eabc979"
+ "shasum": "8b221dbfdcc2b72916feffb1ff67bd809d9c4c43"
},
"type": "library"
},
@@ -911,7 +911,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-migrate-min-1.4.0.zip",
"reference": null,
- "shasum": "c0655c7516d62885d8fc05f7d01fd2056e6cde5a"
+ "shasum": "a3c52e52092a8e4c46076582dad6fb5c37771645"
},
"type": "library"
},
@@ -922,7 +922,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-nestedsortable-1.3.4.zip",
"reference": null,
- "shasum": "0c0a9d1142980258ee4a83852afd22e5019b862f"
+ "shasum": "6d536f147c8df6c6478bbb7e9534c641e5bb45ec"
},
"type": "library"
},
@@ -933,7 +933,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-reflection-jquery-1.1.zip",
"reference": null,
- "shasum": "ec0a931444216193777f1367fe266223d5e28aac"
+ "shasum": "d5e5767b43046c385b2ab87ec1f0cb60449cb843"
},
"type": "library"
},
@@ -944,7 +944,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-superfish-1.7.5.zip",
"reference": null,
- "shasum": "7ee79bf4d49ff1e52c72451895d9df3a7315191e"
+ "shasum": "4e544e80c56a463930e3d772c6690992ef546e5a"
},
"type": "library"
},
@@ -966,7 +966,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-tagcanvas-2.8.zip",
"reference": null,
- "shasum": "3efae7757d5ada3c9793be196363ec796d468327"
+ "shasum": "84c38c6e78d8f154463f8c2abf577a6ceefd2e8f"
},
"type": "library"
},
@@ -977,7 +977,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-timeago-1.4.3.zip",
"reference": null,
- "shasum": "c2feb5fd4c7bd4e816b8ba473c06eb4c6bb37a6f"
+ "shasum": "f04242475eefff3af6ccfadbd39628f41601eeb9"
},
"type": "library"
},
@@ -988,7 +988,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-treetable-3.1.0.zip",
"reference": null,
- "shasum": "558049e73d3a6017d76cc8a5a9d900c968314450"
+ "shasum": "a51739995ae9b4c0af46bb536c7d0599284e298d"
},
"type": "library"
},
@@ -999,7 +999,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/jquery-plugins-zoom-1.7.13.zip",
"reference": null,
- "shasum": "35e4ed311cae6e3d3191685eee8ba4974551b938"
+ "shasum": "15a2abe9f3792c1124b016533b7811de8b4b46ce"
},
"type": "library"
},
@@ -1015,7 +1015,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/mediumjs-mediumjs-9144a17c135975491ac84ab15e398a1f3a895622-zip-291ef5.zip",
"reference": "9144a17c135975491ac84ab15e398a1f3a895622",
- "shasum": "ac96f450033cd9a97cf4b7e941fadc64d5134b35"
+ "shasum": "11583020f07eac0a63ddfd9a049464d3122dd728"
},
"require": {
"rangy/rangy": ">=1.3",
@@ -1049,7 +1049,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/morteza-bootstrap-rtl-3.3.2.zip",
"reference": null,
- "shasum": "07d7613a45de9a57732aaaf17bf9603d6cb46465"
+ "shasum": "984bab5847dd2ff4358afe197e707c49dfe9a01f"
},
"type": "library"
},
@@ -1059,13 +1059,13 @@
"source": {
"type": "git",
"url": "https://github.com/chartjs/Chart.js.git",
- "reference": "0ebe388611a8d394750aa6dba5634db26e378742"
+ "reference": "7dcbde48f99387b352c4c237cb40931321079e9b"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/nnnick-chartjs-0ebe388611a8d394750aa6dba5634db26e378742-zip-e9e8d0.zip",
- "reference": "0ebe388611a8d394750aa6dba5634db26e378742",
- "shasum": "772ed77123917636d7ad8655c927aeb40f344ac1"
+ "url": "https://composer.tiki.org/dist/nnnick-chartjs-7dcbde48f99387b352c4c237cb40931321079e9b-zip-4ee584.zip",
+ "reference": "7dcbde48f99387b352c4c237cb40931321079e9b",
+ "shasum": "34344f0d835e144254ed02bdc40cd00dd8e07c24"
},
"require": {
"php": ">=5.3.3"
@@ -1092,7 +1092,7 @@
"JS",
"chart"
],
- "time": "2016-08-27 12:29:09"
+ "time": "2016-09-06 19:21:24"
},
{
"name": "openlayers/ol3",
@@ -1101,7 +1101,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/openlayers-ol3-3.6.0.zip",
"reference": null,
- "shasum": "0f020e383df144d6f124d500c692bd756bce2bc8"
+ "shasum": "572876e804d41ae480311c77611fcfc368b8206f"
},
"type": "library"
},
@@ -1117,7 +1117,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/oyejorge-less-php-a1e2d3c20794b37ac4d0baeb24613e579584033b-zip-8e000d.zip",
"reference": "a1e2d3c20794b37ac4d0baeb24613e579584033b",
- "shasum": "3cafe04ef551800e8fcf0093a55dbfb1fc750a20"
+ "shasum": "1d1ad0d9a0e4fa69fac4c5ab6d9a97bc37ee77d0"
},
"require": {
"php": ">=5.3"
@@ -1179,7 +1179,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phenx-php-font-lib-c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82-zip-44e847.zip",
"reference": "c30c7fc00a6b0d863e9bb4c5d5dd015298b2dc82",
- "shasum": "f193df990ae52932806cbdee2ad9a06990491483"
+ "shasum": "946cf5adaee797b4ad103d14579fc24e59527534"
},
"type": "library",
"autoload": {
@@ -1208,7 +1208,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpcas-phpcas-1.3.3.zip",
"reference": null,
- "shasum": "c8402962cd623e95cb006c0ada8057cd72b7455b"
+ "shasum": "9fe5c595004beed75a7dc540bb6349b5c08ee23b"
},
"type": "library"
},
@@ -1224,7 +1224,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/phpseclib-phpseclib-0ea31d9b65d49a8661e93bec19f44e989bd34c69-zip-f0d13e.zip",
"reference": "0ea31d9b65d49a8661e93bec19f44e989bd34c69",
- "shasum": "785b0f3187506b7206684b06269620b7ff36f9e5"
+ "shasum": "1ea2379ce2ea5194da96e7d0acfff96c6a464599"
},
"require": {
"php": ">=5.0.0"
@@ -1314,7 +1314,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/player-flv-1.0.zip",
"reference": null,
- "shasum": "44c34eb301cf29b2ddc1820dbae1a570c7ddbd74"
+ "shasum": "b99ccccd584ffed52839b8c10d7759af8dcf3f6a"
},
"type": "library"
},
@@ -1325,7 +1325,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/player-mp3-1.0.zip",
"reference": null,
- "shasum": "a56ac4687baf282f13e06e38f0d6bfd47f15f306"
+ "shasum": "35c3a1e69a5e389145749a884c488719ab23f2f3"
},
"type": "library"
},
@@ -1341,7 +1341,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/psr-log-fe0936ee26643249e916849d48e3a51d5f5e278b-zip-e71523.zip",
"reference": "fe0936ee26643249e916849d48e3a51d5f5e278b",
- "shasum": "f0ea4482e0bbed55a984cc72187af45b3305eb51"
+ "shasum": "c2c58680b9f7103bfb5cc1e20a805e9e5a528a4b"
},
"type": "library",
"autoload": {
@@ -1374,7 +1374,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/rangy-rangy-1.3.0.zip",
"reference": null,
- "shasum": "d0c8310f1211576e15b794c58c5823d14e471174"
+ "shasum": "a00c33e618639a5aa554c03aaffbb328d54355cf"
},
"type": "library"
},
@@ -1385,7 +1385,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/simile_timeline-simile_timeline-2.3.0.zip",
"reference": null,
- "shasum": "36727b89e57e093e8bc199e35b94e0d7e60ed00c"
+ "shasum": "5163924138cf6b690d2b6ad69482e48267685264"
},
"type": "library"
},
@@ -1401,7 +1401,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/smarty-smarty-1f878e6d746ecc8ec8d00d9c75044cf7d23ad94a-zip-13a9f0.zip",
"reference": "1f878e6d746ecc8ec8d00d9c75044cf7d23ad94a",
- "shasum": "97f18d326c131cf8e82e41065eef14598f0da2de"
+ "shasum": "112808d8c533b538e4607b412cbba6181169a169"
},
"require": {
"php": ">=5.2"
@@ -1456,7 +1456,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/sorich87-bootstrap-tour-1ea8bbc5c0ed0e0fd7c0d7f786747a61677639ce-zip-017d85.zip",
"reference": "1ea8bbc5c0ed0e0fd7c0d7f786747a61677639ce",
- "shasum": "5fccd7a2ce9d44a00e785264c2a0da40467b908f"
+ "shasum": "3e8592afeb348813bf7c9fe2cc5d5ce05ae54bd1"
},
"type": "component",
"notification-url": "https://packagist.org/downloads/",
@@ -1536,7 +1536,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/svg-edit-svg-edit-2.8.1.zip",
"reference": null,
- "shasum": "bf28235da308dbe3040c5c728f29068be729893e"
+ "shasum": "f3b86ea64efd07864b4efd20331cb668fb12ebc2"
},
"type": "library"
},
@@ -1553,7 +1553,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/symfony-config-17330c1d667edbbcca10616df82e8ade03bc1b33-zip-3fa418.zip",
"reference": "17330c1d667edbbcca10616df82e8ade03bc1b33",
- "shasum": "0fcf0fd5301cb366d866f4c90e3d3766b912b609"
+ "shasum": "3b2f66c491464d9de0e0f629f8dcde86b5e186b4"
},
"require": {
"php": ">=5.3.3",
@@ -1601,7 +1601,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/symfony-console-e44154bfe3e41e8267d7a3794cd9da9a51cfac34-zip-78677b.zip",
"reference": "e44154bfe3e41e8267d7a3794cd9da9a51cfac34",
- "shasum": "fd72885fd0a74f3ea5ea3f2ab648606c4e99f703"
+ "shasum": "8134411883207dfb42cbabf72afa6339f2094182"
},
"require": {
"php": ">=5.3.3"
@@ -1658,7 +1658,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/symfony-dependency-injection-42bbb43fab66292a1865dc9616c299904c3d4d14-zip-e260de.zip",
"reference": "42bbb43fab66292a1865dc9616c299904c3d4d14",
- "shasum": "c18a7b2e18a636c4ec5934835d3616d8b4df246a"
+ "shasum": "f463521124e8c70370aaeaaa7b6c2a54c2173fc8"
},
"require": {
"php": ">=5.3.3"
@@ -1707,17 +1707,17 @@
},
{
"name": "symfony/filesystem",
- "version": "v2.8.9",
+ "version": "v2.8.11",
"source": {
"type": "git",
"url": "https://github.com/symfony/filesystem.git",
- "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd"
+ "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/symfony-filesystem-ab4c3f085c8f5a56536845bf985c4cef30bf75fd-zip-02d8cb.zip",
- "reference": "ab4c3f085c8f5a56536845bf985c4cef30bf75fd",
- "shasum": "8334fdaa270d2df8294d6d97511bd7b804665f28"
+ "url": "https://composer.tiki.org/dist/symfony-filesystem-44b499521defddf2eae17a18c811bbdae4f98bdf-zip-39489a.zip",
+ "reference": "44b499521defddf2eae17a18c811bbdae4f98bdf",
+ "shasum": "e4d6d7c1dcc77e582c1d95cbd66e4b0e459ef4fc"
},
"require": {
"php": ">=5.3.9"
@@ -1752,7 +1752,7 @@
],
"description": "Symfony Filesystem Component",
"homepage": "https://symfony.com",
- "time": "2016-07-20 05:41:28"
+ "time": "2016-09-06 10:55:00"
},
{
"name": "tijsverkoyen/css-to-inline-styles",
@@ -1767,7 +1767,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/tijsverkoyen-css-to-inline-styles-e53f25f6685d167f80b9d51b91b09aa70ea6c1c9-zip-cd3ab0.zip",
"reference": "e53f25f6685d167f80b9d51b91b09aa70ea6c1c9",
- "shasum": "343a48e0583fc8e77d67aa93a32e1d4fda57320b"
+ "shasum": "6c979940b351557e3294fc732ae004e5661fb308"
},
"require": {
"php": ">=5.3.0"
@@ -1805,7 +1805,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/twitter-bootstrap-81df608a40bf0629a1dc08e584849bb1e43e0b7a-zip-bc9c50.zip",
"reference": "81df608a40bf0629a1dc08e584849bb1e43e0b7a",
- "shasum": "98b93db6b526da2386e9d9bb84506963205a8a72"
+ "shasum": "2d7778dd1745f4202a82f40ee87d3de4a8210aa9"
},
"replace": {
"twitter/bootstrap": "self.version"
@@ -1851,7 +1851,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/undojs-undojs-1.zip",
"reference": null,
- "shasum": "4c201c0c19135160441a75529cf71f827e3e1d03"
+ "shasum": "d43ace756e718d70fb34145a63e19bb793b0ad84"
},
"type": "library"
},
@@ -1867,7 +1867,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-captcha-9a1197bc5b8aa4fad104c22f6d9b2a3d4bdda0c6-zip-964e85.zip",
"reference": "9a1197bc5b8aa4fad104c22f6d9b2a3d4bdda0c6",
- "shasum": "bfd1165379f6cb2a683194322d34157a25a9d2d5"
+ "shasum": "ba481a17cd90df97af3bfef8a6e78c8fedbd3360"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -1924,7 +1924,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-code-95033f061b083e16cdee60530ec260d7d628b887-zip-627e89.zip",
"reference": "95033f061b083e16cdee60530ec260d7d628b887",
- "shasum": "96c1be133b5ca5ddb03dd9f881abe0676a6afff5"
+ "shasum": "b62bfc4242bb4b78e596ebf91f0bc2ee4fca1653"
},
"require": {
"php": "^5.5 || 7.0.0 - 7.0.4 || ^7.0.6",
@@ -1976,7 +1976,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-config-2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d-zip-cfb12d.zip",
"reference": "2920e877a9f6dca9fa8f6bd3b1ffc2e19bb1e30d",
- "shasum": "2c6c692ee80e6ad9cd784b4512df05974eb8786f"
+ "shasum": "e73278a91e8dc55fc62b7263159eaddee59e2b41"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2032,7 +2032,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-crypt-1b2f5600bf6262904167116fa67b58ab1457036d-zip-529b97.zip",
"reference": "1b2f5600bf6262904167116fa67b58ab1457036d",
- "shasum": "73ff18d3edb79c0e0f338abf8c486d136e46ff19"
+ "shasum": "736012ab55fdc603bfab2270d47ee094f8394a3c"
},
"require": {
"container-interop/container-interop": "~1.0",
@@ -2082,7 +2082,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-escaper-2dcd14b61a72d8b8e27d579c6344e12c26141d4e-zip-0742ef.zip",
"reference": "2dcd14b61a72d8b8e27d579c6344e12c26141d4e",
- "shasum": "521c958bd350375bc32b870603a884e5dcae44d2"
+ "shasum": "e965949da579e0430e0bf972fb5cb77b4e502280"
},
"require": {
"php": ">=5.5"
@@ -2126,7 +2126,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-eventmanager-3d41b6129fb4916d483671cea9f77e4f90ae85d3-zip-df5f20.zip",
"reference": "3d41b6129fb4916d483671cea9f77e4f90ae85d3",
- "shasum": "870aa953b17f55975d91fbbb66b1e88f6b387ac4"
+ "shasum": "99c7d4193368bfc06063cb4b054f304d3ef8256e"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2173,7 +2173,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-feed-12b328d382aa5200f1de53d4147033b885776b67-zip-ec1dc8.zip",
"reference": "12b328d382aa5200f1de53d4147033b885776b67",
- "shasum": "919150976280326d0e79aa9533231bf28275aada"
+ "shasum": "6b7020fef4e5e962df06d38201b4c88a055eb2e3"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2234,7 +2234,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-filter-84c50246428efb0a1e52868e162dab3e149d5b80-zip-a06e43.zip",
"reference": "84c50246428efb0a1e52868e162dab3e149d5b80",
- "shasum": "83dff07fac3ea3f2ace3a2333afb69c9831fce80"
+ "shasum": "3df3768e2a498500af7a8af370877ba0ea6cdb41"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2294,7 +2294,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-http-98b1cac0bc7a91497c5898184281abcd0e24c8d6-zip-8a2699.zip",
"reference": "98b1cac0bc7a91497c5898184281abcd0e24c8d6",
- "shasum": "b17a029f78853cb57d4d7260d3f1d842bddb8b90"
+ "shasum": "5ad60304f1dfbaa498b34b7c71b6f5b515a75ae1"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2344,7 +2344,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-hydrator-22652e1661a5a10b3f564cf7824a2206cf5a4a65-zip-a42ae9.zip",
"reference": "22652e1661a5a10b3f564cf7824a2206cf5a4a65",
- "shasum": "f5f1ec9387ac0e9b56e415b68597d9a0a889138f"
+ "shasum": "6a355789c7178ec131c0cbde7e5e4ce3316a4507"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2402,7 +2402,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-i18n-b2db0d8246a865c659f93199f90f5fc2cd2f3cd8-zip-f21086.zip",
"reference": "b2db0d8246a865c659f93199f90f5fc2cd2f3cd8",
- "shasum": "563fcef7cdf1c32c5534ea82ee0e3ca63e3be9f2"
+ "shasum": "be2646c96d8d0dc6753013f6439073c8a914fde2"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2469,7 +2469,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-json-4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28-zip-718720.zip",
"reference": "4c8705dbe4ad7d7e51b2876c5b9eea0ef916ba28",
- "shasum": "86e104db56606311a56cd1bde8e745e70f319dfb"
+ "shasum": "f3bc39072581d144712162a3c89dcec6ec332a8c"
},
"require": {
"php": "^5.5 || ^7.0"
@@ -2524,7 +2524,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-loader-c5fd2f071bde071f4363def7dea8dec7393e135c-zip-6cb83f.zip",
"reference": "c5fd2f071bde071f4363def7dea8dec7393e135c",
- "shasum": "b429a6a30cde741368a176ff0fd89d7fd6dfc6ba"
+ "shasum": "e469d64b045a8ff38781557fa112ba04834f7ba1"
},
"require": {
"php": ">=5.3.23"
@@ -2568,7 +2568,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-log-115d75db1f8fb29efbf1b9a49cb91c662b7195dc-zip-7964d2.zip",
"reference": "115d75db1f8fb29efbf1b9a49cb91c662b7195dc",
- "shasum": "df41af7198920a75ac494f9ebac3ba619431a77a"
+ "shasum": "dc4d05b75615691a3d797294f0511600f2df6f3d"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -2639,7 +2639,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-mail-2e817b58ebaa2b422a25d854106a91f74b6a7976-zip-3e3116.zip",
"reference": "2e817b58ebaa2b422a25d854106a91f74b6a7976",
- "shasum": "14ba0187641de6a93f6b2a459aac16641555d811"
+ "shasum": "b08ad4b79d6d189aa6e042cb6d69f58c4d947d9e"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2699,7 +2699,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-math-f4358090d5d23973121f1ed0b376184b66d9edec-zip-c875e3.zip",
"reference": "f4358090d5d23973121f1ed0b376184b66d9edec",
- "shasum": "aac9aba0fba98e22be5798d4ad95131c9abd6463"
+ "shasum": "c67ed4ff968bc7e3ee06acbf8fe6a5f7f1540c35"
},
"require": {
"php": "^5.5 || ^7.0"
@@ -2749,7 +2749,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-mime-340769c3d962ac4d9d3cf9da7e75419368e56fcc-zip-20700b.zip",
"reference": "340769c3d962ac4d9d3cf9da7e75419368e56fcc",
- "shasum": "dc370fd9791a1983e6754da48c580d6e41ef0fbc"
+ "shasum": "fb36c5c37f02afeb2027bf6a09ff797bde1c9553"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2798,7 +2798,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-server-7cb617ca3e9b24579f544a244ee79ae61f480914-zip-c40014.zip",
"reference": "7cb617ca3e9b24579f544a244ee79ae61f480914",
- "shasum": "30e033f0bf2689a74f8b5f63d0c1a0059c1e3754"
+ "shasum": "82be276812dc47d54e00d473ce62cec207d19b18"
},
"require": {
"php": "^5.6 || ^7.0",
@@ -2844,7 +2844,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-servicemanager-f701b0d322741b0c8d8ca1288f249a49438029cd-zip-f2253c.zip",
"reference": "f701b0d322741b0c8d8ca1288f249a49438029cd",
- "shasum": "46b001e2f78ebdf2ff8b69710de99bcff64205a2"
+ "shasum": "e57269cb3c71114338dbd82250caae547ba6cb46"
},
"require": {
"container-interop/container-interop": "~1.0",
@@ -2899,7 +2899,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-session-346e9709657b81a5d53d70ce754730a26d1f02f2-zip-8eddc7.zip",
"reference": "346e9709657b81a5d53d70ce754730a26d1f02f2",
- "shasum": "d4f40abce8122c58697c82ab6bb120ee9c00a70b"
+ "shasum": "469fbcf90fb5bedf611fc6080a12cbbf814a8ab3"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -2965,7 +2965,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-soap-2d6012e7231cce550219eccfc80836a028d20bf1-zip-a7e97a.zip",
"reference": "2d6012e7231cce550219eccfc80836a028d20bf1",
- "shasum": "a884c469ba33bd0dabe426aa3c77f0905f6a2aa8"
+ "shasum": "e371776e7e56b16cdb4625c771f9b251f19ab7d4"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3017,7 +3017,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-stdlib-0e44eb46788f65e09e077eb7f44d2659143bcc1f-zip-65b1cb.zip",
"reference": "0e44eb46788f65e09e077eb7f44d2659143bcc1f",
- "shasum": "7240c72fbf29d8bdc16b755ee96cae8376dd8ffa"
+ "shasum": "86b295f520379a888bf363c8682cef22d15f45ca"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3076,7 +3076,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-tag-4429ca5016361f12eff920370170391a0f4adbff-zip-0c1020.zip",
"reference": "4429ca5016361f12eff920370170391a0f4adbff",
- "shasum": "9adb8c7393e94184520feec5f469907846171807"
+ "shasum": "10245c16f057224f442a9cf1d29ce81753962c83"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3127,7 +3127,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-uri-0bf717a239432b1a1675ae314f7c4acd742749ed-zip-9617a6.zip",
"reference": "0bf717a239432b1a1675ae314f7c4acd742749ed",
- "shasum": "ebdc8f294004f98f1faba2bce9bc78d8fdee5678"
+ "shasum": "61054f6713a0ee57de905e692c15ebb7eca0f59b"
},
"require": {
"php": "^5.5 || ^7.0",
@@ -3174,7 +3174,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-validator-8ec9f57a717dd37340308aa632f148a2c2be1cfc-zip-0ead33.zip",
"reference": "8ec9f57a717dd37340308aa632f148a2c2be1cfc",
- "shasum": "29cd34ae03ed46161f337c940ffac460ce12c7a9"
+ "shasum": "b9c0879dcb9b2be991dc641a029ebc76a11d9944"
},
"require": {
"container-interop/container-interop": "^1.1",
@@ -3245,7 +3245,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zend-version-e30c55dc394eaf396f0347887af0a7bef471fe08-zip-7a6e69.zip",
"reference": "e30c55dc394eaf396f0347887af0a7bef471fe08",
- "shasum": "5c4c818bbca0911bb854f9ac9e841ac6c74b72e2"
+ "shasum": "0fd55fcf1057a1350e9b2d944ff5f7478c3aee9a"
},
"require": {
"php": ">=5.3.23",
@@ -3295,7 +3295,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendgdata-333312548b2471642284a75d8804957b58fa26ab-zip-d1615a.zip",
"reference": "333312548b2471642284a75d8804957b58fa26ab",
- "shasum": "135d848357d0089969d6dc1b704687a5345c4c6c"
+ "shasum": "b328b7da2d339df6aab8914cb69679e9aeeb1cc0"
},
"require": {
"php": ">=5.3.3",
@@ -3341,7 +3341,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendoauth-36defad317aa80ac9366f5e5171dc0316f009f13-zip-846df7.zip",
"reference": "36defad317aa80ac9366f5e5171dc0316f009f13",
- "shasum": "0f696fa5577c3cf53c4152d609f6773a052c87a8"
+ "shasum": "d605334306b49d7ef5efeba3dc37d0292aabf144"
},
"require": {
"php": ">=5.3.3",
@@ -3388,7 +3388,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendopenid-16648e1b2acf760d0c67a8c1dd913fed0c0f61f7-zip-038e8c.zip",
"reference": "16648e1b2acf760d0c67a8c1dd913fed0c0f61f7",
- "shasum": "4e8e5db7b8c5789f51ee3c7ea19391ff7fe0bec5"
+ "shasum": "ab590750fb3d401e3e1350b114c9f01ad5dbf31c"
},
"require": {
"php": ">=5.3.3",
@@ -3434,7 +3434,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendsearch-c8de2508d3413bf9d701b40c1092c1ffbdd8fc63-zip-2d79c6.zip",
"reference": "c8de2508d3413bf9d701b40c1092c1ffbdd8fc63",
- "shasum": "6f1a1ac7995651c9e407d40a5e5b077eeca6b76f"
+ "shasum": "5f6409f374e20fc04e6817172f5c573a67f4c7ae"
},
"require": {
"php": ">=5.3.3",
@@ -3470,7 +3470,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendservice-akismet-fdfc3fc21103cafa4658ed92d813ab38a0f1ddad-zip-89db1d.zip",
"reference": "fdfc3fc21103cafa4658ed92d813ab38a0f1ddad",
- "shasum": "d8361d7a5f714852a463f17caafe4f5072785684"
+ "shasum": "c27d65678e1d59d86ebdc99e66e8632f91b14f6c"
},
"require": {
"php": ">=5.3.3",
@@ -3513,7 +3513,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendservice-recaptcha-4324cca8502d9f47b3b43a18acdd3fdbeb965536-zip-8c45bf.zip",
"reference": "4324cca8502d9f47b3b43a18acdd3fdbeb965536",
- "shasum": "8c6f7b58d2c79f77a48c6648cfe8d3f7809246b5"
+ "shasum": "31428f0e860c6367c1ca4e7b8f4c75a2b3122ee2"
},
"require": {
"php": ">=5.3.3",
@@ -3556,7 +3556,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zendframework-zendservice-twitter-b3be44fa3f2285e4ee9811ce5c518e3eab020732-zip-4f4b9f.zip",
"reference": "b3be44fa3f2285e4ee9811ce5c518e3eab020732",
- "shasum": "a4272d7dc7966aa6b4aa82ccd5250cf5d0e9e0a8"
+ "shasum": "b7713232c144e3d81d3767e51ee503968bcd5688"
},
"require": {
"php": ">=5.3.3",
@@ -3606,7 +3606,7 @@
"type": "zip",
"url": "https://composer.tiki.org/dist/zetacomponents-base-52ca69c1de55f3fa4f595779e5bc831da7ee176c-zip-36ef3e.zip",
"reference": "52ca69c1de55f3fa4f595779e5bc831da7ee176c",
- "shasum": "09bd8c671de0cc8fc149891ff31915327b5ab018"
+ "shasum": "bc977872fbb0aa8476aff86eb169aedbe952227e"
},
"type": "library",
"autoload": {
@@ -3836,6 +3836,48 @@
"time": "2012-08-25 12:49:29"
},
{
+ "name": "myclabs/deep-copy",
+ "version": "1.5.2",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/myclabs/DeepCopy.git",
+ "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/da8529775f14f4fdae33f916eb0cf65f6afbddbc",
+ "reference": "da8529775f14f4fdae33f916eb0cf65f6afbddbc",
+ "shasum": ""
+ },
+ "require": {
+ "php": ">=5.4.0"
+ },
+ "require-dev": {
+ "doctrine/collections": "1.*",
+ "phpunit/phpunit": "~4.1"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "DeepCopy\\": "src/DeepCopy/"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "description": "Create deep copies (clones) of your objects",
+ "homepage": "https://github.com/myclabs/DeepCopy",
+ "keywords": [
+ "clone",
+ "copy",
+ "duplicate",
+ "object",
+ "object graph"
+ ],
+ "time": "2016-09-06 16:07:05"
+ },
+ {
"name": "phpdocumentor/reflection-common",
"version": "1.0",
"source": {
@@ -4100,39 +4142,40 @@
},
{
"name": "phpunit/php-code-coverage",
- "version": "2.2.4",
+ "version": "4.0.1",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/php-code-coverage.git",
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979"
+ "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/phpunit-php-code-coverage-eabf68b476ac7d0f73793aada060f1c1a9bf8979-zip-36457d.zip",
- "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979",
- "shasum": "8eed712c638698674985209fd37ab7410f606f32"
+ "url": "https://composer.tiki.org/dist/phpunit-php-code-coverage-5f3f7e736d6319d5f1fc402aff8b026da26709a3-zip-53898c.zip",
+ "reference": "5f3f7e736d6319d5f1fc402aff8b026da26709a3",
+ "shasum": "1a59bc792a0ed3e7312a4221e5189b32baea3789"
},
"require": {
- "php": ">=5.3.3",
+ "php": "^5.6 || ^7.0",
"phpunit/php-file-iterator": "~1.3",
"phpunit/php-text-template": "~1.2",
- "phpunit/php-token-stream": "~1.3",
- "sebastian/environment": "^1.3.2",
- "sebastian/version": "~1.0"
+ "phpunit/php-token-stream": "^1.4.2",
+ "sebastian/code-unit-reverse-lookup": "~1.0",
+ "sebastian/environment": "^1.3.2 || ^2.0",
+ "sebastian/version": "~1.0|~2.0"
},
"require-dev": {
"ext-xdebug": ">=2.1.4",
- "phpunit/phpunit": "~4"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-dom": "*",
- "ext-xdebug": ">=2.2.1",
+ "ext-xdebug": ">=2.4.0",
"ext-xmlwriter": "*"
},
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.2.x-dev"
+ "dev-master": "4.0.x-dev"
}
},
"autoload": {
@@ -4158,7 +4201,7 @@
"testing",
"xunit"
],
- "time": "2015-10-06 15:47:00"
+ "time": "2016-07-26 14:39:29"
},
{
"name": "phpunit/php-file-iterator",
@@ -4343,17 +4386,17 @@
},
{
"name": "phpunit/phpunit",
- "version": "4.8.27",
+ "version": "5.5.4",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90"
+ "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/phpunit-phpunit-c062dddcb68e44b563f66ee319ddae2b5a322a90-zip-e04c6d.zip",
- "reference": "c062dddcb68e44b563f66ee319ddae2b5a322a90",
- "shasum": "667dcf97851e7e66c94dac6e22552a021928b59b"
+ "url": "https://composer.tiki.org/dist/phpunit-phpunit-3e6e88e56c912133de6e99b87728cca7ed70c5f5-zip-fa68a5.zip",
+ "reference": "3e6e88e56c912133de6e99b87728cca7ed70c5f5",
+ "shasum": "101fe02044552e077e9247b712e59d71d6ad8ef3"
},
"require": {
"ext-dom": "*",
@@ -4361,21 +4404,27 @@
"ext-pcre": "*",
"ext-reflection": "*",
"ext-spl": "*",
- "php": ">=5.3.3",
+ "myclabs/deep-copy": "~1.3",
+ "php": "^5.6 || ^7.0",
"phpspec/prophecy": "^1.3.1",
- "phpunit/php-code-coverage": "~2.1",
+ "phpunit/php-code-coverage": "^4.0.1",
"phpunit/php-file-iterator": "~1.4",
"phpunit/php-text-template": "~1.2",
"phpunit/php-timer": "^1.0.6",
- "phpunit/phpunit-mock-objects": "~2.3",
+ "phpunit/phpunit-mock-objects": "^3.2",
"sebastian/comparator": "~1.1",
"sebastian/diff": "~1.2",
- "sebastian/environment": "~1.3",
+ "sebastian/environment": "^1.3 || ^2.0",
"sebastian/exporter": "~1.2",
"sebastian/global-state": "~1.0",
- "sebastian/version": "~1.0",
+ "sebastian/object-enumerator": "~1.0",
+ "sebastian/resource-operations": "~1.0",
+ "sebastian/version": "~1.0|~2.0",
"symfony/yaml": "~2.1|~3.0"
},
+ "conflict": {
+ "phpdocumentor/reflection-docblock": "3.0.2"
+ },
"suggest": {
"phpunit/php-invoker": "~1.1"
},
@@ -4385,7 +4434,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "4.8.x-dev"
+ "dev-master": "5.5.x-dev"
}
},
"autoload": {
@@ -4411,30 +4460,33 @@
"testing",
"xunit"
],
- "time": "2016-07-21 06:48:14"
+ "time": "2016-08-26 07:11:44"
},
{
"name": "phpunit/phpunit-mock-objects",
- "version": "2.3.8",
+ "version": "3.2.7",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983"
+ "reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/phpunit-phpunit-mock-objects-ac8e7a3db35738d56ee9a76e78a4e03d97628983-zip-83ccd8.zip",
- "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983",
- "shasum": "43d620904735d6ec589acb4bd3476e137fc29908"
+ "url": "https://composer.tiki.org/dist/phpunit-phpunit-mock-objects-546898a2c0c356ef2891b39dd7d07f5d82c8ed0a-zip-a64bfc.zip",
+ "reference": "546898a2c0c356ef2891b39dd7d07f5d82c8ed0a",
+ "shasum": "10da8aed055f12599009ee7ca59e2daf7b17e33c"
},
"require": {
"doctrine/instantiator": "^1.0.2",
- "php": ">=5.3.3",
- "phpunit/php-text-template": "~1.2",
- "sebastian/exporter": "~1.2"
+ "php": "^5.6 || ^7.0",
+ "phpunit/php-text-template": "^1.2",
+ "sebastian/exporter": "^1.2"
},
+ "conflict": {
+ "phpunit/phpunit": "<5.4.0"
+ },
"require-dev": {
- "phpunit/phpunit": "~4.4"
+ "phpunit/phpunit": "^5.4"
},
"suggest": {
"ext-soap": "*"
@@ -4442,7 +4494,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "2.3.x-dev"
+ "dev-master": "3.2.x-dev"
}
},
"autoload": {
@@ -4467,27 +4519,27 @@
"mock",
"xunit"
],
- "time": "2015-10-02 06:51:40"
+ "time": "2016-09-06 16:07:45"
},
{
"name": "phpunit/phpunit-selenium",
- "version": "2.0.2",
+ "version": "3.0.2",
"source": {
"type": "git",
"url": "https://github.com/giorgiosironi/phpunit-selenium.git",
- "reference": "2bad798ec0daf20d2854400e3bc5329ee0a7b2d1"
+ "reference": "d3aa8984c31efcff7c8829b9bd9ad7ab4c94709c"
},
"dist": {
"type": "zip",
- "url": "https://composer.tiki.org/dist/phpunit-phpunit-selenium-2bad798ec0daf20d2854400e3bc5329ee0a7b2d1-zip-cb6ef...
[truncated message content] |
|
From: <drs...@us...> - 2016-09-07 14:27:59
|
Revision: 59620
http://sourceforge.net/p/tikiwiki/code/59620
Author: drsassafras
Date: 2016-09-07 14:27:56 +0000 (Wed, 07 Sep 2016)
Log Message:
-----------
[ENH] Lossless Image Optimization. 183kb saved over 49 files, up to 95.8% compression.
Modified Paths:
--------------
trunk/img/icons/large/cookie_cutter.png
trunk/img/icons/large/gnome-fs-server48x48.png
trunk/img/icons/large/stock_missing-image48x48.png
trunk/img/icons/pictures.png
trunk/img/icons/tag_blue.png
trunk/img/rating_smiles/bg_7.png
trunk/lib/images/icons/deb.png
trunk/themes/fivealive/images/fivealive.png
trunk/themes/fivealive/jquery-ui/options/akebi/images/ui-icons_cd0a0a_256x240.png
trunk/themes/fivealive/jquery-ui/options/grape/images/ui-icons_69285C_256x240.png
trunk/themes/fivealive/jquery-ui/options/orange/images/ui-icons_fff_256x240.png
trunk/themes/fivealive/options/grape/images/grape.png
trunk/themes/strasa/options/cool/box_bottom.gif
trunk/themes/strasa/options/cool/box_top.gif
trunk/themes/strasa/options/cool/cool.png
trunk/themes/strasa/options/cool/fold-topright.jpg
trunk/themes/strasa/options/cool/headerbg.jpg
trunk/themes/strasa/options/cool/headermenuitem-hover.png
trunk/themes/strasa/options/cool/login.jpg
trunk/themes/strasa/options/cool/loginlong.jpg
trunk/themes/strasa/options/cool/register.jpg
trunk/themes/strasa/options/mono/arrows-000000.png
trunk/themes/strasa/options/mono/box_bottom_fw.gif
trunk/themes/strasa/options/mono/box_top.gif
trunk/themes/strasa/options/mono/fold-topright.jpg
trunk/themes/strasa/options/mono/headerbg.jpg
trunk/themes/strasa/options/mono/headermenuitem-hover.png
trunk/themes/strasa/options/mono/images/arrows-000000.png
trunk/themes/strasa/options/mono/images/box_bottom_fw.gif
trunk/themes/strasa/options/mono/images/box_top.gif
trunk/themes/strasa/options/mono/images/fold-topright.jpg
trunk/themes/strasa/options/mono/images/headerbg.jpg
trunk/themes/strasa/options/mono/images/headermenuitem-hover.png
trunk/themes/strasa/options/mono/images/info_icon.png
trunk/themes/strasa/options/mono/images/lightbg.jpg
trunk/themes/strasa/options/mono/images/link_icon.png
trunk/themes/strasa/options/mono/images/list_icon.png
trunk/themes/strasa/options/mono/images/login.jpg
trunk/themes/strasa/options/mono/images/loginlong.jpg
trunk/themes/strasa/options/mono/images/mono.png
trunk/themes/strasa/options/mono/images/register.jpg
trunk/themes/strasa/options/mono/info_icon.png
trunk/themes/strasa/options/mono/lightbg.jpg
trunk/themes/strasa/options/mono/link_icon.png
trunk/themes/strasa/options/mono/list_icon.png
trunk/themes/strasa/options/mono/login.jpg
trunk/themes/strasa/options/mono/loginlong.jpg
trunk/themes/strasa/options/mono/mono.png
trunk/themes/strasa/options/mono/register.jpg
Modified: trunk/img/icons/large/cookie_cutter.png
===================================================================
(Binary files differ)
Modified: trunk/img/icons/large/gnome-fs-server48x48.png
===================================================================
(Binary files differ)
Modified: trunk/img/icons/large/stock_missing-image48x48.png
===================================================================
(Binary files differ)
Modified: trunk/img/icons/pictures.png
===================================================================
(Binary files differ)
Modified: trunk/img/icons/tag_blue.png
===================================================================
(Binary files differ)
Modified: trunk/img/rating_smiles/bg_7.png
===================================================================
(Binary files differ)
Modified: trunk/lib/images/icons/deb.png
===================================================================
(Binary files differ)
Modified: trunk/themes/fivealive/images/fivealive.png
===================================================================
(Binary files differ)
Modified: trunk/themes/fivealive/jquery-ui/options/akebi/images/ui-icons_cd0a0a_256x240.png
===================================================================
(Binary files differ)
Modified: trunk/themes/fivealive/jquery-ui/options/grape/images/ui-icons_69285C_256x240.png
===================================================================
(Binary files differ)
Modified: trunk/themes/fivealive/jquery-ui/options/orange/images/ui-icons_fff_256x240.png
===================================================================
(Binary files differ)
Modified: trunk/themes/fivealive/options/grape/images/grape.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/box_bottom.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/box_top.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/cool.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/fold-topright.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/headerbg.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/headermenuitem-hover.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/login.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/loginlong.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/cool/register.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/arrows-000000.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/box_bottom_fw.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/box_top.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/fold-topright.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/headerbg.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/headermenuitem-hover.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/arrows-000000.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/box_bottom_fw.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/box_top.gif
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/fold-topright.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/headerbg.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/headermenuitem-hover.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/info_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/lightbg.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/link_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/list_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/login.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/loginlong.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/mono.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/images/register.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/info_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/lightbg.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/link_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/list_icon.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/login.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/loginlong.jpg
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/mono.png
===================================================================
(Binary files differ)
Modified: trunk/themes/strasa/options/mono/register.jpg
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <rj...@us...> - 2016-09-08 05:32:12
|
Revision: 59626
http://sourceforge.net/p/tikiwiki/code/59626
Author: rjsmelo
Date: 2016-09-08 05:32:10 +0000 (Thu, 08 Sep 2016)
Log Message:
-----------
[NEW] PluginToc, add 'mindepthsortalpha' to sort by page name when using mindepth
Modified Paths:
--------------
trunk/lib/core/Services/Wiki/StructureController.php
trunk/lib/structures/structlib.php
trunk/lib/wiki-plugins/wikiplugin_toc.php
trunk/tiki-edit_structure.php
Modified: trunk/lib/core/Services/Wiki/StructureController.php
===================================================================
--- trunk/lib/core/Services/Wiki/StructureController.php 2016-09-07 18:12:47 UTC (rev 59625)
+++ trunk/lib/core/Services/Wiki/StructureController.php 2016-09-08 05:32:10 UTC (rev 59626)
@@ -34,6 +34,7 @@
$params->page,
$params->maxdepth,
$params->mindepth,
+ $params->mindepthsortalpha,
$params->structurePageName
);
Modified: trunk/lib/structures/structlib.php
===================================================================
--- trunk/lib/structures/structlib.php 2016-09-07 18:12:47 UTC (rev 59625)
+++ trunk/lib/structures/structlib.php 2016-09-08 05:32:10 UTC (rev 59626)
@@ -683,7 +683,7 @@
}
return $back;
}
- public function get_toc($page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0,$mindepth=0, $structurePageName='')
+ public function get_toc($page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0,$mindepth=0, $mindepthsortalpha=0, $structurePageName='')
{
global $user, $prefs;
@@ -721,6 +721,7 @@
'page' => $page,
'maxdepth' => $maxdepth,
'mindepth' => $mindepth,
+ 'mindepthsortalpha' => $mindepthsortalpha,
'structurePageName' => $structurePageName
)
);
@@ -729,30 +730,50 @@
}
}
- $nodelist = $this->fetch_toc($structure_tree, $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, 0, $structurePageName);
+ $nodelist = $this->fetch_toc($structure_tree, $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $mindepthsortalpha, 0, $structurePageName);
if ($type === 'admin' && empty($nodelist)) {
$nodelist = "<ol class='admintoc' style='min-height: 4em;' data-params='$json_params'></ol>";
}
return $nodelist ."\n";
}
- public function fetch_toc($structure_tree,$showdesc,$numbering,$type='plain',$page='',$maxdepth=0,$mindepth=0,$cur_depth=0,$structurePageName='')
+
+ public function compareByPageName($a, $b)
{
+ return strcmp($a['pageName'], $b['pageName']);
+ }
+
+ public function fetch_toc($structure_tree,$showdesc,$numbering,$type='plain',$page='',$maxdepth=0,$mindepth=0,$mindepthsortalpha=0,$cur_depth=0,$structurePageName='')
+ {
$smarty = TikiLib::lib('smarty');
global $user;
$ret='';
if ($structure_tree != '') {
- if ($cur_depth < $mindepth) {
- if ($cur_depth == 0) {
- $ret.= $smarty->fetch('structures_toc-startul.tpl')."\n";
+ if ($mindepth > 0) {
+ $currentLevel = $structure_tree;
+ for($i=0; $i<$mindepth; $i++){
+ $deeperLevel = array();
+ if ($currentLevel != '') {
+ foreach ($currentLevel as $leaf) {
+ if (isset($leaf['sub']) && is_array($leaf['sub'])) {
+ foreach($leaf['sub'] as $sub){
+ $deeperLevel[] = $sub;
+ }
+ }
+ }
+ }
+ $currentLevel = $deeperLevel;
}
- foreach ($structure_tree as $leaf) {
- if (isset($leaf['sub']) && is_array($leaf['sub'])) {
- $ret .= $this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $cur_depth + 1, $structurePageName)."</li>\n";
+ if ($mindepthsortalpha){
+ usort($currentLevel, array($this, 'compareByPageName'));
+ }
+ if ($maxdepth > 0) {
+ $maxdepth = $maxdepth - $mindepth;
+ if ($maxdepth <= 0 ){
+ $maxdepth = 1;
}
}
- if ($cur_depth == 0) {
- $ret.= $smarty->fetch('structures_toc-endul.tpl')."\n";
- }
+ $mindepth = 0;
+ $ret .= $this->fetch_toc($currentLevel, $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $mindepthsortalpha, $cur_depth, $structurePageName);
} elseif (($maxdepth <= 0) || ($cur_depth < $maxdepth)) {
$smarty->assign('toc_type', $type);
@@ -785,7 +806,7 @@
$smarty->assign('numbering', $numbering);
$ret.=$smarty->fetch('structures_toc-leaf.tpl');
if (isset($leaf['sub']) && is_array($leaf['sub'])) {
- $ret.=$this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $cur_depth+1, $structurePageName)."</li>\n";
+ $ret.=$this->fetch_toc($leaf['sub'], $showdesc, $numbering, $type, $page, $maxdepth, $mindepth, $mindepthsortalpha, $cur_depth+1, $structurePageName)."</li>\n";
} else {
$ret.=str_repeat("\t", ($cur_depth*2)+1)."</li>\n";
}
Modified: trunk/lib/wiki-plugins/wikiplugin_toc.php
===================================================================
--- trunk/lib/wiki-plugins/wikiplugin_toc.php 2016-09-07 18:12:47 UTC (rev 59625)
+++ trunk/lib/wiki-plugins/wikiplugin_toc.php 2016-09-08 05:32:10 UTC (rev 59626)
@@ -33,6 +33,14 @@
'filter' => 'digits',
'default' => 0,
),
+ 'mindepthsortalpha' => array(
+ 'name' => tra('Minimum Depth Sort By Alphabetical Order'),
+ 'description' => tr('When using mindepth, sort the first level to be displayed by alphabetical order'),
+ 'since' => '15.3.',
+ 'required' => false,
+ 'filter' => 'digits',
+ 'default' => 0,
+ ),
'structId' => array(
'name' => tra('Structure ID'),
'description' => tra('By default, structure for the current page will be displayed. Alternate
@@ -120,6 +128,7 @@
'structId' => '',
'maxdepth' => 0,
'mindepth' => 0,
+ 'mindepthsortalpha' => 0,
'numberPrefix' => '',
'pagename' => '',
);
@@ -163,14 +172,14 @@
$page_info = $structlib->s_get_page_info($pageName_ref_id);
$structure_info = $structlib->s_get_structure_info($pageName_ref_id);
if (isset($page_info)) {
- $html = $structlib->get_toc($pageName_ref_id, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $structure_info['pageName']);
+ $html = $structlib->get_toc($pageName_ref_id, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $mindepthsortalpha, $structure_info['pageName']);
return "~np~$button $html $button~/np~";
}
}
return '';
} else {
$structure_info = $structlib->s_get_structure_info($structId);
- $html = $structlib->get_toc($structId, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $structure_info['pageName']);
+ $html = $structlib->get_toc($structId, $order, $showdesc, $shownum, $numberPrefix, $type, '', $maxdepth, $mindepth, $mindepthsortalpha, $structure_info['pageName']);
return "~np~$button $html $button~/np~";
}
Modified: trunk/tiki-edit_structure.php
===================================================================
--- trunk/tiki-edit_structure.php 2016-09-07 18:12:47 UTC (rev 59625)
+++ trunk/tiki-edit_structure.php 2016-09-08 05:32:10 UTC (rev 59626)
@@ -337,7 +337,7 @@
if (!$structure_id) {
$structure_id = $structure_info['page_ref_id'];
}
- $smarty->assign('nodelist', $structlib->get_toc($structure_id, 'asc', false, false, '', 'admin', $page_info['page_ref_id'], 0, 0, ''));
+ $smarty->assign('nodelist', $structlib->get_toc($structure_id, 'asc', false, false, '', 'admin', $page_info['page_ref_id'], 0, 0, 0, ''));
// $page_ref_id,$order='asc',$showdesc=false,$numbering=true,$numberPrefix='',$type='plain',$page='',$maxdepth=0,$mindepth=0, $structurePageName=''
$smarty->assign('structure_id', $structure_id);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <kr...@us...> - 2016-09-14 08:33:27
|
Revision: 59682
http://sourceforge.net/p/tikiwiki/code/59682
Author: kroky6
Date: 2016-09-14 08:33:25 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
[ENH] ItemLink tracker field options to display multiple fields as table and sum one of them into another field of the current item
Modified Paths:
--------------
trunk/lib/core/Services/Tracker/Controller.php
trunk/lib/core/Tracker/Field/ItemLink.php
trunk/lib/trackers/trackerlib.php
trunk/templates/trackerinput/itemlink.tpl
Modified: trunk/lib/core/Services/Tracker/Controller.php
===================================================================
--- trunk/lib/core/Services/Tracker/Controller.php 2016-09-14 06:09:01 UTC (rev 59681)
+++ trunk/lib/core/Services/Tracker/Controller.php 2016-09-14 08:33:25 UTC (rev 59682)
@@ -351,7 +351,12 @@
if (isset($param['profile_reference'])) {
$lib = TikiLib::lib('object');
$param['selector_type'] = $lib->getSelectorType($param['profile_reference']);
- $param['parent'] = isset($param['parent']) ? "#option-{$param['parent']}" : null;
+ if( isset($param['parent']) ) {
+ if( !preg_match('/[\[\]#\.]/', $param['parent']) )
+ $param['parent'] = "#option-{$param['parent']}";
+ } else {
+ $param['parent'] = null;
+ }
$param['parentkey'] = isset($param['parentkey']) ? $param['parentkey'] : null;
$param['sort_order'] = isset($param['sort_order']) ? $param['sort_order'] : null;
} else {
Modified: trunk/lib/core/Tracker/Field/ItemLink.php
===================================================================
--- trunk/lib/core/Tracker/Field/ItemLink.php 2016-09-14 06:09:01 UTC (rev 59681)
+++ trunk/lib/core/Tracker/Field/ItemLink.php 2016-09-14 08:33:25 UTC (rev 59682)
@@ -71,6 +71,16 @@
'description' => tr('Uses the translate function to replace %0 etc with the field values. E.g. "%0 any text %1"'),
'filter' => 'text',
),
+ 'displayFieldsListType' => array(
+ 'name' => tr('Multiple Fields display type'),
+ 'description' => tr('Display multiple fields as concatenated list in a dropdown or as a table.'),
+ 'filter' => 'alpha',
+ 'options' => array(
+ 'dropdown' => tr('Dropdown'),
+ 'table' => tr('Table'),
+ ),
+ 'legacy_index' => 14,
+ ),
'status' => array(
'name' => tr('Status Filter'),
'description' => tr('Limit the available items to a selected set'),
@@ -150,6 +160,24 @@
),
'legacy_index' => 12,
),
+ 'sumMultipleValues' => array(
+ 'name' => tr('Calculate total amount'),
+ 'description' => tr('Choose one of the multiple displayed fields and provide a sum of all selected values.'),
+ 'filter' => 'int',
+ 'legacy_index' => 15,
+ 'profile_reference' => 'tracker_field',
+ 'parent' => 'trackerId',
+ 'parentkey' => 'tracker_id',
+ ),
+ 'saveSumToField' => array(
+ 'name' => tr('Save total amount field'),
+ 'description' => tr('Save the sum to a particular field.'),
+ 'filter' => 'int',
+ 'legacy_index' => 16,
+ 'profile_reference' => 'tracker_field',
+ 'parent' => 'input[name=trackerId]',
+ 'parentkey' => 'tracker_id',
+ ),
'indexRemote' => array(
'name' => tr('Index remote fields'),
'description' => tr('Index one or multiple fields from the master tracker along with the child, separated by |'),
@@ -219,10 +247,14 @@
return false;
}
- if ($this->getOption('preSelectFieldMethod' === 'crossSelect')) {
+ if ($this->getOption('preSelectFieldMethod') === 'crossSelect') {
return false;
}
+ if ($this->getOption('displayFieldsListType') === 'table') {
+ return false;
+ }
+
return true;
}
@@ -280,6 +312,9 @@
$data = array(
'list' => $this->getItemList(),
+ 'displayFieldsListType' => $this->getOption('displayFieldsListType'),
+ 'sumMultipleValues' => $this->getOption('sumMultipleValues'),
+ 'saveSumToField' => $this->getOption('saveSumToField'),
);
$data['selectMultipleValues'] = (bool) $this->getOption('selectMultipleValues');
@@ -320,14 +355,13 @@
$data['filter'] = $this->buildFilter();
- if ($data['crossSelect'] === 'y') {
- $fullList = $data['list'];
- if (!empty($preselection) && is_array($preselection)) {
- $data['remoteData'] = array_intersect_key($fullList, array_flip($preselection));
- } else {
- $data['remoteData'] = $fullList;
- }
+ if ($data['crossSelect'] === 'y' && !empty($preselection) && is_array($preselection)) {
+ if( isset($data['list']['items']) )
+ $data['list']['items'] = array_intersect_key($data['list']['items'], array_flip($preselection));
+ else
+ $data['list'] = array_intersect_key($data['list'], array_flip($preselection));
}
+
return $this->renderTemplate('trackerinput/itemlink.tpl', $context, $data);
}
@@ -547,13 +581,21 @@
function getItemList()
{
if ($displayFieldsList = $this->getDisplayFieldsListArray()) {
- $list = TikiLib::lib('trk')->concat_all_items_from_fieldslist(
- $this->getOption('trackerId'),
- $displayFieldsList,
- $this->getOption('status', 'opc'),
- ' ',
- true
- );
+ if( $this->getOption('displayFieldsListType') === 'table' ) {
+ $list = TikiLib::lib('trk')->get_all_items_from_fieldslist(
+ $this->getOption('trackerId'),
+ $displayFieldsList,
+ $this->getOption('status', 'opc')
+ );
+ } else {
+ $list = TikiLib::lib('trk')->concat_all_items_from_fieldslist(
+ $this->getOption('trackerId'),
+ $displayFieldsList,
+ $this->getOption('status', 'opc'),
+ ' ',
+ true
+ );
+ }
} else {
$list = TikiLib::lib('trk')->get_all_items(
$this->getOption('trackerId'),
Modified: trunk/lib/trackers/trackerlib.php
===================================================================
--- trunk/lib/trackers/trackerlib.php 2016-09-14 06:09:01 UTC (rev 59681)
+++ trunk/lib/trackers/trackerlib.php 2016-09-14 08:33:25 UTC (rev 59682)
@@ -823,7 +823,31 @@
return $res;
}
+ public function get_all_items_from_fieldslist($trackerId, $fieldsId, $status='o')
+ {
+ if (is_string($fieldsId)) {
+ $fieldsId = preg_split('/\|/', $fieldsId, -1, PREG_SPLIT_NO_EMPTY);
+ }
+ $res = array(
+ 'fields' => array(),
+ 'items' => array()
+ );
+ $definition = Tracker_Definition::get($trackerId);
+ foreach ($fieldsId as $field) {
+ if( $myfield = $definition->getField($field) ) {
+ $res['fields'][] = $myfield['name'];
+ $tmp = $this->get_all_items($trackerId, $field, $status);
+ foreach ($tmp as $key => $value) {
+ if( empty($res['items'][$key]) )
+ $res['items'][$key] = array();
+ $res['items'][$key][$field] = $value;
+ }
+ }
+ }
+ return $res;
+ }
+
public function valid_status($status)
{
return in_array($status, array('o', 'c', 'p', 'op', 'oc', 'pc', 'opc'));
Modified: trunk/templates/trackerinput/itemlink.tpl
===================================================================
--- trunk/templates/trackerinput/itemlink.tpl 2016-09-14 06:09:01 UTC (rev 59681)
+++ trunk/templates/trackerinput/itemlink.tpl 2016-09-14 08:33:25 UTC (rev 59682)
@@ -3,26 +3,67 @@
{if $data.selectMultipleValues}
<input type="hidden" name="{$field.ins_id}_old" value="{$field.value|escape}" />
{/if}
- <select name="{$field.ins_id}{if $data.selectMultipleValues}[]{/if}" {if $data.preselection and $data.crossSelect neq 'y'}disabled="disabled"{/if} {if $data.selectMultipleValues}multiple="multiple"{/if} class="form-control">
- {if $field.isMandatory ne 'y' || empty($field.value)}
- <option value=""></option>
- {/if}
- {if !empty($data.remoteData) and $data.crossSelect eq 'y'}
- {* For crossSelect links, use $data.remoteData. No item is selected*}
- {foreach key=id item=label from=$data.remoteData}
- <option value="{$id|escape}" {if $data.preselection and !$field.value and $data.preselection eq $id or (($data.selectMultipleValues and is_array($field.value) and in_array($id, $field.value) or $field.value eq $id))}selected="selected"{/if}>
- {$label|escape}
- </option>
- {/foreach}
- {else}
- {* Run the original loop *}
+ {if $data.sumMultipleValues and $data.saveSumToField}
+ {* needed by inline editor *}
+ <input type="hidden" name="ins_{$data.saveSumToField}" value="" />
+ {/if}
+ {if $data.displayFieldsListType === 'table'}
+ <div class="table-responsive">
+ <table class="table">
+ <thead>
+ <tr>
+ <th><input type="checkbox" name="selectall" value="" class="{$field.ins_id}-select-all"></th>
+ {foreach item=label from=$data.list.fields}
+ <th>{$label|escape}</th>
+ {/foreach}
+ </tr>
+ </thead>
+ <tbody>
+ {foreach key=id item=fields from=$data.list.items}
+ <tr>
+ <td><input type="checkbox" class="{$field.ins_id}-checkbox" name="{$field.ins_id}[]" value="{$id|escape}" {if $data.preselection and $data.crossSelect neq 'y'}disabled="disabled"{/if} {if $data.preselection and !$field.value and $data.preselection eq $id or (($data.selectMultipleValues and is_array($field.value) and in_array($id, $field.value) or $field.value eq $id))}checked="checked"{/if} /></td>
+ {foreach key=fieldId item=label from=$fields}
+ <td id="il{$id|escape}-{$fieldId}">{$label|escape}</td>
+ {/foreach}
+ </tr>
+ {/foreach}
+ </tbody>
+ </table>
+ </div>
+ {jq}
+ $(".{{$field.ins_id}}-select-all").removeClass('{{$field.ins_id}}-select-all')
+ .on('click', function (e) {
+ if( this.checked )
+ $(this).closest('form').find(':checkbox:not(:checked)[name^={{$field.ins_id}}]').click();
+ else
+ $(this).closest('form').find(':checkbox:checked[name^={{$field.ins_id}}]').click();
+ });
+ {{if $data.sumMultipleValues and $data.saveSumToField}}
+ $(".{{$field.ins_id}}-checkbox").on('click', function (e) {
+ var total = 0,
+ current = 0;
+ $(".{{$field.ins_id}}-checkbox:checked").each(function(i, ckb) {
+ current = parseFloat($('#il'+ckb.value+'-{{$data.sumMultipleValues}}').text());
+ if( isNaN(current) )
+ current = 0;
+ total += current;
+ });
+ $('input[name=ins_{{$data.saveSumToField}}]').val(total);
+ });
+ {{/if}}
+ {/jq}
+ {else}
+ <select name="{$field.ins_id}{if $data.selectMultipleValues}[]{/if}" {if $data.preselection and $data.crossSelect neq 'y'}disabled="disabled"{/if} {if $data.selectMultipleValues}multiple="multiple"{/if} class="form-control">
+ {if $field.isMandatory ne 'y' || empty($field.value)}
+ <option value=""></option>
+ {/if}
{foreach key=id item=label from=$data.list}
<option value="{$id|escape}" {if $data.preselection and !$field.value and $data.preselection eq $id or (($data.selectMultipleValues and is_array($field.value) and in_array($id, $field.value) or $field.value eq $id))}selected="selected"{/if}>
{$label|escape}
</option>
{/foreach}
- {/if}
- </select>
+ </select>
+ {/if}
{if $field.options_map.addItems}
<a class="btn btn-default insert-tracker-item" href="{service controller=tracker action=insert_item trackerId=$field.options_map.trackerId}">{$field.options_map.addItems|escape}</a>
{jq}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-14 12:57:45
|
Revision: 59690
http://sourceforge.net/p/tikiwiki/code/59690
Author: jonnybradley
Date: 2016-09-14 12:57:43 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
[NEW] rss: Add a new command to clear rss caches - e.g. " php console.php rss:clear --all -d 7" to clear all items older than one week
Modified Paths:
--------------
trunk/console.php
Added Paths:
-----------
trunk/lib/core/Tiki/Command/RssClearCacheCommand.php
Modified: trunk/console.php
===================================================================
--- trunk/console.php 2016-09-14 12:56:03 UTC (rev 59689)
+++ trunk/console.php 2016-09-14 12:57:43 UTC (rev 59690)
@@ -114,6 +114,7 @@
$console->add(new Tiki\Command\ProfileExport\Init);
$console->add(new Tiki\Command\RecommendationBatchCommand);
$console->add(new Tiki\Command\RefreshRssCommand);
+ $console->add(new Tiki\Command\RssClearCacheCommand);
$console->add(new Tiki\Command\TrackerImportCommand);
$console->add(new Tiki\Command\TrackerClearCommand);
} else {
@@ -135,6 +136,7 @@
$console->add(new Tiki\Command\UnavailableCommand('profile:export:init'))->ignoreValidationErrors();
$console->add(new Tiki\Command\UnavailableCommand('recommendation:batch'))->ignoreValidationErrors();
$console->add(new Tiki\Command\UnavailableCommand('rss:refresh'))->ignoreValidationErrors();
+ $console->add(new Tiki\Command\UnavailableCommand('rss:clear'))->ignoreValidationErrors();
$console->add(new Tiki\Command\UnavailableCommand('tracker:import'))->ignoreValidationErrors();
$console->add(new Tiki\Command\UnavailableCommand('tracker:clear'))->ignoreValidationErrors();
}
Added: trunk/lib/core/Tiki/Command/RssClearCacheCommand.php
===================================================================
--- trunk/lib/core/Tiki/Command/RssClearCacheCommand.php (rev 0)
+++ trunk/lib/core/Tiki/Command/RssClearCacheCommand.php 2016-09-14 12:57:43 UTC (rev 59690)
@@ -0,0 +1,79 @@
+<?php
+// (c) Copyright 2002-2016 by authors of the Tiki Wiki CMS Groupware Project
+//
+// All Rights Reserved. See copyright.txt for details and a complete list of authors.
+// Licensed under the GNU LESSER GENERAL PUBLIC LICENSE. See license.txt for details.
+// $Id$
+
+namespace Tiki\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class RssClearCacheCommand extends Command
+{
+ protected function configure()
+ {
+ $this
+ ->setName('rss:clear')
+ ->setDescription('Clear incoming RSS feed cache')
+ ->addArgument(
+ 'rssId',
+ InputArgument::OPTIONAL,
+ 'ID of RSS module cache to clear'
+ )
+ ->addOption(
+ 'all',
+ null,
+ InputOption::VALUE_NONE,
+ 'Clear all modules caches'
+ )
+ ->addOption(
+ 'olderthan',
+ 'o',
+ InputOption::VALUE_OPTIONAL,
+ 'Oldest item in seconds to keep'
+ )
+ ->addOption(
+ 'olderthandays',
+ 'd',
+ InputOption::VALUE_OPTIONAL,
+ 'Oldest item in days to keep'
+ )
+ ;
+ }
+
+ protected function execute(InputInterface $input, OutputInterface $output)
+ {
+ $all = $input->getOption('all');
+ $rssId = $input->getArgument('rssId');
+ $olderthan = $input->getOption('olderthandays');
+ if ($olderthan) {
+ $olderthan = $olderthan * 24 * 3600;
+ } else {
+ $olderthan = $input->getOption('olderthan');
+ }
+
+ $rsslib = \TikiLib::lib('rss');
+
+ if ($all) {
+ $modules = $rsslib->list_rss_modules(0, -1, '', '');
+ foreach ($modules['data'] as $feed) {
+ $output->writeln('<info>Starting.</info>');
+ $rsslib->clear_rss_cache($feed['rssId'], $olderthan);
+ $output->writeln('<info>Cleared Feed ID ' . $feed['rssId'] . ': ' . $feed['name'] . '.</info>');
+ }
+ } elseif ($rssId) {
+ $output->writeln('<info>Starting.</info>');
+ $rsslib->clear_rss_cache($rssId, $olderthan);
+ $output->writeln('<info>Cleared Feed ID ' . $rssId . '.</info>');
+ } else {
+ $output->writeln('<error>No rssId or --all parameter specified</error>');
+ }
+
+ $output->writeln('<info>Done.</info>');
+ }
+}
Property changes on: trunk/lib/core/Tiki/Command/RssClearCacheCommand.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-14 14:30:48
|
Revision: 59697
http://sourceforge.net/p/tikiwiki/code/59697
Author: jonnybradley
Date: 2016-09-14 14:30:45 +0000 (Wed, 14 Sep 2016)
Log Message:
-----------
[fp/r59696][FIX] http client: request method not found on Zend\Http\Client
Revision Links:
--------------
http://sourceforge.net/p/tikiwiki/code/59696
Modified Paths:
--------------
trunk/lib/tikilib.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2016-09-14 14:09:31 UTC (rev 59696)
+++ trunk 2016-09-14 14:30:45 UTC (rev 59697)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -3,7 +3,7 ##
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
/branches/14.x:54079-56796,57357,57370,57375
-/branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420
+/branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420,59696
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Modified: trunk/lib/tikilib.php
===================================================================
--- trunk/lib/tikilib.php 2016-09-14 14:09:31 UTC (rev 59696)
+++ trunk/lib/tikilib.php 2016-09-14 14:30:45 UTC (rev 59697)
@@ -329,7 +329,7 @@
$attempts = 0;
while ($response->isRedirect() && $attempts < 10) { // prevent redirect loop
$client->setUri($client->getUri());
- $response = $client->request();
+ $response = $client->send();
$attempts++;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-15 10:57:04
|
Revision: 59707
http://sourceforge.net/p/tikiwiki/code/59707
Author: jonnybradley
Date: 2016-09-15 10:57:02 +0000 (Thu, 15 Sep 2016)
Log Message:
-----------
[FIX] search: Increase the federated search maximum index name length to 255, the maximum supported by elasticsearch
Modified Paths:
--------------
trunk/db/tiki.sql
trunk/templates/tiki-admin_external_wikis.tpl
Added Paths:
-----------
trunk/installer/schema/20160915_extwiki_indexname_length_tiki.sql
Modified: trunk/db/tiki.sql
===================================================================
--- trunk/db/tiki.sql 2016-09-15 09:17:16 UTC (rev 59706)
+++ trunk/db/tiki.sql 2016-09-15 10:57:02 UTC (rev 59707)
@@ -687,7 +687,7 @@
`extwikiId` int(12) NOT NULL auto_increment,
`name` varchar(200) NOT NULL default '',
`extwiki` varchar(255) default NULL,
- `indexname` varchar(20) default NULL,
+ `indexname` varchar(255) default NULL,
`groups` varchar(1024) default NULL,
PRIMARY KEY (`extwikiId`)
) ENGINE=MyISAM AUTO_INCREMENT=1 ;
Added: trunk/installer/schema/20160915_extwiki_indexname_length_tiki.sql
===================================================================
--- trunk/installer/schema/20160915_extwiki_indexname_length_tiki.sql (rev 0)
+++ trunk/installer/schema/20160915_extwiki_indexname_length_tiki.sql 2016-09-15 10:57:02 UTC (rev 59707)
@@ -0,0 +1,2 @@
+ALTER TABLE `tiki_extwiki`
+ CHANGE `indexname` `indexname` VARCHAR(255) DEFAULT NULL;
Modified: trunk/templates/tiki-admin_external_wikis.tpl
===================================================================
--- trunk/templates/tiki-admin_external_wikis.tpl 2016-09-15 09:17:16 UTC (rev 59706)
+++ trunk/templates/tiki-admin_external_wikis.tpl 2016-09-15 10:57:02 UTC (rev 59707)
@@ -19,7 +19,7 @@
<div class="form-group">
<label for="indexname" class="col-sm-3 control-label">{tr}Index{/tr}</label>
<div class="col-sm-9">
- <input type="text" maxlength="20" class="form-control" name="indexname" id="indexname" value="{$info.indexname|escape}">
+ <input type="text" maxlength="255" class="form-control" name="indexname" id="indexname" value="{$info.indexname|escape}">
<p class="help-block">{tr}<em>[prefix]</em>main, such as tiki_main{/tr}</p>
</div>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <jon...@us...> - 2016-09-15 16:41:36
|
Revision: 59711
http://sourceforge.net/p/tikiwiki/code/59711
Author: jonnybradley
Date: 2016-09-15 16:41:33 +0000 (Thu, 15 Sep 2016)
Log Message:
-----------
[fp/r59710][FIX] search: The fix for the indexname field in r59707 fails if the tiki was installed after the federated search was added (Tiki 13?) but before r59664 when the new columns were added to tiki.sql. This script adds the columns before they would be modified if missing.
Revision Links:
--------------
http://sourceforge.net/p/tikiwiki/code/59710
http://sourceforge.net/p/tikiwiki/code/59707
http://sourceforge.net/p/tikiwiki/code/59664
Added Paths:
-----------
trunk/installer/schema/20160914_extwiki_missing_columns_fix_tiki.php
Property Changed:
----------------
trunk/
Index: trunk
===================================================================
--- trunk 2016-09-15 16:39:52 UTC (rev 59710)
+++ trunk 2016-09-15 16:41:33 UTC (rev 59711)
Property changes on: trunk
___________________________________________________________________
Modified: svn:mergeinfo
## -3,7 +3,7 ##
/branches/12.x:47808-51121,51191-51192,51342,51379-51380,51443,52250,52938,53191,53608,53881,55301
/branches/13.x:51407-53060,53145,53192,53882
/branches/14.x:54079-56796,57357,57370,57375
-/branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420,59696
+/branches/15.x:57416-57449,57459,57461-59163,59319,59349,59355,59358,59362,59420,59696,59710
/branches/3.0:16998-18916
/branches/4.x:22817-23908
/branches/5.x:26025-26523,26527-28378
\ No newline at end of property
Copied: trunk/installer/schema/20160914_extwiki_missing_columns_fix_tiki.php (from rev 59710, branches/15.x/installer/schema/20160914_extwiki_missing_columns_fix_tiki.php)
===================================================================
--- trunk/installer/schema/20160914_extwiki_missing_columns_fix_tiki.php (rev 0)
+++ trunk/installer/schema/20160914_extwiki_missing_columns_fix_tiki.php 2016-09-15 16:41:33 UTC (rev 59711)
@@ -0,0 +1,12 @@
+<?php
+
+
+function upgrade_20160914_extwiki_missing_columns_fix_tiki($installer)
+{
+ $exists = $installer->query("SHOW COLUMNS FROM `tiki_extwiki` LIKE 'indexname'");
+
+ if (! $exists->numRows()) {
+ $installer->query("ALTER TABLE `tiki_extwiki` ADD COLUMN `indexname` VARCHAR(20), ADD COLUMN `groups` VARCHAR(1024);");
+ }
+
+}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X