diff --git a/.gitignore b/.gitignore index b0192b1cea..2889721d37 100644 --- a/.gitignore +++ b/.gitignore @@ -20,6 +20,7 @@ # IDEs .idea/* *.iml +*~ # System files .DS_Store diff --git a/.travis.yml b/.travis.yml index fc894a344e..9e1d2eaa4c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,41 +1,27 @@ -sudo: false +sudo: true language: php -php: - - 5.5 - - 5.6 - - hhvm - env: - global: - - secure: "Uft74EqqtZ2NOYECsx8bq8RaN8L40S12X9rFqsVLrbV2E8ru8ijL4mZNcRYYSSG5L6jR27wvlalTbzxBRWT1LnAt15AreCmuq/m9tj3yyXMNkX6dASVpw/qxTlgeAwGP26iFe4zgKubmyQXZroK8iIN4/HimRwYaADSeQ4j8QyQ=" - - secure: "UmFds85SDbGAGgayw75iXegyElb68BVjT+rwwaUDtokreSgUytnj6+puFcomYtE5SiHmhZbcDZs2f4jBh0GlmDCULBIsj2i3B+qUdt0S3k6yNUhqEM6FoEmrFeiD0hK3PUW267LJEhZjgQfjkAhRGoF6RpLQFrvZFi9ldbS207c=" - - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready - - LOGS_DIR=/tmp/sulu/logs - - DB=mysql - -before_script: - - mkdir -p $LOGS_DIR - - if [[ "$DB" == "mysql" ]]; then mysql -e "CREATE DATABASE sulu;"; fi - - if [[ "$DB" == "pgsql" ]]; then psql -c "CREATE DATABASE sulu;" -U postgres; fi - - cp app/Resources/pages/default.xml.dist app/Resources/pages/default.xml - - cp app/Resources/pages/overview.xml.dist app/Resources/pages/overview.xml - - cp app/Resources/snippets/default.xml.dist app/Resources/snippets/default.xml - - cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml - - ./tests/sauce/connect_setup.sh - - composer self-update - - composer update --prefer-dist --no-interaction - - php app/console sulu:build dev --no-interaction - - php app/console server:run 0.0.0.0:8000 --router=app/config/router_admin.php --env prod > /dev/null 2>&1 & - - ./tests/sauce/connect_block.sh + global: + - secure: "Uft74EqqtZ2NOYECsx8bq8RaN8L40S12X9rFqsVLrbV2E8ru8ijL4mZNcRYYSSG5L6jR27wvlalTbzxBRWT1LnAt15AreCmuq/m9tj3yyXMNkX6dASVpw/qxTlgeAwGP26iFe4zgKubmyQXZroK8iIN4/HimRwYaADSeQ4j8QyQ=" + - secure: "UmFds85SDbGAGgayw75iXegyElb68BVjT+rwwaUDtokreSgUytnj6+puFcomYtE5SiHmhZbcDZs2f4jBh0GlmDCULBIsj2i3B+qUdt0S3k6yNUhqEM6FoEmrFeiD0hK3PUW267LJEhZjgQfjkAhRGoF6RpLQFrvZFi9ldbS207c=" + - SAUCE_CONNECT_READY_FILE=/tmp/sauce-connect-ready + - LOGS_DIR=/tmp/sulu/logs + - DB=mysql + - BEHAT_PROFILE=sauce_labs + matrix: + - BEHAT_SUITES="admin contact" + - BEHAT_SUITES="content core location" + - BEHAT_SUITES="media security snippet tag" + - BEHAT_SUITES="category" + +script: ./tests/runtests.sh -script: bin/paratest -p 2 -f +php: + - 5.6 -matrix: - allow_failures: - - php: hhvm +before_script: ./tests/beforetests.sh after_script: - - ./tests/travis_print_logs.sh - + - cat /tmp/http_log diff --git a/CHANGELOG.md b/CHANGELOG.md index 0ee731c0ef..7b9ba678c6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,52 @@ CHANGELOG for Sulu CMF ====================== +* 0.15.0 + * FEATURE #405 [sulu-standard] Inclusion of PHPCR-Shell as a dev dependency + * ENHANCEMENT #401 [sulu-standard] Using the SYMONY_ENV environment variable instead of APP_ENV + * BUGFIX #829 [ContactBundle] Account-Contacts: show full-name of contact + * ENHANCEMENT #828 [ContactBundle] Changed columns for contact list and made concatenated columns not sortable + * BUGFIX #825 [WebsiteBundle] Fixed syntax error in ExceptionController + * FEATURE #806 [SnippetBundle] added sorting feature to snippet content type + * FEATURE #806 [ContentBundle] added sorting feature to internal links content type + * ENHANCEMENT #798 [All] Updated Symfony version to 2.6 + * BUGFIX #826 [All] Moved locales config from admin-bundle to core-bundle + * BUGFIX #736 [WebsiteBundle] Redirect with port didn't work + * ENHANCEMENT #735 [CategoryBundle] Use parameters instead of FCQN of entities in service config + * ENHANCEMENT #735 [MediaBundle] Use parameters instead of FCQN of entities in service config + * ENHANCEMENT #735 [TagBundle] Use parameters instead of FCQN of entities in service config + * FEATURE #792 [ContactBundle] added widget to show all companys of contact + * FEATURE #820 [ContactBundle] Contact-Import: define multiple tags: 'account_tag1 ..n' + * FEATURE #810 [ContactBundle] added command line tool for detecting missing country codes in import csv files + that uses google geo api for finding the correct country code + * BUGFIX #801 [All] Removed unused clean task which is deleting the public directory when executed + due to the symfony 2.6 changes to symlinks + * FEATURE #793 [SecurityBundle] Added field passwordForgetToken to BaseUser-Entity + * FEATURE #793 [ContactBundle] Added Repository service for Contact + * BUGFIX #795 [ContentBundle] Reversed structure paths to enable custom config + * ENHANCEMENT #776 [CoreBundle] Added set title to index page for init webspaces + * BUGFIX #774 [ContentBundle] Enabled save shadow for index pages + * BUGFIX #778 [ContentBundle] Fixed shadow page with internal link and smart-content + * BUGFIX #790 [WebsiteBundle] Fixed twig variables for 404 page + * FEATURE #684 [ContentBundle] Refactored preview to use new websocket component and only one socket for form + and preview + * FEATURE #684 [WebsocketBundle] Implemented Websocket Component to standardize Websocket implementations + * BUGFIX #753 [MediaBundle] Fix 0 bytes file upload + * FEATURE #714 [ContentBundle] Add Option to hide page in sidemap + * ENHANCEMENT #740 [SecurityBundle] Made role content navigation extendable + * FEATURE #569 [All] Behat integration - behat features for bundles + * ENHANCEMENT #692 [SecurityBundle] Made user extendable + * ENHANCEMENT #731 [TestBundle] Removed test user + * BUGFIX #671 [MediaBundle] Fixed fileversion update with meta data + * FEATURE #702 [AdminBundle] Added sortings to user settings and changed default url for activities + * BUGFIX #697 [ContactBundle] Set VAT number field optional + * BUGFIX #697 [CoreBundle] Do not try and set the theme when the portal has not been found + * FEATURE #697 [HttpCacheBundle] Refactored HTTP cache, introduced Varnish support. See 38af8da73c929f9f57bb87a8973a1ee55dccee29 + * ENHANCEMENT #777 [ContentBundle] Enable "copy language" on startpage + * FEATURE #722 [ClientBundle] Add Dependency Injection + * ENHANCEMENT #699 [sulu-standard] Add single internal link and checkbox to example + * ENHANCEMENT #404 [AdminBundle] Added config param "sulu_admin.locales" for content locales + * 0.14.2 (2015-02-02) * HOTFIX #781 [CoreBundle] HTTP Cache event listener uses the wrong event name due to recent change diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000000..cf74bde400 --- /dev/null +++ b/LICENSE @@ -0,0 +1,19 @@ +Copyright (c) MassiveArt Webservices GmbH + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is furnished +to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/UPGRADE.md b/UPGRADE.md index 1cdcddcba4..b05ab357ce 100644 --- a/UPGRADE.md +++ b/UPGRADE.md @@ -1,6 +1,74 @@ # Upgrade +## 0.15.0 + +### Sulu Locales +The Sulu Locales are not hardcoded anymore, but configured in the `app/config/config.yml` file: + +```yml +sulu_core: + locales: ["de","en"] +``` + +You have to add the locales to your configuration, otherwise Sulu will stop working. + +### Internal Links + +The internal representation of the internal links have changed, you have to run the following command to convert them: + +```bash +app/console sulu:upgrade:0.15.0:internal-links +``` + +### Websocket Component + +Websocket start command changed to `app/console sulu:websocket:run`. If you use xdebug on your server please start +websockets with `app/console sulu:websocket:run -e prod`. + +Rename the parameters `content_preview_port` and `content_preview_url` to `websocket_port` and `websocket_url`. +Additionally remove 'ws://' at front and '/' at end from `websocket_url`. + +Default behavior is that websocket turned of for preview, if you want to use it turn it on in the +`app/config/admin/config.yml` under: + +```yml + sulu_content: + preview: + mode: auto # possibilities [auto, on_request, off] + websocket: false # use websockets for preview, if true it tries to connect to websocket server, + # if that fails it uses ajax as a fallback + delay: 300 # used for the delayed send of changes, lesser delay are more request but less latency +``` + +### HTTP Cache + +The HTTP cache integration has been refactored. The following configuration +must be **removed**: + +````yaml +sulu_core: + # ... + http_cache: + type: symfonyHttpCache +```` + +The Symfony HTTP cache is enabled by default now, so there is no need to do +anything else. See the [HTTP cache +documentation](http://sulu.readthedocs.org/en/latest/reference/bundles/http_cache.html) +for more information. + +### Renamed RequestAnalyzerInterface methods + +The text "Current" has been removed from all of the request analyzer methods. +If you used the request analyzer service then you will probably need to update +your code, see: https://github.com/sulu-cmf/sulu/pull/749/files#diff-23 + +### Environment Variable +We are now using the `SYMFONY_ENV` instead of the `APP_ENV` environment variable. You have to update your +`web/.htaccess` file or your system environment variables. + ## 0.14.0 + * Role name is now unique * check roles and give them unique names * Apply all permissions correctly, otherwise users won't be able to work on snippets, categories or tags anymore diff --git a/app/AbstractKernel.php b/app/AbstractKernel.php index cab6d03372..f42e7323b0 100644 --- a/app/AbstractKernel.php +++ b/app/AbstractKernel.php @@ -52,6 +52,8 @@ public function registerBundles() new Sulu\Bundle\WebsiteBundle\SuluWebsiteBundle(), new Sulu\Bundle\LocationBundle\SuluLocationBundle(), new Sulu\Bundle\SearchBundle\SuluSearchBundle(), + new Sulu\Bundle\HttpCacheBundle\SuluHttpCacheBundle(), + new Sulu\Bundle\WebsocketBundle\SuluWebsocketBundle(), // website new Client\Bundle\WebsiteBundle\ClientWebsiteBundle(), @@ -67,8 +69,11 @@ public function registerBundles() $bundles[] = new Sensio\Bundle\DistributionBundle\SensioDistributionBundle(); $bundles[] = new Sensio\Bundle\GeneratorBundle\SensioGeneratorBundle(); + // debug enhancement $bundles[] = new RaulFraile\Bundle\LadybugBundle\RaulFraileLadybugBundle(); + $bundles[] = new Sulu\Bundle\TestBundle\SuluTestBundle(); + $bundles[] = new Symfony\Bundle\DebugBundle\DebugBundle(); } return $bundles; diff --git a/app/Resources/pages/example.xml.dist b/app/Resources/pages/example.xml.dist index 969d7e6c22..310df7d75e 100644 --- a/app/Resources/pages/example.xml.dist +++ b/app/Resources/pages/example.xml.dist @@ -104,6 +104,20 @@ Time input + + + + Checkbox + Checkbox + + + + + + Einzelner Interner Link + Single Internal links + + diff --git a/app/SymfonyRequirements.php b/app/SymfonyRequirements.php index 0f8999622c..cbcf1c8e3e 100644 --- a/app/SymfonyRequirements.php +++ b/app/SymfonyRequirements.php @@ -41,25 +41,25 @@ class Requirement /** * Constructor that initializes the requirement. * - * @param Boolean $fulfilled Whether the requirement is fulfilled + * @param bool $fulfilled Whether the requirement is fulfilled * @param string $testMessage The message for testing the requirement * @param string $helpHtml The help text formatted in HTML for resolving the problem * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) - * @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement */ public function __construct($fulfilled, $testMessage, $helpHtml, $helpText = null, $optional = false) { - $this->fulfilled = (Boolean) $fulfilled; + $this->fulfilled = (bool) $fulfilled; $this->testMessage = (string) $testMessage; $this->helpHtml = (string) $helpHtml; $this->helpText = null === $helpText ? strip_tags($this->helpHtml) : (string) $helpText; - $this->optional = (Boolean) $optional; + $this->optional = (bool) $optional; } /** * Returns whether the requirement is fulfilled. * - * @return Boolean true if fulfilled, otherwise false + * @return bool true if fulfilled, otherwise false */ public function isFulfilled() { @@ -99,7 +99,7 @@ public function getHelpHtml() /** * Returns whether this is only an optional recommendation and not a mandatory requirement. * - * @return Boolean true if optional, false if mandatory + * @return bool true if optional, false if mandatory */ public function isOptional() { @@ -117,16 +117,16 @@ class PhpIniRequirement extends Requirement /** * Constructor that initializes the requirement. * - * @param string $cfgName The configuration name used for ini_get() - * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) - * @param Boolean $optional Whether this is only an optional recommendation not a mandatory requirement + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string|null $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string|null $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param bool $optional Whether this is only an optional recommendation not a mandatory requirement */ public function __construct($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null, $optional = false) { @@ -193,7 +193,7 @@ public function add(Requirement $requirement) /** * Adds a mandatory requirement. * - * @param Boolean $fulfilled Whether the requirement is fulfilled + * @param bool $fulfilled Whether the requirement is fulfilled * @param string $testMessage The message for testing the requirement * @param string $helpHtml The help text formatted in HTML for resolving the problem * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) @@ -206,7 +206,7 @@ public function addRequirement($fulfilled, $testMessage, $helpHtml, $helpText = /** * Adds an optional recommendation. * - * @param Boolean $fulfilled Whether the recommendation is fulfilled + * @param bool $fulfilled Whether the recommendation is fulfilled * @param string $testMessage The message for testing the recommendation * @param string $helpHtml The help text formatted in HTML for resolving the problem * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) @@ -219,15 +219,15 @@ public function addRecommendation($fulfilled, $testMessage, $helpHtml, $helpText /** * Adds a mandatory requirement in form of a php.ini configuration. * - * @param string $cfgName The configuration name used for ini_get() - * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) */ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) { @@ -237,15 +237,15 @@ public function addPhpIniRequirement($cfgName, $evaluation, $approveCfgAbsence = /** * Adds an optional recommendation in form of a php.ini configuration. * - * @param string $cfgName The configuration name used for ini_get() - * @param Boolean|callback $evaluation Either a Boolean indicating whether the configuration should evaluate to true or false, - or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement - * @param Boolean $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. - This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. - Example: You require a config to be true but PHP later removes this config and defaults it to true internally. - * @param string $testMessage The message for testing the requirement (when null and $evaluation is a Boolean a default message is derived) - * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a Boolean a default help is derived) - * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) + * @param string $cfgName The configuration name used for ini_get() + * @param bool|callback $evaluation Either a boolean indicating whether the configuration should evaluate to true or false, + or a callback function receiving the configuration value as parameter to determine the fulfillment of the requirement + * @param bool $approveCfgAbsence If true the Requirement will be fulfilled even if the configuration option does not exist, i.e. ini_get() returns false. + This is helpful for abandoned configs in later PHP versions or configs of an optional extension, like Suhosin. + Example: You require a config to be true but PHP later removes this config and defaults it to true internally. + * @param string $testMessage The message for testing the requirement (when null and $evaluation is a boolean a default message is derived) + * @param string $helpHtml The help text formatted in HTML for resolving the problem (when null and $evaluation is a boolean a default help is derived) + * @param string|null $helpText The help text (when null, it will be inferred from $helpHtml, i.e. stripped from HTML tags) */ public function addPhpIniRecommendation($cfgName, $evaluation, $approveCfgAbsence = false, $testMessage = null, $helpHtml = null, $helpText = null) { @@ -343,7 +343,7 @@ public function getFailedRecommendations() /** * Returns whether a php.ini configuration is not correct. * - * @return Boolean php.ini configuration problem? + * @return bool php.ini configuration problem? */ public function hasPhpIniConfigIssue() { @@ -405,22 +405,24 @@ public function __construct() $this->addRequirement( is_dir(__DIR__.'/../vendor/composer'), 'Vendor libraries must be installed', - 'Vendor libraries are missing. Install composer following instructions from http://getcomposer.org/. ' . + 'Vendor libraries are missing. Install composer following instructions from http://getcomposer.org/. '. 'Then run "php composer.phar install" to install them.' ); - $baseDir = basename(__DIR__); + $cacheDir = is_dir(__DIR__.'/../var/cache') ? __DIR__.'/../var/cache' : __DIR__.'/cache'; $this->addRequirement( - is_writable(__DIR__.'/cache'), - "$baseDir/cache/ directory must be writable", - "Change the permissions of the \"$baseDir/cache/\" directory so that the web server can write into it." + is_writable($cacheDir), + 'app/cache/ or var/cache/ directory must be writable', + 'Change the permissions of either "app/cache/" or "var/cache/" directory so that the web server can write into it.' ); + $logsDir = is_dir(__DIR__.'/../var/logs') ? __DIR__.'/../var/logs' : __DIR__.'/logs'; + $this->addRequirement( - is_writable(__DIR__.'/logs'), - "$baseDir/logs/ directory must be writable", - "Change the permissions of the \"$baseDir/logs/\" directory so that the web server can write into it." + is_writable($logsDir), + 'app/logs/ or var/logs/ directory must be writable', + 'Change the permissions of either "app/logs/" or "var/logs/" directory so that the web server can write into it.' ); $this->addPhpIniRequirement( @@ -438,8 +440,8 @@ public function __construct() } $this->addRequirement( - isset($timezones[date_default_timezone_get()]), - sprintf('Configured default timezone "%s" must be supported by your installation of PHP', date_default_timezone_get()), + isset($timezones[@date_default_timezone_get()]), + sprintf('Configured default timezone "%s" must be supported by your installation of PHP', @date_default_timezone_get()), 'Your default timezone is not supported by PHP. Check for typos in your php.ini file and have a look at the list of deprecated timezones at http://php.net/manual/en/timezones.others.php.' ); } @@ -528,6 +530,16 @@ function_exists('simplexml_import_dom'), 'Install the PCRE extension (version 8.0+).' ); + if (extension_loaded('mbstring')) { + $this->addPhpIniRequirement( + 'mbstring.func_overload', + create_function('$cfgValue', 'return (int) $cfgValue === 0;'), + true, + 'string functions should not be overloaded', + 'Set "mbstring.func_overload" to 0 in php.ini* to disable function overloading by the mbstring extension.' + ); + } + /* optional recommendations follow */ $this->addRecommendation( @@ -600,6 +612,12 @@ function_exists('utf8_decode'), 'Install and enable the XML extension.' ); + $this->addRecommendation( + function_exists('filter_var'), + 'filter_var() should be available', + 'Install and enable the filter extension.' + ); + if (!defined('PHP_WINDOWS_VERSION_BUILD')) { $this->addRecommendation( function_exists('posix_isatty'), @@ -648,6 +666,8 @@ class_exists('Locale'), || (extension_loaded('apc') && ini_get('apc.enabled')) || + (extension_loaded('Zend Optimizer+') && ini_get('zend_optimizerplus.enable')) + || (extension_loaded('Zend OPcache') && ini_get('opcache.enable')) || (extension_loaded('xcache') && ini_get('xcache.cacher')) @@ -658,9 +678,17 @@ class_exists('Locale'), $this->addRecommendation( $accelerator, 'a PHP accelerator should be installed', - 'Install and enable a PHP accelerator like APC (highly recommended).' + 'Install and/or enable a PHP accelerator (highly recommended).' ); + if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') { + $this->addRecommendation( + $this->getRealpathCacheSize() > 1000, + 'realpath_cache_size should be above 1024 in php.ini', + 'Set "realpath_cache_size" to e.g. "1024" in php.ini* to improve performance on windows.' + ); + } + $this->addPhpIniRecommendation('short_open_tag', false); $this->addPhpIniRecommendation('magic_quotes_gpc', false, true); @@ -678,10 +706,34 @@ class_exists('PDO'), if (class_exists('PDO')) { $drivers = PDO::getAvailableDrivers(); $this->addRecommendation( - count($drivers), + count($drivers) > 0, sprintf('PDO should have some drivers installed (currently available: %s)', count($drivers) ? implode(', ', $drivers) : 'none'), 'Install PDO drivers (mandatory for Doctrine).' ); } } + + /** + * Loads realpath_cache_size from php.ini and converts it to int. + * + * (e.g. 16k is converted to 16384 int) + * + * @return int + */ + protected function getRealpathCacheSize() + { + $size = ini_get('realpath_cache_size'); + $size = trim($size); + $unit = strtolower(substr($size, -1, 1)); + switch ($unit) { + case 'g': + return $size * 1024 * 1024 * 1024; + case 'm': + return $size * 1024 * 1024; + case 'k': + return $size * 1024; + default: + return (int) $size; + } + } } diff --git a/app/autoload.php b/app/autoload.php index c310b39dae..70526bb5e4 100644 --- a/app/autoload.php +++ b/app/autoload.php @@ -4,11 +4,10 @@ use Composer\Autoload\ClassLoader; /** - * @var $loader ClassLoader + * @var ClassLoader $loader */ $loader = require __DIR__.'/../vendor/autoload.php'; AnnotationRegistry::registerLoader(array($loader, 'loadClass')); -AnnotationRegistry::registerFile(__DIR__.'/../vendor/doctrine/phpcr-odm/lib/Doctrine/ODM/PHPCR/Mapping/Annotations/DoctrineAnnotations.php'); return $loader; diff --git a/app/check.php b/app/check.php index 91b826befe..90bad4a718 100644 --- a/app/check.php +++ b/app/check.php @@ -2,61 +2,141 @@ require_once dirname(__FILE__).'/SymfonyRequirements.php'; +$lineSize = 70; $symfonyRequirements = new SymfonyRequirements(); - $iniPath = $symfonyRequirements->getPhpIniConfigPath(); -echo "********************************\n"; -echo "* *\n"; -echo "* Symfony requirements check *\n"; -echo "* *\n"; -echo "********************************\n\n"; - -echo $iniPath ? sprintf("* Configuration file used by PHP: %s\n\n", $iniPath) : "* WARNING: No configuration file (php.ini) used by PHP!\n\n"; +echo_title('Symfony2 Requirements Checker'); -echo "** ATTENTION **\n"; -echo "* The PHP CLI can use a different php.ini file\n"; -echo "* than the one used with your web server.\n"; -if ('\\' == DIRECTORY_SEPARATOR) { - echo "* (especially on the Windows platform)\n"; +echo '> PHP is using the following php.ini file:'.PHP_EOL; +if ($iniPath) { + echo_style('green', ' '.$iniPath); +} else { + echo_style('warning', ' WARNING: No configuration file (php.ini) used by PHP!'); } -echo "* To be on the safe side, please also launch the requirements check\n"; -echo "* from your web server using the web/config.php script.\n"; -echo_title('Mandatory requirements'); +echo PHP_EOL.PHP_EOL; + +echo '> Checking Symfony requirements:'.PHP_EOL.' '; -$checkPassed = true; +$messages = array(); foreach ($symfonyRequirements->getRequirements() as $req) { /** @var $req Requirement */ - echo_requirement($req); - if (!$req->isFulfilled()) { - $checkPassed = false; + if ($helpText = get_error_message($req, $lineSize)) { + echo_style('red', 'E'); + $messages['error'][] = $helpText; + } else { + echo_style('green', '.'); } } -echo_title('Optional recommendations'); +$checkPassed = empty($messages['error']); foreach ($symfonyRequirements->getRecommendations() as $req) { - echo_requirement($req); + if ($helpText = get_error_message($req, $lineSize)) { + echo_style('yellow', 'W'); + $messages['warning'][] = $helpText; + } else { + echo_style('green', '.'); + } +} + +if ($checkPassed) { + echo_block('success', 'OK', 'Your system is ready to run Symfony2 projects', true); +} else { + echo_block('error', 'ERROR', 'Your system is not ready to run Symfony2 projects', true); + + echo_title('Fix the following mandatory requirements', 'red'); + + foreach ($messages['error'] as $helpText) { + echo ' * '.$helpText.PHP_EOL; + } } +if (!empty($messages['warning'])) { + echo_title('Optional recommendations to improve your setup', 'yellow'); + + foreach ($messages['warning'] as $helpText) { + echo ' * '.$helpText.PHP_EOL; + } +} + +echo PHP_EOL; +echo_style('title', 'Note'); +echo ' The command console could use a different php.ini file'.PHP_EOL; +echo_style('title', '~~~~'); +echo ' than the one used with your web server. To be on the'.PHP_EOL; +echo ' safe side, please check the requirements from your web'.PHP_EOL; +echo ' server using the '; +echo_style('yellow', 'web/config.php'); +echo ' script.'.PHP_EOL; +echo PHP_EOL; + exit($checkPassed ? 0 : 1); -/** - * Prints a Requirement instance - */ -function echo_requirement(Requirement $requirement) +function get_error_message(Requirement $requirement, $lineSize) { - $result = $requirement->isFulfilled() ? 'OK' : ($requirement->isOptional() ? 'WARNING' : 'ERROR'); - echo ' ' . str_pad($result, 9); - echo $requirement->getTestMessage() . "\n"; - - if (!$requirement->isFulfilled()) { - echo sprintf(" %s\n\n", $requirement->getHelpText()); + if ($requirement->isFulfilled()) { + return; } + + $errorMessage = wordwrap($requirement->getTestMessage(), $lineSize - 3, PHP_EOL.' ').PHP_EOL; + $errorMessage .= ' > '.wordwrap($requirement->getHelpText(), $lineSize - 5, PHP_EOL.' > ').PHP_EOL; + + return $errorMessage; } -function echo_title($title) +function echo_title($title, $style = null) { - echo "\n** $title **\n\n"; + $style = $style ?: 'title'; + + echo PHP_EOL; + echo_style($style, $title.PHP_EOL); + echo_style($style, str_repeat('~', strlen($title)).PHP_EOL); + echo PHP_EOL; +} + +function echo_style($style, $message) +{ + // ANSI color codes + $styles = array( + 'reset' => "\033[0m", + 'red' => "\033[31m", + 'green' => "\033[32m", + 'yellow' => "\033[33m", + 'error' => "\033[37;41m", + 'success' => "\033[37;42m", + 'title' => "\033[34m", + ); + $supports = has_color_support(); + + echo($supports ? $styles[$style] : '').$message.($supports ? $styles['reset'] : ''); +} + +function echo_block($style, $title, $message) +{ + $message = ' '.trim($message).' '; + $width = strlen($message); + + echo PHP_EOL.PHP_EOL; + + echo_style($style, str_repeat(' ', $width).PHP_EOL); + echo_style($style, str_pad(' ['.$title.']', $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_pad($message, $width, ' ', STR_PAD_RIGHT).PHP_EOL); + echo_style($style, str_repeat(' ', $width).PHP_EOL); +} + +function has_color_support() +{ + static $support; + + if (null === $support) { + if (DIRECTORY_SEPARATOR == '\\') { + $support = false !== getenv('ANSICON') || 'ON' === getenv('ConEmuANSI'); + } else { + $support = function_exists('posix_isatty') && @posix_isatty(STDOUT); + } + } + + return $support; } diff --git a/app/config/admin/config.yml b/app/config/admin/config.yml index d4d8896027..8041085585 100644 --- a/app/config/admin/config.yml +++ b/app/config/admin/config.yml @@ -26,14 +26,14 @@ doctrine: string_functions: CAST: Sulu\Component\Rest\DQL\Cast +# SULU Content Configuration sulu_content: preview: - fallback: - interval: %content_fallback_intervall% - websocket: - url: %content_preview_url% - port: %content_preview_port% + mode: auto + websocket: false + delay: 200 +# SULU Admin Configuration sulu_admin: name: SULU 2.0 @@ -42,6 +42,7 @@ sulu_admin: parameters: jms_serializer.cache_naming_strategy.class: JMS\Serializer\Naming\IdenticalPropertyNamingStrategy +# SULU Contact Configuration # define the account types and form of address # tabs key must match tab-id specified in content-navigation sulu_contact: @@ -85,6 +86,7 @@ sulu_contact: name: female translation: contact.contacts.formOfAddress.female +# Massive Build Configuration massive_build: targets: prod: diff --git a/app/config/admin/config_dev.yml b/app/config/admin/config_dev.yml index 131539b37a..e46e0775a8 100644 --- a/app/config/admin/config_dev.yml +++ b/app/config/admin/config_dev.yml @@ -14,15 +14,32 @@ web_profiler: monolog: handlers: main: - type: stream - path: %kernel.logs_dir%/%kernel.environment%.log - level: debug - firephp: - type: firephp - level: info - chromephp: - type: chromephp - level: info + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + console: + type: console + bubble: false + verbosity_levels: + VERBOSITY_VERBOSE: INFO + VERBOSITY_VERY_VERBOSE: DEBUG + channels: ["!doctrine"] + console_very_verbose: + type: console + bubble: false + verbosity_levels: + VERBOSITY_VERBOSE: NOTICE + VERBOSITY_VERY_VERBOSE: NOTICE + VERBOSITY_DEBUG: DEBUG + channels: ["doctrine"] + # uncomment to get logging in your browser + # you may have to allow bigger header sizes in your Web server configuration + #firephp: + # type: firephp + # level: info + #chromephp: + # type: chromephp + # level: info assetic: use_controller: true diff --git a/app/config/admin/config_prod.yml b/app/config/admin/config_prod.yml index e125e75258..342837a031 100644 --- a/app/config/admin/config_prod.yml +++ b/app/config/admin/config_prod.yml @@ -19,5 +19,7 @@ monolog: handler: nested nested: type: stream - path: %kernel.logs_dir%/%kernel.environment%.log + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug + console: + type: console diff --git a/app/config/admin/config_prod_test.yml b/app/config/admin/config_prod_test.yml new file mode 100644 index 0000000000..d6d5bf034a --- /dev/null +++ b/app/config/admin/config_prod_test.yml @@ -0,0 +1,3 @@ +imports: + - { resource: config_prod.yml } + diff --git a/app/config/admin/routing.yml b/app/config/admin/routing.yml index f41d001f39..1d3677be3f 100644 --- a/app/config/admin/routing.yml +++ b/app/config/admin/routing.yml @@ -74,6 +74,11 @@ sulu_website: resource: "@SuluWebsiteBundle/Resources/config/routing.yml" prefix: /admin/website +sulu_websocket: + type: rest + resource: "@SuluWebsocketBundle/Resources/config/routing.yml" + prefix: /admin/websocket + sulu_core: type: rest resource: "@SuluCoreBundle/Resources/config/routing_api.xml" diff --git a/app/config/config.yml b/app/config/config.yml index b5fde47498..2dc2a5d83a 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -4,61 +4,69 @@ imports: framework: #esi: ~ - translator: { fallback: %locale% } - secret: %secret% + translator: { fallback: "%locale%" } + secret: "%secret%" form: ~ csrf_protection: ~ validation: { enable_annotations: true } templating: engines: ['twig'] #assets_version: SomeVersionScheme - default_locale: %locale% + default_locale: "%locale%" + trusted_hosts: ~ trusted_proxies: ~ - session: ~ + session: + # handler_id set to null will use default session handler from php.ini + handler_id: ~ fragments: ~ + http_method_override: true # Twig Configuration twig: - debug: %kernel.debug% - strict_variables: %kernel.debug% + debug: "%kernel.debug%" + strict_variables: "%kernel.debug%" # Assetic Configuration assetic: - debug: %kernel.debug% + debug: "%kernel.debug%" use_controller: false write_to: "%kernel.root_dir%/../web" - #bundles: [] + #bundles: [ ] #java: /usr/bin/java filters: - cssrewrite: ~ + cssrewrite: + apply_to: '\.(css)$' #closure: - # jar: %kernel.root_dir%/Resources/java/compiler.jar + # jar: "%kernel.root_dir%/Resources/java/compiler.jar" #yui_css: - # jar: %kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar + # jar: "%kernel.root_dir%/Resources/java/yuicompressor-2.4.7.jar" # Doctrine Configuration doctrine: dbal: - driver: %database_driver% - host: %database_host% - port: %database_port% - dbname: %database_name% - user: %database_user% - password: %database_password% + driver: "%database_driver%" + host: "%database_host%" + port: "%database_port%" + dbname: "%database_name%" + user: "%database_user%" + password: "%database_password%" charset: UTF8 - # if using pdo_sqlite as your database driver, add the path in parameters.yml - # e.g. database_path: %kernel.root_dir%/data/data.db3 - # path: %database_path% + # if using pdo_sqlite as your database driver: + # 1. add the path in parameters.yml + # e.g. database_path: "%kernel.root_dir%/data/data.db3" + # 2. Uncomment database_path in parameters.yml.dist + # 3. Uncomment next line: + # path: "%database_path%" orm: - auto_generate_proxy_classes: %kernel.debug% + auto_generate_proxy_classes: "%kernel.debug%" auto_mapping: true mappings: gedmo_tree: - type: xml - prefix: Gedmo\Tree\Entity + type: "xml" + prefix: "Gedmo\Tree\Entity" dir: "%kernel.root_dir%/../vendor/gedmo/doctrine-extensions/lib/Gedmo/Tree/Entity" - alias: GedmoTree # this one is optional and will default to the name set for the mapping + alias: "GedmoTree" # this one is optional and will default to the name set for the mapping is_bundle: false resolve_target_entities: Sulu\Component\Security\UserInterface: Sulu\Bundle\SecurityBundle\Entity\User @@ -66,6 +74,7 @@ doctrine: Sulu\Bundle\SecurityBundle\Entity\RoleInterface: Sulu\Bundle\SecurityBundle\Entity\Role Sulu\Bundle\MediaBundle\Entity\CollectionInterface: Sulu\Bundle\MediaBundle\Entity\Collection +# Doctrine Extension Configuration stof_doctrine_extensions: orm: default: @@ -73,58 +82,82 @@ stof_doctrine_extensions: # Swiftmailer Configuration swiftmailer: - transport: %mailer_transport% - host: %mailer_host% - username: %mailer_user% - password: %mailer_password% + transport: "%mailer_transport%" + host: "%mailer_host%" + username: "%mailer_user%" + password: "%mailer_password%" spool: { type: memory } +# FOS REST Configuration fos_rest: routing_loader: - default_format: json + default_format: "json" +# LIIP Theme Configuration liip_theme: themes: ["default"] active_theme: "default" load_controllers: false +# SULU Core Configuration sulu_core: + locales: ["de","en"] phpcr: - backend: %phpcr_backend% - workspace: %phpcr_workspace% - username: %phpcr_user% - password: %phpcr_pass% + backend: "%phpcr_backend%" + workspace: "%phpcr_workspace%" + username: "%phpcr_user%" + password: "%phpcr_pass%" webspace: - config_dir: %kernel.root_dir%/Resources/webspaces + config_dir: "%kernel.root_dir%/Resources/webspaces" content: structure: default_type: - snippet: default - page: default + snippet: "default" + page: "default" paths: app_page: path: "%kernel.root_dir%/Resources/pages" internal: false - type: page + type: "page" app_snippet: path: "%kernel.root_dir%/Resources/snippets" internal: false - type: snippet + type: "snippet" sulu: path: "%kernel.root_dir%/../vendor/sulu/sulu/src/Sulu/Bundle/CoreBundle/Content/templates" internal: true - type: page - http_cache: - ~ + type: "page" +# SULU Media configuration sulu_media: search: enabled: true ghost_script: - path: %ghost_script_path% + path: "%ghost_script_path%" format_manager: - response_headers: %format_manager.response_headers% + response_headers: "%format_manager.response_headers%" +sulu_websocket: + server: + http_host: %websocket_url% + port: %websocket_port% + +# Symfony CMF Configuration cmf_core: publish_workflow: enabled: false + +sulu_http_cache: + handlers: + paths: + enabled: true + public: + max_age: 240 + shared_max_age: 240 + use_page_ttl: true + enabled: true + debug: + enabled: %kernel.debug% + proxy_client: + symfony: + enabled: true diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index 7d398a617c..94745bf813 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist @@ -15,9 +15,8 @@ parameters: secret: ThisTokenIsNotSoSecretChangeIt sulu_admin.name: SULU 2 - content_fallback_intervall: 5000 - content_preview_port: 9876 - content_preview_url: ws://sulu.lo + websocket_port: 9876 + websocket_url: 'sulu.lo' ghost_script_path: /usr/bin/gs # OSX: /usr/local/bin/gs or Ubuntu: /usr/bin/gs format_manager.response_headers: diff --git a/app/config/website/config.yml b/app/config/website/config.yml index 18a1876388..2de666eeb2 100644 --- a/app/config/website/config.yml +++ b/app/config/website/config.yml @@ -9,6 +9,7 @@ framework: session: save_path: "%kernel.cache_dir%/../../sessions/website/%kernel.environment%" +# Twig Configuration twig: exception_controller: sulu_website.exception.controller:showAction @@ -16,6 +17,7 @@ twig: assetic: bundles: [ ClientWebsiteBundle ] +# Symfony CMF Configuration cmf_routing: chain: routers_by_id: diff --git a/app/config/website/config_dev.yml b/app/config/website/config_dev.yml index 0dbeafd325..a496650572 100644 --- a/app/config/website/config_dev.yml +++ b/app/config/website/config_dev.yml @@ -14,15 +14,32 @@ web_profiler: monolog: handlers: main: - type: stream - path: %kernel.logs_dir%/%kernel.environment%.log - level: debug - firephp: - type: firephp - level: info - chromephp: - type: chromephp - level: info + type: stream + path: "%kernel.logs_dir%/%kernel.environment%.log" + level: debug + console: + type: console + bubble: false + verbosity_levels: + VERBOSITY_VERBOSE: INFO + VERBOSITY_VERY_VERBOSE: DEBUG + channels: ["!doctrine"] + console_very_verbose: + type: console + bubble: false + verbosity_levels: + VERBOSITY_VERBOSE: NOTICE + VERBOSITY_VERY_VERBOSE: NOTICE + VERBOSITY_DEBUG: DEBUG + channels: ["doctrine"] + # uncomment to get logging in your browser + # you may have to allow bigger header sizes in your Web server configuration + #firephp: + # type: firephp + # level: info + #chromephp: + # type: chromephp + # level: info assetic: use_controller: true diff --git a/app/config/website/config_prod.yml b/app/config/website/config_prod.yml index e125e75258..342837a031 100644 --- a/app/config/website/config_prod.yml +++ b/app/config/website/config_prod.yml @@ -19,5 +19,7 @@ monolog: handler: nested nested: type: stream - path: %kernel.logs_dir%/%kernel.environment%.log + path: "%kernel.logs_dir%/%kernel.environment%.log" level: debug + console: + type: console diff --git a/app/console b/app/console index f6f9e09cce..418c4f9cd3 100755 --- a/app/console +++ b/app/console @@ -16,7 +16,7 @@ use Symfony\Component\Debug\Debug; $input = new ArgvInput(); $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env == 'dev'; +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; if ($debug) { Debug::enable(); @@ -25,9 +25,3 @@ if ($debug) { $kernel = new AdminKernel($env, $debug); $application = new Application($kernel); $application->run($input); - -// register all commands available by our bundles -$adminPool = $kernel->getContainer()->get('sulu_admin.admin_pool'); -foreach ($adminPool->getCommands() as $command) { - $application->add($command); -} diff --git a/app/phpunit.xml.dist b/app/phpunit.xml.dist index da2dc8702a..38ca0ccdbb 100644 --- a/app/phpunit.xml.dist +++ b/app/phpunit.xml.dist @@ -1,41 +1,35 @@ - - - + + - ../../src/*/*Bundle/Tests - ../../src/*/Bundle/*Bundle/Tests + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Tests + ../src/*Bundle/Tests - ../../src + ../src - ../../src/*/*Bundle/Resources - ../../src/*/*Bundle/Tests - ../../src/*/Bundle/*Bundle/Resources - ../../src/*/Bundle/*Bundle/Tests + ../src/*/*Bundle/Resources + ../src/*/*Bundle/Tests + ../src/*/Bundle/*Bundle/Resources + ../src/*/Bundle/*Bundle/Tests - diff --git a/app/webconsole b/app/webconsole index a22c25287f..f28327aa5f 100755 --- a/app/webconsole +++ b/app/webconsole @@ -16,7 +16,7 @@ use Symfony\Component\Debug\Debug; $input = new ArgvInput(); $env = $input->getParameterOption(array('--env', '-e'), getenv('SYMFONY_ENV') ?: 'dev'); -$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env == 'dev'; +$debug = getenv('SYMFONY_DEBUG') !== '0' && !$input->hasParameterOption(array('--no-debug', '')) && $env !== 'prod'; if ($debug) { Debug::enable(); @@ -25,9 +25,3 @@ if ($debug) { $kernel = new WebsiteKernel($env, $debug); $application = new Application($kernel); $application->run($input); - -// register all commands available by our bundles -$adminPool = $kernel->getContainer()->get('sulu_admin.admin_pool'); -foreach ($adminPool->getCommands() as $command) { - $application->add($command); -} diff --git a/behat.yml b/behat.yml new file mode 100644 index 0000000000..9bb616ad42 --- /dev/null +++ b/behat.yml @@ -0,0 +1,146 @@ +default: + suites: + admin: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + bundle: SuluAdminBundle + category: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\CategoryBundle\Behat\CategoryContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + bundle: SuluCategoryBundle + contact: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContactBundle\Behat\ContactContext + bundle: SuluContactBundle + content: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + bundle: SuluContentBundle + core: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + bundle: SuluCoreBundle + location: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + bundle: SuluLocationBundle + media: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + - Sulu\Bundle\MediaBundle\Behat\MediaContext + bundle: SuluMediaBundle + security: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + bundle: SuluSecurityBundle + snippet: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + - Sulu\Bundle\SnippetBundle\Behat\SnippetContext + bundle: SuluSnippetBundle + tag: + type: symfony_bundle + contexts: + - Behat\MinkExtension\Context\MinkContext + - Sulu\Bundle\TestBundle\Behat\DefaultContext + - Sulu\Bundle\SecurityBundle\Behat\SecurityContext + - Sulu\Bundle\AdminBundle\Behat\AdminContext + - Sulu\Bundle\SnippetBundle\Behat\SnippetContext + - Sulu\Bundle\ContentBundle\Behat\ContentContext + - Sulu\Bundle\TagBundle\Behat\TagContext + bundle: SuluTagBundle + extensions: + Behat\Symfony2Extension: + kernel: + path: app/AdminKernel.php + class: AdminKernel + env: dev + context: + path_suffix: Tests/Features + +selenium: + extensions: + Behat\MinkExtension: + base_url: 'http://127.0.0.1:8001' + sessions: + default: + selenium2: ~ + +sauce_labs: + extensions: + Behat\MinkExtension: + base_url: 'http://127.0.0.1:8080/' + sessions: + default: + sauce_labs: + capabilities: + selenium-version: 2.44.0 + version: 34 + browser: Firefox + platform: "Linux" + max-duration: 3600 + record-screenshots: true + custom-data: + foo: bar + +sauce_labs_local: + extensions: + Behat\MinkExtension: + base_url: 'http://127.0.0.1:8001/' + sessions: + default: + sauce_labs: + capabilities: + selenium-version: 2.44.0 + version: 34 + browser: Firefox + platform: "Linux" + max-duration: 3600 + record-screenshots: true + custom-data: + foo: bar diff --git a/composer.json b/composer.json index 975ab246bd..312f0bbe83 100644 --- a/composer.json +++ b/composer.json @@ -3,25 +3,23 @@ "license": "MIT", "type": "project", "description": "The sulu content management framework", - "version": "0.14.2", + "version": "0.15.0", "autoload": { "psr-0": { "": "src/" } }, "require": { - "php": ">=5.3.3", - "symfony/symfony": "2.5.*", - "twig/extensions": "1.0.*", - "symfony/assetic-bundle": "2.3.*", - "symfony/swiftmailer-bundle": "2.3.*", - "symfony/monolog-bundle": "2.4.*", - "sensio/distribution-bundle": "2.3.*", - "sensio/framework-extra-bundle": "3.0.*", - "sensio/generator-bundle": "2.3.*", + "php": ">=5.5", + "symfony/symfony": "2.6.*", + "twig/extensions": "~1.0", + "symfony/assetic-bundle": "~2.3", + "symfony/swiftmailer-bundle": "~2.3", + "symfony/monolog-bundle": "~2.4", + "sensio/distribution-bundle": "~3.0", + "sensio/framework-extra-bundle": "~3.0", "incenteev/composer-parameter-handler": "~2.0", - - "sulu/sulu": "0.14.*", + "sulu/sulu": "dev-develop", "symfony-cmf/core-bundle": "1.1.*", "nelmio/alice": "~1.7", @@ -30,12 +28,19 @@ "zendframework/zend-stdlib": "~2.3", "zendframework/zendsearch": "@dev", - "massive/build-bundle": "0.2.*" + "massive/build-bundle": "0.2.*", + "behat/behat": "~3.0.0", + "behat/mink-extension": "~2.0@dev", + "behat/mink-selenium2-driver": "~1.2@dev", + "behat/symfony2-extension": "~2.0@dev" + }, "require-dev": { - "sauce/sausage": "0.9.*", + "sensio/generator-bundle": "~2.3", "jackalope/jackalope-doctrine-dbal": "1.1.*", - "raulfraile/ladybug-bundle": "1.0.*" + "raulfraile/ladybug-bundle": "1.0.*", + "sauce/sausage": "0.9.*", + "phpcr/phpcr-shell": "@beta" }, "scripts": { "post-install-cmd": [ @@ -61,9 +66,10 @@ "extra": { "symfony-app-dir": "app", "symfony-web-dir": "web", + "symfony-assets-install": "relative", "incenteev-parameters": [ - { "file": "app/config/parameters.yml" }, - { "file": "app/config/phpcr.yml" } + {"file": "app/config/parameters.yml"}, + {"file": "app/config/phpcr.yml"} ] } } diff --git a/composer.lock b/composer.lock index 1785b0ca4e..ae8a4e1db5 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,419 @@ "Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "a9c791a58f4194da6ec174379405a7cf", + "hash": "8cc420e0f42cffd5aef5b4267006eb3f", "packages": [ + { + "name": "behat/behat", + "version": "v3.0.14", + "source": { + "type": "git", + "url": "https://github.com/Behat/Behat.git", + "reference": "3f097cd577feed73e681fa56cd4e4e1dda9c115d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Behat/zipball/3f097cd577feed73e681fa56cd4e4e1dda9c115d", + "reference": "3f097cd577feed73e681fa56cd4e4e1dda9c115d", + "shasum": "" + }, + "require": { + "behat/gherkin": "~4.3", + "behat/transliterator": "~1.0", + "ext-mbstring": "*", + "php": ">=5.3.3", + "symfony/class-loader": "~2.1", + "symfony/config": "~2.3", + "symfony/console": "~2.1", + "symfony/dependency-injection": "~2.1", + "symfony/event-dispatcher": "~2.1", + "symfony/translation": "~2.1", + "symfony/yaml": "~2.1" + }, + "require-dev": { + "phpspec/prophecy-phpunit": "~1.0", + "phpunit/phpunit": "~4.0.7", + "symfony/process": "~2.1" + }, + "suggest": { + "behat/mink-extension": "for integration with Mink testing framework", + "behat/symfony2-extension": "for integration with Symfony2 web framework", + "behat/yii-extension": "for integration with Yii web framework" + }, + "bin": [ + "bin/behat" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Behat": "src/", + "Behat\\Testwork": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Scenario-oriented BDD framework for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "Agile", + "BDD", + "ScenarioBDD", + "Scrum", + "StoryBDD", + "User story", + "business", + "development", + "documentation", + "examples", + "symfony", + "testing" + ], + "time": "2014-09-23 10:47:14" + }, + { + "name": "behat/gherkin", + "version": "v4.3.0", + "source": { + "type": "git", + "url": "https://github.com/Behat/Gherkin.git", + "reference": "43777c51058b77bcd84a8775b7a6ad05e986b5db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/43777c51058b77bcd84a8775b7a6ad05e986b5db", + "reference": "43777c51058b77bcd84a8775b7a6ad05e986b5db", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.0", + "symfony/yaml": "~2.1" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.2-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2014-06-06 01:24:32" + }, + { + "name": "behat/mink", + "version": "v1.6.1", + "source": { + "type": "git", + "url": "https://github.com/minkphp/Mink.git", + "reference": "8b68523a339ec991bcd638b39dc8f04f808da88a" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/Mink/zipball/8b68523a339ec991bcd638b39dc8f04f808da88a", + "reference": "8b68523a339ec991bcd638b39dc8f04f808da88a", + "shasum": "" + }, + "require": { + "php": ">=5.3.1", + "symfony/css-selector": "~2.0" + }, + "suggest": { + "behat/mink-browserkit-driver": "extremely fast headless driver for Symfony\\Kernel-based apps (Sf2, Silex)", + "behat/mink-goutte-driver": "fast headless driver for any app without JS emulation", + "behat/mink-selenium2-driver": "slow, but JS-enabled driver for any app (requires Selenium2)", + "behat/mink-zombie-driver": "fast and JS-enabled headless driver for any app (requires node.js)" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Behat\\Mink\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Browser controller/emulator abstraction for PHP", + "homepage": "http://mink.behat.org/", + "keywords": [ + "browser", + "testing", + "web" + ], + "time": "2015-02-04 17:02:06" + }, + { + "name": "behat/mink-extension", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Behat/MinkExtension.git", + "reference": "ba5329be65a816adfc2d9ba9b639a92f548371da" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/MinkExtension/zipball/ba5329be65a816adfc2d9ba9b639a92f548371da", + "reference": "ba5329be65a816adfc2d9ba9b639a92f548371da", + "shasum": "" + }, + "require": { + "behat/behat": "~3.0,>=3.0.5", + "behat/mink": "~1.5", + "php": ">=5.3.2", + "symfony/config": "~2.2" + }, + "require-dev": { + "behat/mink-goutte-driver": "~1.1@dev", + "phpspec/phpspec": "~2.0" + }, + "type": "behat-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\MinkExtension": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + }, + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com" + } + ], + "description": "Mink extension for Behat", + "homepage": "http://extensions.behat.org/mink", + "keywords": [ + "browser", + "gui", + "test", + "web" + ], + "time": "2015-01-23 00:01:18" + }, + { + "name": "behat/mink-selenium2-driver", + "version": "v1.2.0", + "source": { + "type": "git", + "url": "https://github.com/minkphp/MinkSelenium2Driver.git", + "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/minkphp/MinkSelenium2Driver/zipball/8018fee80bf6573f909ece3e0dfc07d0eb352210", + "reference": "8018fee80bf6573f909ece3e0dfc07d0eb352210", + "shasum": "" + }, + "require": { + "behat/mink": "~1.6@dev", + "instaclick/php-webdriver": "~1.1", + "php": ">=5.3.1" + }, + "type": "mink-driver", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Mink\\Driver": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Pete Otaqui", + "email": "pete@otaqui.com", + "homepage": "https://github.com/pete-otaqui" + } + ], + "description": "Selenium2 (WebDriver) driver for Mink framework", + "homepage": "http://mink.behat.org/", + "keywords": [ + "ajax", + "browser", + "javascript", + "selenium", + "testing", + "webdriver" + ], + "time": "2014-09-29 13:12:12" + }, + { + "name": "behat/symfony2-extension", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Behat/Symfony2Extension.git", + "reference": "8e6b763438cb8ba221262aa85ae6ee6276e29351" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Symfony2Extension/zipball/8e6b763438cb8ba221262aa85ae6ee6276e29351", + "reference": "8e6b763438cb8ba221262aa85ae6ee6276e29351", + "shasum": "" + }, + "require": { + "behat/behat": "~3.0,>=3.0.4", + "php": ">=5.3.3", + "symfony/framework-bundle": "~2.0" + }, + "require-dev": { + "behat/mink-browserkit-driver": "~1.0", + "behat/mink-extension": "~2.0@dev", + "phpspec/phpspec": "~2.0", + "phpunit/phpunit": "~4.0", + "symfony/symfony": "~2.1" + }, + "type": "behat-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Symfony2Extension": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Christophe Coevoet", + "email": "stof@notk.org" + }, + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com" + } + ], + "description": "Symfony2 framework extension for Behat", + "homepage": "http://behat.org", + "keywords": [ + "BDD", + "framework", + "symfony" + ], + "time": "2015-01-19 00:35:27" + }, + { + "name": "behat/transliterator", + "version": "v1.0.1", + "source": { + "type": "git", + "url": "https://github.com/Behat/Transliterator.git", + "reference": "c93521d3462a554332d1ef5bb0e9b5b8ca4106c4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Transliterator/zipball/c93521d3462a554332d1ef5bb0e9b5b8ca4106c4", + "reference": "c93521d3462a554332d1ef5bb0e9b5b8ca4106c4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Transliterator": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Artistic-1.0" + ], + "description": "String transliterator", + "keywords": [ + "i18n", + "slug", + "transliterator" + ], + "time": "2014-05-15 22:08:22" + }, { "name": "cboden/ratchet", "version": "v0.3.2", @@ -939,16 +1350,16 @@ }, { "name": "doctrine/phpcr-bundle", - "version": "1.2.1", + "version": "1.2.3", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrinePHPCRBundle.git", - "reference": "1a4fc663f36a8c09e455e8f79692b47d7c18d669" + "reference": "23a49602c0b80fb7ec44f3b78b475ba703046555" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/1a4fc663f36a8c09e455e8f79692b47d7c18d669", - "reference": "1a4fc663f36a8c09e455e8f79692b47d7c18d669", + "url": "https://api.github.com/repos/doctrine/DoctrinePHPCRBundle/zipball/23a49602c0b80fb7ec44f3b78b475ba703046555", + "reference": "23a49602c0b80fb7ec44f3b78b475ba703046555", "shasum": "" }, "require": { @@ -958,6 +1369,9 @@ "symfony/doctrine-bridge": "~2.3", "symfony/framework-bundle": "~2.3" }, + "conflict": { + "phpcr/phpcr-shell": "<1.0.0-beta1" + }, "require-dev": { "doctrine/phpcr-odm": "~1.1", "jackalope/jackalope-jackrabbit": "~1.1.0", @@ -1007,7 +1421,7 @@ "persistence", "phpcr" ], - "time": "2014-10-25 14:49:36" + "time": "2015-02-04 17:33:05" }, { "name": "doctrine/phpcr-odm", @@ -1201,22 +1615,22 @@ }, { "name": "friendsofsymfony/rest-bundle", - "version": "1.4.2", + "version": "1.5.2", "target-dir": "FOS/RestBundle", "source": { "type": "git", "url": "https://github.com/FriendsOfSymfony/FOSRestBundle.git", - "reference": "0649a4c1d8cecd27885b09c1cddddb497a0d3ca3" + "reference": "d72f3a41409997ebd91ca34561075c615d2ddcc0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/0649a4c1d8cecd27885b09c1cddddb497a0d3ca3", - "reference": "0649a4c1d8cecd27885b09c1cddddb497a0d3ca3", + "url": "https://api.github.com/repos/FriendsOfSymfony/FOSRestBundle/zipball/d72f3a41409997ebd91ca34561075c615d2ddcc0", + "reference": "d72f3a41409997ebd91ca34561075c615d2ddcc0", "shasum": "" }, "require": { - "doctrine/inflector": "1.0.*", - "php": ">=5.3.2", + "doctrine/inflector": "~1.0", + "php": ">=5.3.9", "psr/log": "~1.0", "symfony/framework-bundle": "~2.2", "willdurand/jsonp-callback-validator": "~1.0", @@ -1244,7 +1658,7 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "1.5-dev" } }, "autoload": { @@ -1275,7 +1689,7 @@ "keywords": [ "rest" ], - "time": "2014-08-15 12:18:54" + "time": "2015-02-09 12:22:33" }, { "name": "fzaninotto/faker", @@ -1327,35 +1741,33 @@ }, { "name": "gedmo/doctrine-extensions", - "version": "v2.3.9", + "version": "v2.3.11", "source": { "type": "git", "url": "https://github.com/Atlantic18/DoctrineExtensions.git", - "reference": "35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54" + "reference": "5e19886a64ef7e3540bb362eacfdf7d60c5608e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54", - "reference": "35adcaae1a3f50d0d5b73aa50ed8fd28ee35ce54", + "url": "https://api.github.com/repos/Atlantic18/DoctrineExtensions/zipball/5e19886a64ef7e3540bb362eacfdf7d60c5608e6", + "reference": "5e19886a64ef7e3540bb362eacfdf7d60c5608e6", "shasum": "" }, "require": { - "doctrine/common": ">=2.2,<2.5-dev", + "behat/transliterator": "~1.0", + "doctrine/common": "~2.4", "php": ">=5.3.2" }, "require-dev": { - "doctrine/common": ">=2.4.0-RC3", - "doctrine/dbal": ">=2.4.0-RC1", - "doctrine/mongodb": ">=1.0.3", - "doctrine/mongodb-odm": ">=1.0.0-BETA9", - "doctrine/orm": ">=2.4.0-RC1", - "symfony/yaml": "2.3.1" + "doctrine/mongodb-odm": ">=1.0.0-BETA11", + "doctrine/orm": "~2.4", + "phpunit/phpunit": "~4.4", + "phpunit/phpunit-mock-objects": "~2.3", + "symfony/yaml": "~2.3" }, "suggest": { - "doctrine/dbal": ">=2.3.2", - "doctrine/mongodb": ">=1.0.1", - "doctrine/mongodb-odm": ">=1.0.0-BETA7", - "doctrine/orm": ">=2.3.2" + "doctrine/mongodb-odm": "to use the extensions with the MongoDB ODM", + "doctrine/orm": "to use the extensions with the ORM" }, "type": "library", "extra": { @@ -1403,7 +1815,7 @@ "tree", "uploadable" ], - "time": "2014-01-12 16:34:06" + "time": "2015-01-28 09:12:46" }, { "name": "guzzle/common", @@ -1816,90 +2228,87 @@ "time": "2013-12-07 10:10:39" }, { - "name": "jackalope/jackalope", - "version": "1.1.6", + "name": "instaclick/php-webdriver", + "version": "1.4.1", "source": { "type": "git", - "url": "https://github.com/jackalope/jackalope.git", - "reference": "5aa40c76f1e59e8a3fc3e655806d46d06204f12c" + "url": "https://github.com/instaclick/php-webdriver.git", + "reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope/zipball/5aa40c76f1e59e8a3fc3e655806d46d06204f12c", - "reference": "5aa40c76f1e59e8a3fc3e655806d46d06204f12c", + "url": "https://api.github.com/repos/instaclick/php-webdriver/zipball/a57b2bcd9467e217134a2248b261b8b3a90ccea0", + "reference": "a57b2bcd9467e217134a2248b261b8b3a90ccea0", "shasum": "" }, "require": { - "ext-xml": "*", - "jackalope/jackalope-transport": "*", - "php": ">=5.3.3", - "phpcr/phpcr": "~2.1.0,>=2.1.0-beta12", - "phpcr/phpcr-utils": ">=1.1.0,<1.3.x-dev" + "ext-curl": "*", + "php": ">=5.3.2" }, - "provide": { - "phpcr/phpcr-implementation": "2.1.0" + "require-dev": { + "satooshi/php-coveralls": "dev-master" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.4.x-dev" } }, "autoload": { "psr-0": { - "Jackalope\\": "src/" + "WebDriver": "lib/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT", "Apache-2.0" ], "authors": [ { - "name": "Jackalope Community", - "homepage": "https://github.com/jackalope/jackalope/contributors" + "name": "Justin Bishop", + "email": "jubishop@gmail.com", + "role": "Developer" + }, + { + "name": "Anthon Pang", + "email": "apang@softwaredevelopment.ca", + "role": "Fork Maintainer" } ], - "description": "Jackalope PHPCR library", - "homepage": "http://jackalope.github.io", + "description": "PHP WebDriver for Selenium 2", + "homepage": "http://instaclick.com/", "keywords": [ - "phpcr" + "browser", + "selenium", + "webdriver", + "webtest" ], - "time": "2014-12-28 08:25:32" + "time": "2014-05-12 21:03:05" }, { - "name": "jackalope/jackalope-doctrine-dbal", - "version": "1.1.2", + "name": "jackalope/jackalope", + "version": "1.1.7", "source": { "type": "git", - "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", - "reference": "3eff08407163449d33779500bbe6c7c3087bc400" + "url": "https://github.com/jackalope/jackalope.git", + "reference": "c282200645c913dad1915f38c0e4258f52c5101b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/3eff08407163449d33779500bbe6c7c3087bc400", - "reference": "3eff08407163449d33779500bbe6c7c3087bc400", + "url": "https://api.github.com/repos/jackalope/jackalope/zipball/c282200645c913dad1915f38c0e4258f52c5101b", + "reference": "c282200645c913dad1915f38c0e4258f52c5101b", "shasum": "" }, "require": { - "doctrine/dbal": ">=2.2.0,<2.6", - "jackalope/jackalope": "~1.1.1", + "ext-xml": "*", + "jackalope/jackalope-transport": "*", "php": ">=5.3.3", - "phpcr/phpcr": "~2.1.0", + "phpcr/phpcr": "~2.1.0,>=2.1.0-beta12", "phpcr/phpcr-utils": ">=1.1.0,<1.3.x-dev" }, "provide": { - "jackalope/jackalope-transport": "1.1.0" - }, - "require-dev": { - "phpcr/phpcr-api-tests": "2.1.0", - "phpunit/dbunit": "~1.3", - "psr/log": "~1.0" + "phpcr/phpcr-implementation": "2.1.0" }, - "bin": [ - "bin/jackalope" - ], "type": "library", "extra": { "branch-alias": { @@ -1919,17 +2328,15 @@ "authors": [ { "name": "Jackalope Community", - "homepage": "https://github.com/jackalope/jackalope-jackrabbit/contributors" + "homepage": "https://github.com/jackalope/jackalope/contributors" } ], - "description": "Jackalope Transport library for Doctrine DBAL", + "description": "Jackalope PHPCR library", "homepage": "http://jackalope.github.io", "keywords": [ - "doctrine-dbal", - "phpcr", - "transport implementation" + "phpcr" ], - "time": "2014-08-07 19:23:14" + "time": "2015-02-13 14:23:18" }, { "name": "jackalope/jackalope-jackrabbit", @@ -2275,16 +2682,16 @@ }, { "name": "kriswallsmith/assetic", - "version": "v1.1.3", + "version": "v1.2.1", "source": { "type": "git", "url": "https://github.com/kriswallsmith/assetic.git", - "reference": "02105abcd35fb32933bc566e4c3bec84c612e9c1" + "reference": "b20efe38845d20458702f97f3ff625d80805897b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/02105abcd35fb32933bc566e4c3bec84c612e9c1", - "reference": "02105abcd35fb32933bc566e4c3bec84c612e9c1", + "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/b20efe38845d20458702f97f3ff625d80805897b", + "reference": "b20efe38845d20458702f97f3ff625d80805897b", "shasum": "" }, "require": { @@ -2299,7 +2706,9 @@ "leafo/scssphp": "*", "leafo/scssphp-compass": "*", "mrclay/minify": "*", - "phpunit/phpunit": "~3.7", + "patchwork/jsqueeze": "~1.0", + "phpunit/phpunit": "~4", + "psr/log": "~1.0", "ptachoire/cssembed": "*", "twig/twig": "~1.6" }, @@ -2307,13 +2716,14 @@ "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler", "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler", "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin", + "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor", "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris", "twig/twig": "Assetic provides the integration with the Twig templating engine" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "1.2-dev" } }, "autoload": { @@ -2342,21 +2752,21 @@ "compression", "minification" ], - "time": "2014-12-12 05:37:00" + "time": "2014-12-12 05:04:05" }, { "name": "liip/theme-bundle", - "version": "1.1.1", + "version": "1.1.3", "target-dir": "Liip/ThemeBundle", "source": { "type": "git", "url": "https://github.com/liip/LiipThemeBundle.git", - "reference": "7e7756f8d40d19d690f73354a132d86f6a14a372" + "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/7e7756f8d40d19d690f73354a132d86f6a14a372", - "reference": "7e7756f8d40d19d690f73354a132d86f6a14a372", + "url": "https://api.github.com/repos/liip/LiipThemeBundle/zipball/a594cc6deda293034b8fd7795c9950f02fc8251b", + "reference": "a594cc6deda293034b8fd7795c9950f02fc8251b", "shasum": "" }, "require": { @@ -2397,7 +2807,7 @@ "themes", "theming" ], - "time": "2015-01-21 08:46:21" + "time": "2015-02-02 15:55:54" }, { "name": "massive/build-bundle", @@ -2725,22 +3135,22 @@ }, { "name": "phpcr/phpcr-utils", - "version": "1.2.2", + "version": "1.2.4", "source": { "type": "git", "url": "https://github.com/phpcr/phpcr-utils.git", - "reference": "5398f5c2c08f61063a6230a6640415a2c4566816" + "reference": "c41b8d4f40d616fef641497b587fe1444533959c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/5398f5c2c08f61063a6230a6640415a2c4566816", - "reference": "5398f5c2c08f61063a6230a6640415a2c4566816", + "url": "https://api.github.com/repos/phpcr/phpcr-utils/zipball/c41b8d4f40d616fef641497b587fe1444533959c", + "reference": "c41b8d4f40d616fef641497b587fe1444533959c", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=5.3.3", "phpcr/phpcr": "~2.1.0", - "symfony/console": "~2.0" + "symfony/console": "2.*,>=2.0.5" }, "type": "library", "extra": { @@ -2783,31 +3193,31 @@ "contentrepository", "phpcr" ], - "time": "2014-11-17 10:54:18" + "time": "2015-02-12 17:34:08" }, { "name": "phpdocumentor/reflection-docblock", - "version": "2.0.3", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "38743b677965c48a637097b2746a281264ae2347" + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/38743b677965c48a637097b2746a281264ae2347", - "reference": "38743b677965c48a637097b2746a281264ae2347", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { "php": ">=5.3.3" }, "require-dev": { - "phpunit/phpunit": "3.7.*@stable" + "phpunit/phpunit": "~4.0" }, "suggest": { - "dflydev/markdown": "1.0.*", - "erusev/parsedown": "~0.7" + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" }, "type": "library", "extra": { @@ -2832,7 +3242,7 @@ "email": "mike.vanriel@naenius.com" } ], - "time": "2014-08-09 10:27:07" + "time": "2015-02-03 12:10:50" }, { "name": "phpoption/phpoption", @@ -2944,21 +3354,21 @@ }, { "name": "phpspec/prophecy-phpunit", - "version": "v1.0.1", - "target-dir": "Prophecy/PhpUnit", + "version": "v1.1.0", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy-phpunit.git", - "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf" + "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", - "reference": "640c8c3bc9e02d7878e5ed22b1f79818d6bb6caf", + "url": "https://api.github.com/repos/phpspec/prophecy-phpunit/zipball/0d06c84b9f26aab2b9940354f0fe6037dd9799c3", + "reference": "0d06c84b9f26aab2b9940354f0fe6037dd9799c3", "shasum": "" }, "require": { - "phpspec/prophecy": "~1.0" + "php": ">=5.3.3", + "phpspec/prophecy": "~1.3" }, "suggest": { "phpunit/phpunit": "if it is not installed globally" @@ -2970,7 +3380,7 @@ } }, "autoload": { - "psr-0": { + "psr-4": { "Prophecy\\PhpUnit\\": "" } }, @@ -2985,12 +3395,12 @@ } ], "description": "PhpUnit test case integrating the Prophecy mocking library", - "homepage": "http://phpspec.org", + "homepage": "http://phpspec.net", "keywords": [ "phpunit", "prophecy" ], - "time": "2014-03-03 23:03:12" + "time": "2015-02-09 11:20:26" }, { "name": "psr/log", @@ -3164,26 +3574,33 @@ }, { "name": "sensio/distribution-bundle", - "version": "v2.3.8", + "version": "v3.0.16", "target-dir": "Sensio/Bundle/DistributionBundle", "source": { "type": "git", "url": "https://github.com/sensiolabs/SensioDistributionBundle.git", - "reference": "9a72f821957141ee3d9703da3fa8266d59ef4b1c" + "reference": "aa30f8cd3ee68144e043ca30713aa7d7df35c5fa" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/9a72f821957141ee3d9703da3fa8266d59ef4b1c", - "reference": "9a72f821957141ee3d9703da3fa8266d59ef4b1c", + "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/aa30f8cd3ee68144e043ca30713aa7d7df35c5fa", + "reference": "aa30f8cd3ee68144e043ca30713aa7d7df35c5fa", "shasum": "" }, "require": { - "symfony/framework-bundle": "~2.2" + "php": ">=5.3.3", + "sensiolabs/security-checker": "~2.0", + "symfony/class-loader": "~2.2", + "symfony/form": "~2.2", + "symfony/framework-bundle": "~2.3", + "symfony/process": "~2.2", + "symfony/validator": "~2.2", + "symfony/yaml": "~2.2" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -3201,12 +3618,12 @@ "email": "fabien@symfony.com" } ], - "description": "The base bundle for the Symfony Distributions", + "description": "Base bundle for Symfony Distributions", "keywords": [ "configuration", "distribution" ], - "time": "2015-01-07 07:11:03" + "time": "2015-02-01 05:42:21" }, { "name": "sensio/framework-extra-bundle", @@ -3264,38 +3681,35 @@ "time": "2014-12-02 09:52:52" }, { - "name": "sensio/generator-bundle", - "version": "v2.3.5", - "target-dir": "Sensio/Bundle/GeneratorBundle", + "name": "sensiolabs/security-checker", + "version": "v2.0.1", "source": { "type": "git", - "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", - "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2" + "url": "https://github.com/sensiolabs/security-checker.git", + "reference": "134cecf1c61256bd8e973e11376891a724543820" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/8b7a33aa3d22388443b6de0b0cf184122e9f60d2", - "reference": "8b7a33aa3d22388443b6de0b0cf184122e9f60d2", + "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/134cecf1c61256bd8e973e11376891a724543820", + "reference": "134cecf1c61256bd8e973e11376891a724543820", "shasum": "" }, "require": { - "symfony/console": "~2.0", - "symfony/framework-bundle": "~2.2" - }, - "require-dev": { - "doctrine/orm": "~2.2,>=2.2.3", - "symfony/doctrine-bridge": "~2.2", - "twig/twig": "~1.11" + "ext-curl": "*", + "symfony/console": "~2.0" }, - "type": "symfony-bundle", + "bin": [ + "security-checker" + ], + "type": "library", "extra": { "branch-alias": { - "dev-master": "2.3.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { "psr-0": { - "Sensio\\Bundle\\GeneratorBundle": "" + "SensioLabs\\Security": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3305,13 +3719,11 @@ "authors": [ { "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" + "email": "fabien.potencier@gmail.com" } ], - "description": "This bundle generates code for you", - "time": "2014-04-28 14:01:06" + "description": "A security checker for your composer.lock", + "time": "2015-01-26 16:25:19" }, { "name": "stof/doctrine-extensions-bundle", @@ -3377,16 +3789,16 @@ }, { "name": "sulu/sulu", - "version": "0.14.2", + "version": "dev-develop", "source": { "type": "git", "url": "https://github.com/sulu-cmf/sulu.git", - "reference": "0ab85bf7d2509f845b93a40355fbe2cf92c0976f" + "reference": "212b99d8e46b9ca57e582aafed240a2dd0b4e168" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sulu-cmf/sulu/zipball/0ab85bf7d2509f845b93a40355fbe2cf92c0976f", - "reference": "0ab85bf7d2509f845b93a40355fbe2cf92c0976f", + "url": "https://api.github.com/repos/sulu-cmf/sulu/zipball/212b99d8e46b9ca57e582aafed240a2dd0b4e168", + "reference": "212b99d8e46b9ca57e582aafed240a2dd0b4e168", "shasum": "" }, "require": { @@ -3402,14 +3814,12 @@ "jackalope/jackalope-jackrabbit": "1.1.*", "liip/theme-bundle": "1.1.*", "massive/search-bundle": "~0.4", - "php": ">=5.4", + "php": ">=5.5", "phpspec/prophecy-phpunit": "~1.0", "sensio/framework-extra-bundle": "3.0.*", "stof/doctrine-extensions-bundle": "1.1.*", "symfony-cmf/routing-bundle": "1.2.*", - "symfony-cmf/testing": "~1.2", - "symfony/console": "~2.0", - "symfony/framework-bundle": "~2.2", + "symfony/symfony": "2.6.*", "willdurand/hateoas-bundle": "0.3.*" }, "replace": { @@ -3440,10 +3850,8 @@ "phpspec/prophecy-phpunit": "~1.0", "phpunit/phpunit": "~4.0.0", "sensio/framework-extra-bundle": "~3.0", - "symfony-cmf/testing": "~1.1", - "symfony/doctrine-bridge": "~2.2", + "symfony-cmf/testing": "~1.2", "symfony/monolog-bundle": "2.4.*", - "symfony/symfony": "2.5.*", "twig/twig": "~1.11", "zendframework/zend-stdlib": "~2.3", "zendframework/zendsearch": "@dev" @@ -3454,7 +3862,6 @@ "phpunit/phpunit": "3.7.*", "sensio/framework-extra-bundle": "~3.0", "symfony/monolog-bundle": "2.4.*", - "symfony/symfony": "2.5.*", "zendframework/zend-stdlib": "Needed (as in require dev) in addition to zendsearch", "zendframework/zendsearch": "To use the PHP based Zend Search library (based on Lucene)" }, @@ -3479,7 +3886,7 @@ "core", "sulu" ], - "time": "2015-02-02 16:13:27" + "time": "2015-02-13 16:51:40" }, { "name": "swiftmailer/swiftmailer", @@ -3718,99 +4125,49 @@ ], "time": "2014-05-08 19:39:23" }, - { - "name": "symfony-cmf/testing", - "version": "1.2.0", - "source": { - "type": "git", - "url": "https://github.com/symfony-cmf/Testing.git", - "reference": "ceab0307ed2476624897503d279c0a910d84703a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony-cmf/Testing/zipball/ceab0307ed2476624897503d279c0a910d84703a", - "reference": "ceab0307ed2476624897503d279c0a910d84703a", - "shasum": "" - }, - "require": { - "doctrine/common": "~2.4", - "doctrine/data-fixtures": "~1.0", - "doctrine/doctrine-bundle": "~1.0", - "doctrine/phpcr-bundle": "~1.0", - "doctrine/phpcr-odm": "~1.0", - "jackalope/jackalope": "~1.0", - "jackalope/jackalope-doctrine-dbal": "~1.0", - "symfony/monolog-bundle": "~2.1", - "symfony/symfony": "~2.3" - }, - "require-dev": { - "phpunit/phpunit": "3.7.*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.2-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Cmf\\Component\\Testing\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "dantleech", - "email": "daniel@dantleech.com" - } - ], - "description": "Component for bootstraping functional tests for CMF bundles only.", - "time": "2014-10-21 18:42:46" - }, { "name": "symfony/assetic-bundle", - "version": "v2.3.1", - "target-dir": "Symfony/Bundle/AsseticBundle", + "version": "v2.6.1", "source": { "type": "git", "url": "https://github.com/symfony/AsseticBundle.git", - "reference": "099e0bb5d80e7039af20db384a41017fde521f21" + "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/099e0bb5d80e7039af20db384a41017fde521f21", - "reference": "099e0bb5d80e7039af20db384a41017fde521f21", + "url": "https://api.github.com/repos/symfony/AsseticBundle/zipball/422b0add2110f0cf9bc7a873a386ea053f4a89f0", + "reference": "422b0add2110f0cf9bc7a873a386ea053f4a89f0", "shasum": "" }, "require": { - "kriswallsmith/assetic": "1.1.x", + "kriswallsmith/assetic": "~1.2", "php": ">=5.3.0", - "symfony/framework-bundle": "~2.1" + "symfony/console": "~2.3", + "symfony/dependency-injection": "~2.3", + "symfony/framework-bundle": "~2.3", + "symfony/yaml": "~2.3" }, "require-dev": { - "symfony/class-loader": "~2.1", - "symfony/console": "~2.1", - "symfony/css-selector": "~2.1", - "symfony/dom-crawler": "~2.1", - "symfony/form": "~2.1", - "symfony/twig-bundle": "~2.1", - "symfony/yaml": "~2.1" + "kriswallsmith/spork": "~0.2", + "patchwork/jsqueeze": "~1.0", + "symfony/class-loader": "~2.3", + "symfony/css-selector": "~2.3", + "symfony/dom-crawler": "~2.3", + "symfony/twig-bundle": "~2.3" }, "suggest": { - "symfony/twig-bundle": "~2.1" + "kriswallsmith/spork": "to be able to dump assets in parallel", + "symfony/twig-bundle": "to use the Twig integration" }, "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.3-dev" + "dev-master": "2.5-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Bundle\\AsseticBundle": "" + "psr-4": { + "Symfony\\Bundle\\AsseticBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3831,25 +4188,24 @@ "compression", "minification" ], - "time": "2013-11-25 16:34:50" + "time": "2015-01-27 12:45:16" }, { "name": "symfony/monolog-bundle", - "version": "v2.4.1", - "target-dir": "Symfony/Bundle/MonologBundle", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/symfony/MonologBundle.git", - "reference": "e81c2e9c4dc0a9ff794674017069e036f575f278" + "reference": "9320b6863404c70ebe111e9040dab96f251de7ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/e81c2e9c4dc0a9ff794674017069e036f575f278", - "reference": "e81c2e9c4dc0a9ff794674017069e036f575f278", + "url": "https://api.github.com/repos/symfony/MonologBundle/zipball/9320b6863404c70ebe111e9040dab96f251de7ac", + "reference": "9320b6863404c70ebe111e9040dab96f251de7ac", "shasum": "" }, "require": { - "monolog/monolog": "~1.6", + "monolog/monolog": "~1.8", "php": ">=5.3.2", "symfony/config": "~2.3", "symfony/dependency-injection": "~2.3", @@ -3863,12 +4219,12 @@ "type": "symfony-bundle", "extra": { "branch-alias": { - "dev-master": "2.4.x-dev" + "dev-master": "2.7.x-dev" } }, "autoload": { - "psr-0": { - "Symfony\\Bundle\\MonologBundle": "" + "psr-4": { + "Symfony\\Bundle\\MonologBundle\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -3876,15 +4232,13 @@ "MIT" ], "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com", - "homepage": "http://fabien.potencier.org", - "role": "Lead Developer" - }, { "name": "Symfony Community", "homepage": "http://symfony.com/contributors" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" } ], "description": "Symfony MonologBundle", @@ -3893,7 +4247,7 @@ "log", "logging" ], - "time": "2013-08-26 10:15:04" + "time": "2015-01-04 20:21:17" }, { "name": "symfony/swiftmailer-bundle", @@ -3954,16 +4308,16 @@ }, { "name": "symfony/symfony", - "version": "v2.5.9", + "version": "v2.6.4", "source": { "type": "git", "url": "https://github.com/symfony/symfony.git", - "reference": "e082a9f28edfd5a081b60e009889b30c04979924" + "reference": "23b647f1e4eeb24a457d3c47f5f5046377d5a3bf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/symfony/zipball/e082a9f28edfd5a081b60e009889b30c04979924", - "reference": "e082a9f28edfd5a081b60e009889b30c04979924", + "url": "https://api.github.com/repos/symfony/symfony/zipball/23b647f1e4eeb24a457d3c47f5f5046377d5a3bf", + "reference": "23b647f1e4eeb24a457d3c47f5f5046377d5a3bf", "shasum": "" }, "require": { @@ -3979,6 +4333,7 @@ "symfony/console": "self.version", "symfony/css-selector": "self.version", "symfony/debug": "self.version", + "symfony/debug-bundle": "self.version", "symfony/dependency-injection": "self.version", "symfony/doctrine-bridge": "self.version", "symfony/dom-crawler": "self.version", @@ -4013,23 +4368,25 @@ "symfony/twig-bridge": "self.version", "symfony/twig-bundle": "self.version", "symfony/validator": "self.version", + "symfony/var-dumper": "self.version", "symfony/web-profiler-bundle": "self.version", "symfony/yaml": "self.version" }, "require-dev": { "doctrine/data-fixtures": "1.0.*", "doctrine/dbal": "~2.2", + "doctrine/doctrine-bundle": "~1.2", "doctrine/orm": "~2.2,>=2.2.3", "egulias/email-validator": "~1.2", "ircmaxell/password-compat": "~1.0", - "monolog/monolog": "~1.3", + "monolog/monolog": "~1.11", "ocramius/proxy-manager": "~0.4|~1.0", "propel/propel1": "~1.6" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.5-dev" + "dev-master": "2.6-dev" } }, "autoload": { @@ -4063,29 +4420,35 @@ "keywords": [ "framework" ], - "time": "2015-01-07 12:32:08" + "time": "2015-02-02 18:02:30" }, { "name": "twig/extensions", - "version": "v1.0.1", + "version": "v1.2.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig-extensions.git", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0" + "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", - "reference": "f91a82ec225e5bb108e01a0f93c9be04f84dcfa0", + "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", + "reference": "8cf4b9fe04077bd54fc73f4fde83347040c3b8cd", "shasum": "" }, "require": { - "twig/twig": "~1.0" + "twig/twig": "~1.12" + }, + "require-dev": { + "symfony/translation": "~2.3" + }, + "suggest": { + "symfony/translation": "Allow the time_diff output to be translated" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -4104,26 +4467,25 @@ } ], "description": "Common additional features for Twig that do not directly belong in core", - "homepage": "https://github.com/fabpot/Twig-extensions", + "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html", "keywords": [ - "debug", "i18n", "text" ], - "time": "2013-10-18 19:37:15" + "time": "2014-10-30 14:30:03" }, { "name": "twig/twig", - "version": "v1.17.0", + "version": "v1.18.0", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "2493970fa4d587eca73f77e6d8bd48a8bdd4c608" + "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/2493970fa4d587eca73f77e6d8bd48a8bdd4c608", - "reference": "2493970fa4d587eca73f77e6d8bd48a8bdd4c608", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/4cf7464348e7f9893a93f7096a90b73722be99cf", + "reference": "4cf7464348e7f9893a93f7096a90b73722be99cf", "shasum": "" }, "require": { @@ -4132,7 +4494,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.17-dev" + "dev-master": "1.18-dev" } }, "autoload": { @@ -4167,7 +4529,7 @@ "keywords": [ "templating" ], - "time": "2015-01-14 10:15:49" + "time": "2015-01-25 17:32:08" }, { "name": "willdurand/hateoas", @@ -4434,12 +4796,12 @@ "source": { "type": "git", "url": "https://github.com/zendframework/ZendSearch.git", - "reference": "cd06d485eb679f112f9e2fceb7d4480b9b8c2816" + "reference": "c8de2508d3413bf9d701b40c1092c1ffbdd8fc63" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/zendframework/ZendSearch/zipball/cd06d485eb679f112f9e2fceb7d4480b9b8c2816", - "reference": "cd06d485eb679f112f9e2fceb7d4480b9b8c2816", + "url": "https://api.github.com/repos/zendframework/ZendSearch/zipball/c8de2508d3413bf9d701b40c1092c1ffbdd8fc63", + "reference": "c8de2508d3413bf9d701b40c1092c1ffbdd8fc63", "shasum": "" }, "require": { @@ -4462,7 +4824,7 @@ "lucene", "zf2" ], - "time": "2014-02-15 15:17:08" + "time": "2015-01-21 16:24:14" } ], "packages-dev": [ @@ -4509,16 +4871,16 @@ }, { "name": "brianium/paratest", - "version": "0.9.6", + "version": "0.11.0", "source": { "type": "git", "url": "https://github.com/brianium/paratest.git", - "reference": "36100cdb665c1ec82ba319664d9b88f5fa76dcc3" + "reference": "0990342b91b009a146691ab4fc76b39d16e29dba" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/brianium/paratest/zipball/36100cdb665c1ec82ba319664d9b88f5fa76dcc3", - "reference": "36100cdb665c1ec82ba319664d9b88f5fa76dcc3", + "url": "https://api.github.com/repos/brianium/paratest/zipball/0990342b91b009a146691ab4fc76b39d16e29dba", + "reference": "0990342b91b009a146691ab4fc76b39d16e29dba", "shasum": "" }, "require": { @@ -4567,20 +4929,200 @@ "phpunit", "testing" ], - "time": "2015-01-14 21:14:31" + "time": "2015-02-05 22:28:44" + }, + { + "name": "dantleech/glob-finder", + "version": "0.2", + "source": { + "type": "git", + "url": "https://github.com/dantleech/glob.git", + "reference": "94c0cd3915d50e80d85452c638038c2055582d0d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/dantleech/glob/zipball/94c0cd3915d50e80d85452c638038c2055582d0d", + "reference": "94c0cd3915d50e80d85452c638038c2055582d0d", + "shasum": "" + }, + "require-dev": { + "doctrine/phpcr-bundle": "~1.2", + "doctrine/phpcr-odm": "~1.2", + "jackalope/jackalope-fs": "dev-master", + "phpspec/prophecy-phpunit": "~1.0.0" + }, + "suggest": { + "doctrine/phpcr-bundle": "To enable support for the PHPCR ODM documents", + "doctrine/phpcr-odm": "To enable support for the PHPCR ODM documents" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "DTL\\Glob\\": "lib/DTL/Glob" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Daniel Leech", + "email": "daniel@dantleech.com" + } + ], + "description": "Library offering object location from hierarchrical persistent storage systems using globs", + "homepage": "http://www.github.com/dantleech/glob", + "time": "2015-01-04 17:14:40" + }, + { + "name": "jackalope/jackalope-doctrine-dbal", + "version": "1.1.2", + "source": { + "type": "git", + "url": "https://github.com/jackalope/jackalope-doctrine-dbal.git", + "reference": "3eff08407163449d33779500bbe6c7c3087bc400" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/jackalope/jackalope-doctrine-dbal/zipball/3eff08407163449d33779500bbe6c7c3087bc400", + "reference": "3eff08407163449d33779500bbe6c7c3087bc400", + "shasum": "" + }, + "require": { + "doctrine/dbal": ">=2.2.0,<2.6", + "jackalope/jackalope": "~1.1.1", + "php": ">=5.3.3", + "phpcr/phpcr": "~2.1.0", + "phpcr/phpcr-utils": ">=1.1.0,<1.3.x-dev" + }, + "provide": { + "jackalope/jackalope-transport": "1.1.0" + }, + "require-dev": { + "phpcr/phpcr-api-tests": "2.1.0", + "phpunit/dbunit": "~1.3", + "psr/log": "~1.0" + }, + "bin": [ + "bin/jackalope" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-0": { + "Jackalope\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT", + "Apache-2.0" + ], + "authors": [ + { + "name": "Jackalope Community", + "homepage": "https://github.com/jackalope/jackalope-jackrabbit/contributors" + } + ], + "description": "Jackalope Transport library for Doctrine DBAL", + "homepage": "http://jackalope.github.io", + "keywords": [ + "doctrine-dbal", + "phpcr", + "transport implementation" + ], + "time": "2014-08-07 19:23:14" + }, + { + "name": "phpcr/phpcr-shell", + "version": "1.0.0-beta1", + "source": { + "type": "git", + "url": "https://github.com/phpcr/phpcr-shell.git", + "reference": "c60a899148a150f8dc88cb3208d9be40a1450ff8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phpcr/phpcr-shell/zipball/c60a899148a150f8dc88cb3208d9be40a1450ff8", + "reference": "c60a899148a150f8dc88cb3208d9be40a1450ff8", + "shasum": "" + }, + "require": { + "dantleech/glob-finder": "~0.1", + "jackalope/jackalope": "~1.1", + "phpcr/phpcr": "~2.1", + "phpcr/phpcr-utils": "~1.2", + "symfony/console": "~2.3", + "symfony/dependency-injection": "~2.3", + "symfony/finder": "~2.3", + "symfony/serializer": "~2.3", + "symfony/yaml": "~2.3" + }, + "conflict": { + "doctrine/phpcr-bundle": "<=1.2.1" + }, + "require-dev": { + "behat/behat": "~3.0.0", + "jackalope/jackalope-doctrine-dbal": "~1.1", + "jackalope/jackalope-fs": "dev-master", + "jackalope/jackalope-jackrabbit": "~1.1", + "phpspec/phpspec": "2.0", + "phpunit/phpunit": "~3.7.28", + "symfony/filesystem": "~2.3", + "symfony/process": "~2.3", + "symfony/symfony": "2.6" + }, + "suggest": { + "jackalope/jackalope-doctrine-dbal": "To connect to jackalope doctrine-dbal", + "jackalope/jackalope-jackrabbit": "To connect to jackalope jackrabbit", + "jackalope/jackalope-jackrabbit-fs": "To connect to jackalope jackalope-fs" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-0": { + "": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "dantleech", + "email": "daniel@dantleech.com" + } + ], + "description": "Shell for PHPCR", + "time": "2015-01-05 11:11:50" }, { "name": "phpunit/php-code-coverage", - "version": "2.0.14", + "version": "2.0.15", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94" + "reference": "34cc484af1ca149188d0d9e91412191e398e0b67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ca158276c1200cc27f5409a5e338486bc0b4fc94", - "reference": "ca158276c1200cc27f5409a5e338486bc0b4fc94", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/34cc484af1ca149188d0d9e91412191e398e0b67", + "reference": "34cc484af1ca149188d0d9e91412191e398e0b67", "shasum": "" }, "require": { @@ -4593,7 +5135,7 @@ }, "require-dev": { "ext-xdebug": ">=2.1.4", - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4" }, "suggest": { "ext-dom": "*", @@ -4612,9 +5154,6 @@ ] }, "notification-url": "https://packagist.org/downloads/", - "include-path": [ - "" - ], "license": [ "BSD-3-Clause" ], @@ -4632,7 +5171,7 @@ "testing", "xunit" ], - "time": "2014-12-26 13:28:33" + "time": "2015-01-24 10:06:35" }, { "name": "phpunit/php-file-iterator", @@ -4818,16 +5357,16 @@ }, { "name": "phpunit/phpunit", - "version": "4.4.2", + "version": "4.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "e90575c2bb86290d57a262862dab1da125431576" + "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e90575c2bb86290d57a262862dab1da125431576", - "reference": "e90575c2bb86290d57a262862dab1da125431576", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/5b578d3865a9128b9c209b011fda6539ec06e7a5", + "reference": "5b578d3865a9128b9c209b011fda6539ec06e7a5", "shasum": "" }, "require": { @@ -4837,15 +5376,16 @@ "ext-reflection": "*", "ext-spl": "*", "php": ">=5.3.3", + "phpspec/prophecy": "~1.3.1", "phpunit/php-code-coverage": "~2.0", "phpunit/php-file-iterator": "~1.3.2", "phpunit/php-text-template": "~1.2", "phpunit/php-timer": "~1.0.2", "phpunit/phpunit-mock-objects": "~2.3", - "sebastian/comparator": "~1.0", + "sebastian/comparator": "~1.1", "sebastian/diff": "~1.1", - "sebastian/environment": "~1.1", - "sebastian/exporter": "~1.0", + "sebastian/environment": "~1.2", + "sebastian/exporter": "~1.2", "sebastian/global-state": "~1.0", "sebastian/version": "~1.0", "symfony/yaml": "~2.0" @@ -4859,7 +5399,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.4.x-dev" + "dev-master": "4.5.x-dev" } }, "autoload": { @@ -4885,7 +5425,7 @@ "testing", "xunit" ], - "time": "2015-01-17 11:24:41" + "time": "2015-02-05 15:51:19" }, { "name": "phpunit/phpunit-mock-objects", @@ -5431,25 +5971,25 @@ }, { "name": "sebastian/comparator", - "version": "1.1.0", + "version": "1.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a" + "reference": "1dd8869519a225f7f2b9eb663e225298fade819e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/c484a80f97573ab934e37826dba0135a3301b26a", - "reference": "c484a80f97573ab934e37826dba0135a3301b26a", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1dd8869519a225f7f2b9eb663e225298fade819e", + "reference": "1dd8869519a225f7f2b9eb663e225298fade819e", "shasum": "" }, "require": { "php": ">=5.3.3", - "sebastian/diff": "~1.1", - "sebastian/exporter": "~1.0" + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" }, "require-dev": { - "phpunit/phpunit": "~4.1" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { @@ -5491,7 +6031,7 @@ "compare", "equality" ], - "time": "2014-11-16 21:32:38" + "time": "2015-01-29 16:28:08" }, { "name": "sebastian/diff", @@ -5597,28 +6137,29 @@ }, { "name": "sebastian/exporter", - "version": "1.0.2", + "version": "1.2.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0" + "reference": "84839970d05254c73cde183a721c7af13aede943" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", - "reference": "c7d59948d6e82818e1bdff7cadb6c34710eb7dc0", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/84839970d05254c73cde183a721c7af13aede943", + "reference": "84839970d05254c73cde183a721c7af13aede943", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" }, "require-dev": { - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "~4.4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -5658,7 +6199,7 @@ "export", "exporter" ], - "time": "2014-09-10 00:51:36" + "time": "2015-01-27 07:23:06" }, { "name": "sebastian/global-state", @@ -5711,6 +6252,59 @@ ], "time": "2014-10-06 09:23:50" }, + { + "name": "sebastian/recursion-context", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "3989662bbb30a29d20d9faa04a846af79b276252" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/3989662bbb30a29d20d9faa04a846af79b276252", + "reference": "3989662bbb30a29d20d9faa04a846af79b276252", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2015-01-24 09:48:32" + }, { "name": "sebastian/version", "version": "1.0.4", @@ -5745,17 +6339,69 @@ "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", "time": "2014-12-15 14:25:24" + }, + { + "name": "sensio/generator-bundle", + "version": "v2.5.2", + "target-dir": "Sensio/Bundle/GeneratorBundle", + "source": { + "type": "git", + "url": "https://github.com/sensiolabs/SensioGeneratorBundle.git", + "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sensiolabs/SensioGeneratorBundle/zipball/4b09746520a826a7bf34a466ba31c7d8740fef7e", + "reference": "4b09746520a826a7bf34a466ba31c7d8740fef7e", + "shasum": "" + }, + "require": { + "symfony/console": "~2.5", + "symfony/framework-bundle": "~2.2" + }, + "require-dev": { + "doctrine/orm": "~2.2,>=2.2.3", + "symfony/doctrine-bridge": "~2.2", + "twig/twig": "~1.11" + }, + "type": "symfony-bundle", + "extra": { + "branch-alias": { + "dev-master": "2.5.x-dev" + } + }, + "autoload": { + "psr-0": { + "Sensio\\Bundle\\GeneratorBundle": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "This bundle generates code for you", + "time": "2015-02-11 07:21:23" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { - "zendframework/zendsearch": 20 + "sulu/sulu": 20, + "zendframework/zendsearch": 20, + "behat/mink-extension": 20, + "behat/mink-selenium2-driver": 20, + "behat/symfony2-extension": 20, + "phpcr/phpcr-shell": 10 }, "prefer-stable": false, - "prefer-lowest": false, "platform": { - "php": ">=5.3.3" + "php": ">=5.5" }, "platform-dev": [] } diff --git a/src/Client/Bundle/WebsiteBundle/DependencyInjection/ClientWebsiteExtension.php b/src/Client/Bundle/WebsiteBundle/DependencyInjection/ClientWebsiteExtension.php new file mode 100644 index 0000000000..149d6e02e0 --- /dev/null +++ b/src/Client/Bundle/WebsiteBundle/DependencyInjection/ClientWebsiteExtension.php @@ -0,0 +1,36 @@ +processConfiguration($configuration, $configs); + + $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); + $loader->load('services.xml'); + } +} diff --git a/src/Client/Bundle/WebsiteBundle/DependencyInjection/Configuration.php b/src/Client/Bundle/WebsiteBundle/DependencyInjection/Configuration.php new file mode 100644 index 0000000000..aa5f4e4c4e --- /dev/null +++ b/src/Client/Bundle/WebsiteBundle/DependencyInjection/Configuration.php @@ -0,0 +1,37 @@ +root('client_website'); + + // Here you should define the parameters that are allowed to + // configure your bundle. See the documentation linked above for + // more information on that topic. + + return $treeBuilder; + } +} diff --git a/src/Client/Bundle/WebsiteBundle/Resources/config/services.xml b/src/Client/Bundle/WebsiteBundle/Resources/config/services.xml new file mode 100644 index 0000000000..1ff5c8825f --- /dev/null +++ b/src/Client/Bundle/WebsiteBundle/Resources/config/services.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/src/Client/Bundle/WebsiteBundle/Twig/ClientTwigExtension.php b/src/Client/Bundle/WebsiteBundle/Twig/ClientTwigExtension.php new file mode 100644 index 0000000000..4d6dc95462 --- /dev/null +++ b/src/Client/Bundle/WebsiteBundle/Twig/ClientTwigExtension.php @@ -0,0 +1,43 @@ +> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini + +~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm + +# configure apache virtual hosts +sudo cp -f \ + tests/travis-ci-apache \ + /etc/apache2/sites-available/default + +sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default +sudo service apache2 restart + +mkdir -p $LOGS_DIR +composer selfupdate +composer install --no-interaction +cp app/Resources/webspaces/sulu.io.xml.dist app/Resources/webspaces/sulu.io.xml +cp app/Resources/pages/overview.xml.dist app/Resources/pages/overview.xml + +php app/console sulu:build dev --no-interaction + +./tests/sauce/connect_setup.sh +./tests/sauce/connect_block.sh diff --git a/tests/runtests.sh b/tests/runtests.sh new file mode 100755 index 0000000000..ae00f93920 --- /dev/null +++ b/tests/runtests.sh @@ -0,0 +1,38 @@ +#!/bin/bash + +SUITES=${BEHAT_SUITES:-""} +PROFILE=${BEHAT_PROFILE:-"selenium"} +LOGS_PATH=${LOGS_DIR:-"/tmp/sulu"} + +source "$(dirname "$0")""/../vendor/sulu/sulu/bin/inc/runtestcommon.inc.sh" +if [ -e /tmp/failed.tests ]; then + rm /tmp/failed.tests +fi +touch /tmp/failed.tests + +logo + +header "Sulu CMF Functional Test Suite" + + +info "Running Behat with profile \""$PROFILE"\" and suites: \"$SUITES\"" + +for SUITE in $SUITES; do + comment "Running suite: "$SUITE + NAME="Suite: "$SUITE + + if [ $PROFILE == 'sauce_labs' ]; then + export BEHAT_PARAMS='{"extensions":{"Behat\\MinkExtension":{ "sessions":{ "default":{"sauce_labs":{"capabilities":{"name": "'$NAME'"}}}}}}}' + else + export BEHAT_PARAMS= + fi + + php vendor/behat/behat/bin/behat --profile $PROFILE --suite="$SUITE" + + if [ $? -ne 0 ]; then + echo $SUITE >> /tmp/failed.tests + fi + echo "" +done + +check_failed_tests diff --git a/tests/sauce/connect_block.sh b/tests/sauce/connect_block.sh index 7afd018014..ba251a8c94 100755 --- a/tests/sauce/connect_block.sh +++ b/tests/sauce/connect_block.sh @@ -2,5 +2,6 @@ # Wait for connect to be ready before exiting while [ ! -f $SAUCE_CONNECT_READY_FILE ]; do - sleep .5 + sleep 5 + echo "Saucelabs not ready, waiting.." done diff --git a/tests/travis-ci-apache b/tests/travis-ci-apache new file mode 100644 index 0000000000..4fa66ae47b --- /dev/null +++ b/tests/travis-ci-apache @@ -0,0 +1,22 @@ +Listen 8080 + + + SetEnv APP_ENV prod + DocumentRoot %TRAVIS_BUILD_DIR%/web + + + Options FollowSymLinks MultiViews ExecCGI + AllowOverride All + Order deny,allow + Allow from all + + + # Wire up Apache to use Travis CI's php-fpm. + + AddHandler php5-fcgi .php + Action php5-fcgi /php5-fcgi + Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi + FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization + + + diff --git a/web/.htaccess b/web/.htaccess index 592fb7b5ad..b14dc4f98c 100755 --- a/web/.htaccess +++ b/web/.htaccess @@ -5,7 +5,7 @@ # to each configured DirectoryIndex file (e.g. index.php, index.html, index.pl). DirectoryIndex website.php -SetEnv APP_ENV dev +SetEnv SYMFONY_ENV dev RewriteEngine On diff --git a/web/admin.php b/web/admin.php index eb97f20635..a2932ddb33 100755 --- a/web/admin.php +++ b/web/admin.php @@ -5,27 +5,31 @@ use Symfony\Component\Debug\Debug; // Define application environment -defined('APP_ENV') || define('APP_ENV', (getenv('APP_ENV') ? getenv('APP_ENV') : 'prod')); +defined('SYMFONY_ENV') || define('SYMFONY_ENV', getenv('SYMFONY_ENV') ?: 'prod'); +defined('SYMFONY_DEBUG') || + define('SYMFONY_DEBUG', filter_var(getenv('SYMFONY_DEBUG') ?: SYMFONY_ENV === 'dev', FILTER_VALIDATE_BOOLEAN)); $loader = require_once __DIR__ . '/../app/bootstrap.php.cache'; -if (APP_ENV == 'dev') { +if (SYMFONY_DEBUG) { Debug::enable(); } -// Use APC for autoloading to improve performance. -// Change 'sf2' to a unique prefix in order to prevent cache key conflicts -// with other applications also using APC. +// Enable APC for autoloading to improve performance. +// You should change the ApcClassLoader first argument to a unique prefix +// in order to prevent cache key conflicts with other applications +// also using APC. /* -$apcLoader = new ApcClassLoader('sf2', $loader); +$apcLoader = new ApcClassLoader(sha1(__FILE__), $loader); $loader->unregister(); $apcLoader->register(true); */ require_once __DIR__ . '/../app/AdminKernel.php'; -$kernel = new AdminKernel(APP_ENV, (APP_ENV == 'dev') ? true : false); +$kernel = new AdminKernel(SYMFONY_ENV, SYMFONY_DEBUG); $kernel->loadClassCache(); + $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send(); diff --git a/web/admin/translations/sulu.de.json b/web/admin/translations/sulu.de.json index 92d31a74db..1b561573b6 100644 --- a/web/admin/translations/sulu.de.json +++ b/web/admin/translations/sulu.de.json @@ -1 +1 @@ -{"contacts.sidebar.web-and-mail":"Web & Email","contacts.sidebar.mainContact":"Hauptansprechpartner","public.company":"Unternehmen","contacts.sidebar.mainCompany":"Hauptunternehmen","content-navigation.accounts.documents":"Dokumente","content-navigation.contacts.documents":"Dokumente","contact.contacts.assignment":"Zuordnung","contact.contacts.categories.label":"Kategorien","contact.account.add-account-contact":"Kontakt hinzuf\u00fcgen","contact.accounts.add-new-contact-to-account":"Kontakt erstellen und hinzuf\u00fcgen","navigation.media":"Medien","navigation.media.collections":"Kollektionen","content-navigation.media.files":"Dateien","media.media.description":"Beschreibung","media.media.size":"Dateigr\u00f6\u00dfe","media.media.thumbnails":"Vorschaubild","sulu.media.new-collection":"Neue Kollektion","sulu.media.add-collection":"Neue Kollektion hinzuf\u00fcgen","content-navigation.media.settings":"Einstellungen","labels.success.media-save-desc":"Medien erfolgreich gespeichert","sulu.media.multiple-edit.title":"Medien bearbeiten","labels.success.media-upload-desc":"Medien erfolgreich hochgeladen.","media-selection.collections":"Kollektionen","media.collections.title":"Kollektionen","media.collection.title":"Kollektionstitel","labels.success.collection-save-desc":"Kollektion erfolgreich gespeichert","labels.success.collection-deleted-desc":"Kollektion erfolgreich gel\u00f6scht","sulu.collections.delete-collection":"Kollektion l\u00f6schen","media-selection.new-collection":"Neue Kollektion","media-selection.create-new-collection":"Neue Kollektion erstellen","media-selection.upload-to-collection":"In Kollektion hochladen","media-selection.upload-new":"Neu hochladen","media-selection.add-images":"Bilder hinzuf\u00fcgen","media-selection.nomedia-selected":"Keine Medien ausgew\u00e4hlt","security.user.error.notUnique":"Dieser Benutzername ist bereits vergeben!","security.user.error.missingPassword":"Zum Erstellen eines Benutzers wird ein Passwort ben\u00f6tigt!","security.user.activate":"User aktivieren","content-navigation.category.details":"Details","category.categories.title":"Kategorien","navigation.settings.categories":"Kategorien","sulu.category.new-category":"Neue Kategorie","sulu.category.category-name":"Kategoriename","sulu.category.category-key":"Kategorieschl\u00fcssel","labels.success.category-save-desc":"Kategorie erfolgreich gespeichert","labels.success.category-delete-desc":"Kategorie erfolgreich gel\u00f6scht","labels.error.category-unique-key":"Der Kategorieschl\u00fcssel muss einzigartig sein","labels.success.category-save-error":"Beim Speichern der Kategorie ist ein Fehler aufgetreten","sulu.category.no-categories-available":"Keine Kategorien verf\u00fcgbar","navigation.snippets":"Schnipsel","snippets.snippet.title":"Schnipsel","snippets.list.template":"Typ","content-navigation.snippets.details":"Details","navigation.global-content":"Globale Inhalte","snippet-content.add":"Schnipsel ausw\u00e4hlen","snippet.delete-referenced-by-following":"Dieses Schnipsel wird von folgenden Seiten referenziert:","snippet.delete-confirm-text":"Sind Sie sicher, dass Sie dieses Schnipsel l\u00f6schen wollen?","snippet.delete-confirm-title":"L\u00f6schen best\u00e4tigen","snippet.delete-do-it":"Ja, ich bin sicher","snippet.delete-no-snippets-selected":"Sie haben kein Schnipsel ausgew\u00e4hlt","snippet-content.nosnippets-selected":"Keine Schnipsel ausgew\u00e4hlt","public.url-history.none":"Keine alten URLs f\u00fcr diesen Inhalt vorhanden ...","single-internal-link.title":"Interner Link ausw\u00e4hlen","content-navigation.contents.internal-link":"Interner Link","content-navigation.contents.external-link":"Externer Link","sulu.content.form.settings.show-in-navigation":"In Navigation anzeigen","sulu.content.form.settings.type":"Inhalts Typ","sulu.content.form.settings.type.content":"Inhalt","sulu.content.form.settings.type.internal-link":"Interner Link","sulu.content.form.settings.type.external-link":"Externer Link","content.contents.settings.delete":"Seite l\u00f6schen","content.contents.settings.copy":"Seite kopieren","content.contents.settings.copy.title":"Elternseite w\u00e4hlen","content.contents.settings.move":"Seite verschieben","content.contents.settings.move.title":"Elternseite w\u00e4hlen","content.contents.settings.order":"Seiten sortieren","content.contents.settings.order.title":"Seite platzieren","smart-content.nocontent-found":"Keinen Inhalt gefunden","smart-content.nocontent-selected":"Nichts ausgew\u00e4hlt","smart-content.visible":"sichtbar","smart-content.of":"von","smart-content.configure-smart-content":"{title} konfigurieren","smart-content.data-source":"Datenquelle","smart-content.include-sub-folders":"Unterordner mit einbeziehen","smart-content.filter-by-category":"Nach Kategorie filtern","smart-content.filter-by-tags":"Nach Tags filtern","smart-content.sort-by":"Sortieren nach","smart-content.no-sorting":"Standard Sortierung","smart-content.ascending":"Aufsteigend","smart-content.descending":"Absteigend","smart-content.present-as":"Darstellen als","smart-content.limit-result-to":"Ergebnis limitieren auf","smart-content.no-category":"Keine Kategorie","smart-content.choose-present-as":"ausw\u00e4hlen..","smart-content.choose-data-source":"Datenquelle w\u00e4hlen","smart-content.from":"Von","smart-content.sub-folders-inclusive":"inkl. Unterordner","smart-content.view-all":"alle ansehen","smart-content.view-less":"weniger ansehen","smart-content.title":"Titel","content.template.dialog.titile":"Template \u00e4ndern","content.template.dialog.content":"Es gibt ver\u00e4nderte Daten.Die Seite trotzdem verlassen?","content.template.dialog.submit-button":"Ja","content.template.dialog.cancel-button":"Abbrechen","content.delete.dialog.title":"Seite l\u00f6schen","content.delete.dialog.content":"Soll der ausgew\u00e4hlte Seite wirklich gel\u00f6scht werden?","content.delete.dialog.cancel":"Lieber nicht","content.delete.dialog.submit":"Passt","content.contents.show-ghost-pages":"Ghost- und Shadow- Seiten anzeigen","content.preview.resolutions":"Bildschirmauf\u00f6sungen","sulu.content.add-type":"Block hinzuf\u00fcgen","smart-content.data-source.label":"Datenquelle","smart-content.data-source.button":"Quelle w\u00e4hlen","smart-content.choose-data-source.cancel":"Zur\u00fcck","sulu.content.seo.title":"Titel","sulu.content.seo.description":"Beschreibung","sulu.content.seo.keywords":"Keywords","sulu.content.seo.canonical":"Canonical (Canonical Tag)","sulu.content.seo.robots":"Robots Einstellungen (robots.txt)","sulu.content.seo.robots.no-index":"no-index (Seite wird nicht von Suchmaschinen indiziert)","sulu.content.seo.robots.no-follow":"no-follow (Links auf der Seite wird von Suchmaschinen nicht gefolgt)","sulu.content.excerpt.title":"Titel","sulu.content.excerpt.description":"Beschreibung","sulu.content.excerpt.images":"Bilder","sulu.content.seo.descriptions.note":"Die Meta-Beschreibung ist auf 155 Zeichen limitiert.","sulu.content.seo.characters-left":"Zeichen \u00fcbrig","sulu.content.seo.keywords.note":"Bitte benutze max. 5 Keywords, abh\u00e4ngig vom Inhalt der Seite, getrennt durch Kommas.","sulu.content.seo.keywords-left":"Keywords \u00fcbrig.","content.contents.title":"Inhalte","sulu.content.form.settings.nav-contexts":"Navigations Kontexte","sulu.content.form.settings.all-nav-contexts":"Alle Navigations Kontexte ausgew\u00e4hlt ...","sulu.content.form.settings.no-nav-contexts":"Keinen Navigations Kontexte ausgew\u00e4hlt ...","sulu.content.form.settings.shadow_page":"Shadow Page","sulu.content.form.settings.shadow.enable":"Shadow Page aktivieren","sulu.content.form.settings.shadow.base_language":"Shadow Page Sprache","sulu.content.form.settings.shadow.no_base_language":"Keine Shadow Page Sprache vorhanden ...","sulu.content.form.settings.shadow.select_base_language":"Sprache ausw\u00e4hlen ...","sulu.content.form.settings.type.internal-link.title":"Titel","sulu.content.form.settings.type.internal-link.link":"Verlinkter Inhalt","sulu.content.form.settings.type.external-link.title":"Titel","sulu.content.form.settings.type.external-link.url":"URL","sulu.content.sort.blocks":"Textbl\u00f6cke sortieren","sulu.content.edit.blocks":"Textbl\u00f6cke editieren","content.contents.settings.copy-locales.title":"Sprachvarianten kopieren","content.contents.settings.copy-locales.copy-from":"Ausgangssprache","content.contents.settings.copy-locales.current-language":"Aktuelle Sprache","content.contents.settings.copy-locales.target":"Zielsprachen","content.contents.settings.copy-locales.info":"Neue Seite wird erstellt","content.contents.settings.copy-locales.ok":"Sprachvarianten kopieren","content.contents.settings.copy-locale.title":"Was w\u00fcrden Sie gerne tun?","content.contents.settings.copy-locale.info":"Diese Seite existiert nicht.Bitte w\u00e4hlen Sie eine der folgenden Optionen:","content.contents.settings.copy-locale.new":"Erstellen Sie eine neue leere Seite<\/b> in dieser Sprache","content.contents.settings.copy-locale.copy":"Erstellen Sie eine neue Seite in dieser Sprache und kopieren Sie den Inhalt von<\/b>:","content.contents.settings.copy-locale.select-default":"Ausw\u00e4hlen ...","content.contents.settings.copy-locale-overlay.ok":"Seite erstellen","toolbar.copy-locale":"Sprachvarianten kopieren","content.contents.new":"Seite erstellen","content.contents.settings.copy-locales.default-label":"Sprache ausw\u00e4hlen ...","tag.error.notUnique":"Der eingegebene Tagname ist nicht eindeutig!","navigation.settings.cache":"Cache","sulu.website.cache.remove":"Cache leeren","sulu.website.cache.title":"Cache Einstellungen","sulu.website.cache.remove.success.title":"Cache","sulu.website.cache.remove.success.description":"wurde erfolgreich geleert","sulu.website.cache.remove.error.title":"Cache","sulu.website.cache.remove.error.description":"konnte nicht geleert werden","sulu.location.configure":"Ort ausw\u00e4hlen","sulu.location.locate-address":"Adresse anlegen","sulu.location.title":"Titel","sulu.location.street":"Stra\u00dfe","sulu.location.number":"Nummer","sulu.location.code":"Postleitzahl","sulu.location.town":"Stadt","sulu.location.country":"Land","sulu.location.coords":"Koordinaten (Long \/ Lat \/ Zoom)","sulu.location.map":"Karte","sulu.location.search":"Suche","public.name":"Name","public.key":"Schl\u00fcssel","public.edit":"Editieren","public.empty-list":"Diese Liste ist leer","public.tags":"Tags","public.show-tags":"Show tags","public.view-all":"view all","public.view-less":"view less","header.add":"Hinzuf\u00fcgen","header.save":"Speichern","header.saved":"Gespeichert","header.delete":"L\u00f6schen","navigation.list":"Zur\u00fcck zur Liste","translate.package.title":"Paket","translate.package.catalogues":"Sprachkataloge","translate.package.settings.locale":"Region","translate.package.settings.addCatalogue":"Region hinzuf\u00fcgen","translate.package.details.key":"Code","translate.package.details.translation":"\u00dcbersetzung","translate.package.details.suggestion":"Vorschlag","translate.package.details.maxLength":"Maximale L\u00e4nge","translate.package.details.length":"L\u00e4nge","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Element Hinzuf\u00fcgen","public.delete":"L\u00f6schen","public.no-pages":"Keine Seiten","translate.package.settings.title":"Titel","contact.contacts.title":"Kontakt","contact.contacts.contactTitle":"Titel","contact.contacts.firstName":"Vorname","contact.contacts.lastName":"Nachname","contact.contacts.position":"Position","contact.contacts.company":"Unternehmen","contact.form.addEmail":"E-Mail hinzuf\u00fcgen","contact.form.addPhone":"Telefon hinzuf\u00fcgen","contact.form.addAddress":"Addresse hinzuf\u00fcgen","contact.address.street":"Stra\u00dfe","contact.address.number":"Nummer","contact.address.additional":"Haus, Stock, etc.","contact.address.zip":"Postleitzahl","contact.address.city":"Stadt","contact.address.state":"Region","contact.address.country":"Land","public.email":"E-Mail","public.phone":"Telefon","public.address":"Adresse","email.home":"Privat","email.work":"Arbeit","phone.home":"Privat","phone.work":"Arbeit","phone.fax":"Fax","address.home":"Privat","address.work":"Arbeit","country.austria":"\u00d6sterreich","country.germany":"Deutschland","contact.accounts.title":"Unternehmen","contact.accounts.name":"Unternehmen","contact.accounts.website":"Internetseite","contact.accounts.company":"Geh\u00f6rt zu","security.roles.title":"Berechtigungen","security.roles.name":"Rollen Titel","security.roles.system":"System","security.roles.godMode":"Gott Modus","security.roles.godModeDescription":"Das ist der Gott Modus","security.roles.section":"Sektion","security.roles.permissions":"Berechtigungen","security.roles.all":"Alle ausw\u00e4hlen","security.roles.none":"Keine ausw\u00e4hlen","security.roles.security-type":"Typ","security.permission.title":"Benutzername & Passwort","security.permission.username":"Benutzername","security.permission.password":"Passwort","security.permission.passwordRepeat":"Passwort wiederholen","security.permission.email":"Prim\u00e4re email","security.permission.titlePermissions":"Berechtigungen","security.permission.role.title":"Titel","security.permission.role.language":"Sprache","security.permission.role.permissions":"Berechtigungen","security.permission.role.chooseLanguage":"Sprache ausw\u00e4hlen","security.permission.role.allLanguages":"Alle ausgew\u00e4hlt","toolbar.delete":"L\u00f6schen","sulu.list-toolbar.import":"Importieren","sulu.list-toolbar.export":"Exportieren","navigation.tools":"Werkzeuge","navigation.settings":"Einstellungen","navigation.settings.roles":"Berechtigungen","navigation.settings.translate":"\u00dcbersetzungen","navigation.contacts":"CRM","navigation.contacts.people":"Personen","navigation.contacts.companies":"Unternehmen","navigation.webspaces":"Globale Inhalte & Webspaces","navigation.webspaces.pages":"Seiten","navigation.version-history":"Versionsverlauf","navigation.user":"Benutzer","content-navigation.security.permissions":"Berechtigungen","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.content":"Inhalte","content-navigation.contents.settings":"Einstellungen","public.search":"Suchen ...","navigation.hide":"Verstecken","navigation.show":"Anzeigen","security.permission.locale":"Systemsprache","pagination.page":"Seite","pagination.of":"von","pagination.elements":"Elemente","pagination.show":"Zeige","pagination.elements-of":"Elemente von","pagination.elements-per-page":"Elemente pro Seite","pagination.show-all-elements":"Alle Elemente anzeigen","navigation.settings.tags":"Tags","public.id":"ID","list-toolbar.column-options":"Spalten Optionen","tags.name":"Bezeichnung","tags.author":"Author","tags.changed":"Zuletzt ge\u00e4ndert","public.changed":"Zuletzt ge\u00e4ndert","public.created":"Erstellt am","contact.contacts.birthday":"Geburtstag","contact.contacts.middleName":"Zwischenname","public.title":"Titel","tag.tags.title":"Tags","toolbar.state-publish":"Ver\u00f6ffentlicht","toolbar.state-unpublish":"Verstecken","toolbar.state-test":"Test","template.default":"Standard","template.simple":"Einfach","template.overview":"\u00dcberblick","template.complex":"Komplex","public.published":"Ver\u00f6ffentlicht","labels.state-changed.success-desc":"Status ge\u00e4ndert","labels.success":"Erfolg","labels.state-changed.error-desc":"Status konnte nicht ge\u00e4ndert werden","labels.error":"Fehler","labels.warning":"Warnung","labels.success.content-deleted-desc":"Seite erfolgreich gel\u00f6scht.","labels.success.content-save-desc":"Node erfolgreich gespeichert.","labels.error.content-save-desc":"Seite konnte nicht gespeichert werden.","sulu.matcher.unmatched-column":"Nicht zugeordnete Spalte","sulu.matcher.matched-column":"Zugeordnete Spalte","sulu.matcher.edit":"Bearbeiten","sulu.matcher.skip":"\u00dcberspringen","sulu.matcher.skipped":"\u00dcbersprungen","sulu.matcher.column":"Spalte","sulu.matcher.please-choose":"Bitte w\u00e4hlen..","navigation.pim":"PIM","navigation.pim.products":"Produkte","pim.products.title":"Produkte","products.key":"Schl\u00fcssel","products.contractual-article":"Vertraglicher Artikel","products.name":"Name","products.article-number":"Artikelnummer","products.manufacturer":"Hersteller","products.categories":"Kategorien","products.last-imported":"Zuletzt importiert","sulu.products.import":"Import","sulu.products.map-header":"Header zuordnen","sulu.products.map-header-desc":"Bitte Spalten der existierenden Datenstruktur zuordnen.","sulu.products.unmatched-columns":"Nicht zugeordnete Spalten","public.deactivate":"Deaktivieren","contact.account.type.basic":"Kontakt","contact.account.type.lead":"Interessent","contact.account.type.customer":"Kunde","contact.account.type.supplier":"Lieferant","contact.account.add-basic":"Neues Unternehmen erstellen","contact.account.add-lead":"Neuen Interessenten erstellen","contact.account.add-customer":"Neuen Kunden erstellen","contact.account.add-supplier":"Neuen Lieferanten erstellen","contact.accounts.type":"Typ","public.add-fields":"Neue Felder hinzuf\u00fcgen","public.edit-fields":"Felder editieren","public.fax":"Fax","public.url":"Website","public.note":"Notiz","public.all":"Alle","public.comments":"Kommentare","contact.add.address":"Adresse hinzuf\u00fcgen","dropdown.please-choose":"Bitte w\u00e4hlen..","navigation.webspaces.content":"Inhalte","navigation.webspaces.index-page":"Startseite","url.home":"Privat","sulu.overlay.be-careful":"Sei vorsichtig","sulu.overlay.delete-desc":"Die Operation die Sie machen m\u00f6chten l\u00f6scht Daten und l\u00e4sst sich nicht r\u00fcckg\u00e4ngig machen. Bitte\n denken Sie genau dar\u00fcber nach und akzeptieren Sie oder brechen Sie ab.\n ","sulu.overlay.unsaved-changes-confirm":"Sie haben \u00c4nderungen die noch nicht gespeichert wurden.Wollen Sie wirklich fortfahren ohne zu speichern?","sulu.overlay.save-unsaved-changes-confirm":"Sie haben \u00c4nderungen die noch nicht gespeichert wurden.Wollen Sie speichern und fortfahren?","public.show-history":"Verlauf anzeigen","public.url-history":"Url Verlauf","sulu.property.title":"Titel","sulu.property.url":"Url","sulu.property.block.title":"Titel","sulu.property.block.article":"Artikel","sulu.property.tags":"Tags","sulu.property.article":"Artikel","sulu.property.smartcontent":"Smart-content","sulu.property.block":"Block","sulu.type.editor":"Editor","sulu.type.area":"Text","sulu.type.title_only":"Titel","contacts.accounts.manage.categories.title":"Kategorien","contacts.accounts.manage.categories":"Eintr\u00e4ge editieren","contacts.accounts.category.select":"Kategorie ausw\u00e4hlen","contacts.accounts.category":"Kategorie","sulu.overlay.delete-no-items":"Es wurden keine Felder ausgew\u00e4hlt.","sulu.overlay.error":"Fehler!","contact.accounts.delete.sub-found":"Ein oder mehrere Tochterunternehmen gefunden.","contact.accounts.delete.sub-found-desc":"Ein Unternehmen kann nicht gel\u00f6scht werden, solange es Tochterunternehmen hat. Bitte l\u00f6schen sie\n das Tochterunternehmen oder entfernen sie die Relation.\n ","contact.accounts.delete.desc":"Wollen Sie wirklich das ausgew\u00e4hlte Unternehmen l\u00f6schen? Die gespeicherten Daten gehen dabei\n verloren.\n ","public.and-number-more":"und <%= number %> weitere","contact.accounts.delete.contacts":"Alle <%= number %> zugeh\u00f6rigen Kontakte entfernen.","contact.accounts.delete.contacts-found":"Es wurden zugeh\u00f6rige Kontakte gefunden.","contact.accounts.delete.contacts-question":"Wollen sie die zugeh\u00f6rigen Kontakte zusammen mit dem Unternehmen l\u00f6schen?","contact.accounts.delete.contacts-checkbox":"Alle <%= number %> zugeh\u00f6rigen Kontakte l\u00f6schen.","public.open-all":"Alle \u00f6ffnen","public.close-all":"Alle schlie\u00dfen","pagination.show-all":"Zeige alle","public.elements":"Elemente","sulu.upload.dropzone-title":"Files hierher ziehen um hochzuladen","sulu.upload.dropzone-desc":"oder klicken um hinzuzuf\u00fcgen","sulu.list-toolbar.small-thumbnails":"Kleine Vorschaubilder","sulu.list-toolbar.big-thumbnails":"Gro\u00dfe Vorschaubilder","sulu.list-toolbar.table":"Tabelle","contact.accounts.number":"Nummer","contact.accounts.registerNumber":"Firmenbuchnummer","contact.accounts.uid":"UID","contact.accounts.division":"Abteilung","public.disabled":"Deaktiviert","navigation.financials":"Finanzdaten","contact.accounts.bankName":"Name der Bank","contact.accounts.bank-accounts":"Bankverbindungen","contact.accounts.add-bank-account":"Neues Konto hinzuf\u00fcgen","public.public":"\u00d6ffentlich","public.iban":"IBAN","public.bic":"BIC","contact.accounts.manage.categories.title":"Kategorien verwalten","contact.accounts.manage.categories":"Kategorien verwalten","contact.accounts.category.select":"Kategorie ausw\u00e4hlen","contact.accounts.category":"Kategorie","public.please-choose":"Bitte w\u00e4hlen","contacts.edit-address":"Adresse editieren","contact.accounts.bonusSettlement":"Bonusabrechnung","contact.accounts.bonusConditions":"Bonuskonditionen","contact.accounts.correspondence":"Korrespondenz per","contact.contacts.salutation":"Gru\u00dfformel","contact.contacts.formOfAddress":"Anrede","contact.contacts.formOfAddress.select":"Anrede ausw\u00e4hlen","contact.contacts.formOfAddress.male":"Herr","contact.contacts.formOfAddress.female":"Frau","public.color":"Farbe","contact.contacts.details":"Kontaktdetails","url.work":"Arbeit","fax.work":"Arbeit","public.internal":"Intern","address.delivery":"Lieferadresse","address.invoice":"Rechnungsadresse","phone.mobile":"Mobil","contact.contacts.hobbies":"Hobbies","contact.contacts.partner":"Partner","contact.contacts.aviso":"Aviso an","public.add-entry":"Neuen Eintrag erstellen","public.edit-entries":"Eintr\u00e4ge editieren","public.info":"Info","public.description":"Beschreibung","contact.contacts.isPoolAlpinEmployee":"PA-Mitarbeiter","contact.address.primaryAddress":"Prim\u00e4re Adresse","contact.address.deliveryAddress":"Lieferadresse","contact.address.billingAddress":"Rechnungsadresse","contact.address.type":"Adresstyp","contact.address.postbox.number":"Postfach #","contact.address.postbox.postcode":"Postfach PLZ","contact.address.postbox.city":"Postfach Stadt","contact.address.type.select":"Adresstyp ausw\u00e4hlen","contact.address.add.label":"Adresse hinzuf\u00fcgen","contact.accounts.type.conversion.message":"Die Operation die Sie machen m\u00f6chten konvertiert dieses Unternehmen und l\u00e4sst sich nicht\n r\u00fcckg\u00e4ngig machen. Bitte\n denken Sie genau dar\u00fcber nach und akzeptieren Sie oder brechen Sie ab.\n ","contact.account.type.customer.conversion":"Zu Kunde konvertieren","contact.account.type.lead.conversion":"Zu Interessent konvertieren","sulu.upload.small-dropzone-title":"Klicken oder neue Version hierher ziehen","public.show-descriptions":"Beschreibungen anzeigen","template.example":"Beispiel","sulu.property.phone":"Telefon","sulu.property.password":"Passwort","sulu.property.link":"Link","sulu.property.email":"Email","sulu.property.color":"Farbe","sulu.property.date":"Datum","sulu.property.time":"Zeit","sulu.property.note":"Notiz","contact.accounts.bankAccount.label":"Konto","contact.accounts.bankAccounts.add.label":"Verbindung hinzuf.","contact.accounts.bankAccounts.edit.label":"Bankverbindung editieren","public.locked":"Gesperrt","contact.accounts.placeOfJurisdiction":"Gerrichtsstand","contact.termsOfPayment":"Zahlungsbed.","contact.termsOfDelivery":"Lieferbedingungen","contact.accounts.termsOfDelivery.select":"Bitte w\u00e4hlen ...","contact.accounts.termsOfPayment.select":"Bitte w\u00e4hlen ...","content-navigation.contacts.activities":"Aktivit\u00e4ten","contact.activities.remove":"Aktivit\u00e4t entfernen","contact.activities.type":"Typ","contact.activities.priority":"Priorit\u00e4t","contact.activities.status":"Status","contact.activities.subject":"Betreff","contact.activities.note":"Bemerkung","contact.activities.dueDate":"F\u00e4lligkeitsdatum","contact.activities.assignedContact":"Verantwortlicher","contact.contacts.activities.edit":"Aktivit\u00e4t editieren","contact.contacts.activities.add":"Aktivit\u00e4t hinzuf\u00fcgen","contact.activity.type.phone.intern":"Ausgehender Anruf","contact.activity.type.phone.extern":"Eingehender Anruf","contact.activity.type.mail.intern":"Eingehende Mail","contact.activity.type.mail.extern":"Ausgehende Mail","contact.activity.type.appointment":"Termin","contact.activity.type.noInterest":"Kein Interesse","contact.activity.type.recall":"Erneuter Anruf","contact.activity.state.open":"Offen","contact.activity.state.closed":"Abgeschlossen","contact.activity.state.inProgress":"In Arbeit","contact.activity.priority.low":"Niedrig","contact.activity.priority.mid":"Mittel","contact.activity.priority.high":"Hoch","content-navigation.contact.accounts.contacts":"Ansprechpersonen","fax.home":"Privat","contact.accounts.contact-remove":"Kontakt vom Unternehmen entfernen","contact.accounts.add-contact":"Kontakt hinzuf\u00fcgen","contact.accounts.corporation":"Gesellschaft","dropdown.no-selection":"Keine Angabe","content-navigation.contents.seo":"SEO","content-navigation.contents.excerpt":"Auszug & Kategorien","contact.contacts.main-contact":"Hauptansprechpartner","sulu.preview.auto":"Auto","sulu.preview.desktop":"Desktop","sulu.preview.tablet":"Tablet","sulu.preview.smartphone":"Smartphone","contact.accounts.responsiblePerson":"Verantwortlicher","select.edit-entries":"Bearbeiten","select.no-choice":"Keine Auswahl","select.add-item":"Neuer Eintrag","public.choose":"Ausw\u00e4hlen","public.visible":"sichtbar","public.of":"von","internal-links.add":"Interne Links hinzuf\u00fcgen","internal-links.nolinks-selected":"Keine internen Links ausgew\u00e4hlt","public.no-title":"Kein Titel","public.previous":"Zur\u00fcck","public.overview":"\u00dcbersicht","public.details":"Details","public.selection":"Auswahl","form.validation-warning":"Bitte \u00fcberpr\u00fcfen deine Eingabe.Erst wenn alle Felder korrekt ausgef\u00fcllt sind, kann gespeichert werden.","public.status":"Status","public.number":"Nummer","public.forbidden.description":"Operation verboten","public.forbidden":"Die verf\u00fcgbaren Berechtigungen reichen f\u00fcr diese Operation nicht aus","labels.successfully-saved":"Daten wurden erfolgreich gespeichert."} +{"contacts.sidebar.web-and-mail":"Web & Email","contacts.sidebar.mainContact":"Hauptansprechpartner","public.company":"Unternehmen","contacts.sidebar.mainCompany":"Hauptunternehmen","content-navigation.accounts.documents":"Dokumente","content-navigation.contacts.documents":"Dokumente","contact.contacts.assignment":"Zuordnung","contact.contacts.categories.label":"Kategorien","contact.account.add-account-contact":"Kontakt hinzuf\u00fcgen","contact.accounts.add-new-contact-to-account":"Kontakt erstellen und hinzuf\u00fcgen","contacttype.home":"Privat","contacttype.work":"Arbeit","contacts.sidebar.company":"Weitere Unternehmen","navigation.media":"Medien","navigation.media.collections":"Kollektionen","content-navigation.media.files":"Dateien","media.media.description":"Beschreibung","media.media.size":"Dateigr\u00f6\u00dfe","media.media.thumbnails":"Vorschaubild","sulu.media.new-collection":"Neue Kollektion","sulu.media.add-collection":"Neue Kollektion hinzuf\u00fcgen","content-navigation.media.settings":"Einstellungen","labels.success.media-save-desc":"Medien erfolgreich gespeichert","sulu.media.multiple-edit.title":"Medien bearbeiten","labels.success.media-upload-desc":"Medien erfolgreich hochgeladen.","media-selection.collections":"Kollektionen","media.collections.title":"Kollektionen","media.collection.title":"Kollektionstitel","labels.success.collection-save-desc":"Kollektion erfolgreich gespeichert","labels.success.collection-deleted-desc":"Kollektion erfolgreich gel\u00f6scht","sulu.collections.delete-collection":"Kollektion l\u00f6schen","media-selection.new-collection":"Neue Kollektion","media-selection.create-new-collection":"Neue Kollektion erstellen","media-selection.upload-to-collection":"In Kollektion hochladen","media-selection.upload-new":"Neu hochladen","media-selection.add-images":"Bilder hinzuf\u00fcgen","media-selection.nomedia-selected":"Keine Medien ausgew\u00e4hlt","security.user.error.notUnique":"Dieser Benutzername ist bereits vergeben!","security.user.error.missingPassword":"Zum Erstellen eines Benutzers wird ein Passwort ben\u00f6tigt!","security.user.activate":"User aktivieren","security.roles.error.non-unique":"Name der Rolle muss eindeutig sein","content-navigation.category.details":"Details","category.categories.title":"Kategorien","navigation.settings.categories":"Kategorien","sulu.category.new-category":"Neue Kategorie","sulu.category.category-name":"Kategoriename","sulu.category.category-key":"Kategorieschl\u00fcssel","labels.success.category-save-desc":"Kategorie erfolgreich gespeichert","labels.success.category-delete-desc":"Kategorie erfolgreich gel\u00f6scht","labels.error.category-unique-key":"Der Kategorieschl\u00fcssel muss einzigartig sein","labels.success.category-save-error":"Beim Speichern der Kategorie ist ein Fehler aufgetreten","sulu.category.no-categories-available":"Keine Kategorien verf\u00fcgbar","navigation.snippets":"Schnipsel","snippets.snippet.title":"Schnipsel","snippets.list.template":"Typ","content-navigation.snippets.details":"Details","navigation.global-content":"Globale Inhalte","snippet-content.add":"Schnipsel ausw\u00e4hlen","snippet.delete-referenced-by-following":"Dieses Schnipsel wird von folgenden Seiten referenziert:","snippet.delete-confirm-text":"Sind Sie sicher, dass Sie dieses Schnipsel l\u00f6schen wollen?","snippet.delete-confirm-title":"L\u00f6schen best\u00e4tigen","snippet.delete-do-it":"Ja, ich bin sicher","snippet.delete-no-snippets-selected":"Sie haben kein Schnipsel ausgew\u00e4hlt","snippet-content.nosnippets-selected":"Keine Schnipsel ausgew\u00e4hlt","public.url-history.none":"Keine alten URLs f\u00fcr diesen Inhalt vorhanden ...","single-internal-link.title":"Interner Link ausw\u00e4hlen","content-navigation.contents.internal-link":"Interner Link","content-navigation.contents.external-link":"Externer Link","sulu.content.form.settings.show-in-navigation":"In Navigation anzeigen","sulu.content.form.settings.type":"Inhalts Typ","sulu.content.form.settings.type.content":"Inhalt","sulu.content.form.settings.type.internal-link":"Interner Link","sulu.content.form.settings.type.external-link":"Externer Link","content.contents.settings.delete":"Seite l\u00f6schen","content.contents.settings.copy":"Seite kopieren","content.contents.settings.copy.title":"Elternseite w\u00e4hlen","content.contents.settings.move":"Seite verschieben","content.contents.settings.move.title":"Elternseite w\u00e4hlen","content.contents.settings.order":"Seiten sortieren","content.contents.settings.order.title":"Seite platzieren","smart-content.nocontent-found":"Keinen Inhalt gefunden","smart-content.nocontent-selected":"Nichts ausgew\u00e4hlt","smart-content.visible":"sichtbar","smart-content.of":"von","smart-content.configure-smart-content":"{title} konfigurieren","smart-content.data-source":"Datenquelle","smart-content.include-sub-folders":"Unterordner mit einbeziehen","smart-content.filter-by-category":"Nach Kategorie filtern","smart-content.filter-by-tags":"Nach Tags filtern","smart-content.sort-by":"Sortieren nach","smart-content.no-sorting":"Standard Sortierung","smart-content.ascending":"Aufsteigend","smart-content.descending":"Absteigend","smart-content.present-as":"Darstellen als","smart-content.limit-result-to":"Ergebnis limitieren auf","smart-content.no-category":"Keine Kategorie","smart-content.choose-present-as":"ausw\u00e4hlen..","smart-content.choose-data-source":"Datenquelle w\u00e4hlen","smart-content.from":"Von","smart-content.sub-folders-inclusive":"inkl. Unterordner","smart-content.view-all":"alle ansehen","smart-content.view-less":"weniger ansehen","smart-content.title":"Titel","content.template.dialog.titile":"Template \u00e4ndern","content.template.dialog.content":"Es gibt ver\u00e4nderte Daten.Die Seite trotzdem verlassen?","content.template.dialog.submit-button":"Ja","content.template.dialog.cancel-button":"Abbrechen","content.delete.dialog.title":"Seite l\u00f6schen","content.delete.dialog.content":"Soll der ausgew\u00e4hlte Seite wirklich gel\u00f6scht werden?","content.delete.dialog.cancel":"Lieber nicht","content.delete.dialog.submit":"Passt","content.contents.show-ghost-pages":"Ghost- und Shadow- Seiten anzeigen","content.preview.resolutions":"Bildschirmauf\u00f6sungen","sulu.content.add-type":"Block hinzuf\u00fcgen","smart-content.data-source.label":"Datenquelle","smart-content.data-source.button":"Quelle w\u00e4hlen","smart-content.choose-data-source.cancel":"Abbrechenk","sulu.content.seo.title":"Titel","sulu.content.seo.description":"Beschreibung","sulu.content.seo.keywords":"Keywords","sulu.content.seo.canonical":"Canonical (Canonical Tag)","sulu.content.seo.robots":"Robots Einstellungen (robots.txt)","sulu.content.seo.robots.no-index":"no-index (Seite wird nicht von Suchmaschinen indiziert)","sulu.content.seo.robots.no-follow":"no-follow (Links auf der Seite wird von Suchmaschinen nicht gefolgt)","sulu.content.seo.sitemap":"Sitemap","sulu.content.seo.sitemap.hide":"In Sitemap ausblenden","sulu.content.excerpt.title":"Titel","sulu.content.excerpt.description":"Beschreibung","sulu.content.excerpt.images":"Bilder","sulu.content.seo.descriptions.note":"Die Meta-Beschreibung ist auf 155 Zeichen limitiert.","sulu.content.seo.characters-left":"Zeichen \u00fcbrig","sulu.content.seo.keywords.note":"Bitte benutze max. 5 Keywords, abh\u00e4ngig vom Inhalt der Seite, getrennt durch Kommas.","sulu.content.seo.keywords-left":"Keywords \u00fcbrig.","content.contents.title":"Inhalte","sulu.content.form.settings.nav-contexts":"Navigations Kontexte","sulu.content.form.settings.all-nav-contexts":"Alle Navigations Kontexte ausgew\u00e4hlt ...","sulu.content.form.settings.no-nav-contexts":"Keinen Navigations Kontexte ausgew\u00e4hlt ...","sulu.content.form.settings.shadow_page":"Shadow Page","sulu.content.form.settings.shadow.enable":"Shadow Page aktivieren","sulu.content.form.settings.shadow.base_language":"Shadow Page Sprache","sulu.content.form.settings.shadow.no_base_language":"Keine Shadow Page Sprache vorhanden ...","sulu.content.form.settings.shadow.select_base_language":"Sprache ausw\u00e4hlen ...","sulu.content.form.settings.type.internal-link.title":"Titel","sulu.content.form.settings.type.internal-link.link":"Verlinkter Inhalt","sulu.content.form.settings.type.external-link.title":"Titel","sulu.content.form.settings.type.external-link.url":"URL","sulu.content.sort.blocks":"Textbl\u00f6cke sortieren","sulu.content.edit.blocks":"Textbl\u00f6cke editieren","content.contents.settings.copy-locales.title":"Sprachvarianten kopieren","content.contents.settings.copy-locales.copy-from":"Ausgangssprache","content.contents.settings.copy-locales.current-language":"Aktuelle Sprache","content.contents.settings.copy-locales.target":"Zielsprachen","content.contents.settings.copy-locales.info":"Neue Seite wird erstellt","content.contents.settings.copy-locales.ok":"Sprachvarianten kopieren","content.contents.settings.copy-locale.title":"Was w\u00fcrden sie gerne tun?","content.contents.settings.copy-locale.info":"Diese Seite existiert nicht.Bitte w\u00e4hlen Sie eine der folgenden Optionen:","content.contents.settings.copy-locale.new":"Erstellen Sie eine neue leere Seite<\/b> in dieser Sprache","content.contents.settings.copy-locale.copy":"Erstellen Sie eine neue Seite in dieser Sprache und kopieren Sie den Inhalt von<\/b>:","content.contents.settings.copy-locale.select-default":"Ausw\u00e4hlen ...","content.contents.settings.copy-locale-overlay.ok":"Seite erstellen","toolbar.copy-locale":"Sprachvarianten kopieren","content.contents.new":"Seite erstellen","content.contents.settings.copy-locales.default-label":"Sprache ausw\u00e4hlen ...","content.contents.start-preview":"Vorschau starten","tag.error.notUnique":"Der eingegebene Tagname ist nicht eindeutig!","navigation.settings.cache":"Cache","sulu.website.cache.remove":"Cache leeren","sulu.website.cache.title":"Cache Einstellungen","sulu.website.cache.remove.success.title":"Cache","sulu.website.cache.remove.success.description":"wurde erfolgreich geleert","sulu.website.cache.remove.error.title":"Cache","sulu.website.cache.remove.error.description":"konnte nicht geleert werden","sulu.location.configure":"Ort ausw\u00e4hlen","sulu.location.locate-address":"Adresse anlegen","sulu.location.title":"Titel","sulu.location.street":"Stra\u00dfe","sulu.location.number":"Nummer","sulu.location.code":"Postleitzahl","sulu.location.town":"Stadt","sulu.location.country":"Land","sulu.location.coords":"Koordinaten (Long \/ Lat \/ Zoom)","sulu.location.map":"Karte","sulu.location.search":"Suche","public.name":"Name","public.key":"Schl\u00fcssel","public.edit":"Editieren","public.empty-list":"Diese Liste ist leer","public.tags":"Tags","public.show-tags":"Show tags","public.view-all":"view all","public.view-less":"view less","header.add":"Hinzuf\u00fcgen","header.save":"Speichern","header.saved":"Gespeichert","header.delete":"L\u00f6schen","navigation.list":"Zur\u00fcck zur Liste","translate.package.title":"Paket","translate.package.catalogues":"Sprachkataloge","translate.package.settings.locale":"Region","translate.package.settings.addCatalogue":"Region hinzuf\u00fcgen","translate.package.details.key":"Code","translate.package.details.translation":"\u00dcbersetzung","translate.package.details.suggestion":"Vorschlag","translate.package.details.maxLength":"Maximale L\u00e4nge","translate.package.details.length":"L\u00e4nge","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Element Hinzuf\u00fcgen","public.delete":"L\u00f6schen","public.no-pages":"Keine Seiten","translate.package.settings.title":"Titel","contact.contacts.title":"Kontakt","contact.contacts.contactTitle":"Titel","contact.contacts.firstName":"Vorname","contact.contacts.lastName":"Nachname","contact.contacts.position":"Position","contact.contacts.company":"Unternehmen","contact.form.addEmail":"E-Mail hinzuf\u00fcgen","contact.form.addPhone":"Telefon hinzuf\u00fcgen","contact.form.addAddress":"Addresse hinzuf\u00fcgen","contact.address.street":"Stra\u00dfe","contact.address.number":"Nummer","contact.address.additional":"Haus, Stock, etc.","contact.address.zip":"Postleitzahl","contact.address.city":"Stadt","contact.address.state":"Region","contact.address.country":"Land","public.email":"E-Mail","public.phone":"Telefon","public.address":"Adresse","email.home":"Privat","email.work":"Arbeit","phone.home":"Privat","phone.work":"Arbeit","phone.fax":"Fax","address.home":"Privat","address.work":"Arbeit","country.austria":"\u00d6sterreich","country.germany":"Deutschland","contact.accounts.title":"Unternehmen","contact.accounts.name":"Unternehmen","contact.accounts.website":"Internetseite","contact.accounts.company":"Geh\u00f6rt zu","security.roles.title":"Berechtigungen","security.roles.name":"Rollen Titel","security.roles.system":"System","security.roles.godMode":"Gott Modus","security.roles.godModeDescription":"Das ist der Gott Modus","security.roles.section":"Sektion","security.roles.permissions":"Berechtigungen","security.roles.all":"Alle ausw\u00e4hlen","security.roles.none":"Keine ausw\u00e4hlen","security.roles.security-type":"Typ","security.permission.title":"Benutzername & Passwort","security.permission.username":"Benutzername","security.permission.password":"Passwort","security.permission.passwordRepeat":"Passwort wiederholen","security.permission.email":"Prim\u00e4re email","security.permission.titlePermissions":"Berechtigungen","security.permission.role.title":"Titel","security.permission.role.language":"Sprache","security.permission.role.permissions":"Berechtigungen","security.permission.role.chooseLanguage":"Sprache ausw\u00e4hlen","security.permission.role.allLanguages":"Alle ausgew\u00e4hlt","toolbar.delete":"L\u00f6schen","sulu.list-toolbar.import":"Importieren","sulu.list-toolbar.export":"Exportieren","navigation.tools":"Werkzeuge","navigation.settings":"Einstellungen","navigation.settings.roles":"Berechtigungen","navigation.settings.translate":"\u00dcbersetzungen","navigation.contacts":"Kontakte","navigation.contacts.people":"Personen","navigation.contacts.companies":"Unternehmen","navigation.webspaces":"Globale Inhalte & Webspaces","navigation.webspaces.pages":"Seiten","navigation.version-history":"Versionsverlauf","navigation.user":"Benutzer","content-navigation.security.permissions":"Berechtigungen","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.content":"Inhalte","content-navigation.contents.settings":"Einstellungen","public.search":"Suchen ...","navigation.hide":"Verstecken","navigation.show":"Anzeigen","security.permission.locale":"Systemsprache","pagination.page":"Seite","pagination.of":"von","pagination.elements":"Elemente","pagination.show":"Zeige","pagination.elements-of":"Elemente von","pagination.elements-per-page":"Elemente pro Seite","pagination.show-all-elements":"Alle Elemente anzeigen","navigation.settings.tags":"Tags","public.id":"ID","list-toolbar.column-options":"Spalten Optionen","tags.name":"Bezeichnung","tags.author":"Author","tags.changed":"Zuletzt ge\u00e4ndert","public.changed":"Zuletzt ge\u00e4ndert","public.created":"Erstellt am","contact.contacts.birthday":"Geburtstag","contact.contacts.middleName":"Zwischenname","public.title":"Titel","tag.tags.title":"Tags","toolbar.state-publish":"Ver\u00f6ffentlicht","toolbar.state-unpublish":"Verstecken","toolbar.state-test":"Test","template.default":"Standard","template.simple":"Einfach","template.overview":"\u00dcberblick","template.complex":"Komplex","public.published":"Ver\u00f6ffentlicht","labels.state-changed.success-desc":"Status ge\u00e4ndert","labels.success":"Erfolg","labels.state-changed.error-desc":"Status konnte nicht ge\u00e4ndert werden","labels.error":"Fehler","labels.warning":"Warnung","labels.success.content-deleted-desc":"Seite erfolgreich gel\u00f6scht.","labels.success.content-save-desc":"Node erfolgreich gespeichert.","labels.error.content-save-desc":"Seite konnte nicht gespeichert werden.","sulu.matcher.unmatched-column":"Nicht zugeordnete Spalte","sulu.matcher.matched-column":"Zugeordnete Spalte","sulu.matcher.edit":"Bearbeiten","sulu.matcher.skip":"\u00dcberspringen","sulu.matcher.skipped":"\u00dcbersprungen","sulu.matcher.column":"Spalte","sulu.matcher.please-choose":"Bitte w\u00e4hlen..","navigation.pim":"PIM","navigation.pim.products":"Produkte","pim.products.title":"Produkte","products.key":"Schl\u00fcssel","products.contractual-article":"Vertraglicher Artikel","products.name":"Name","products.article-number":"Artikelnummer","products.manufacturer":"Hersteller","products.categories":"Kategorien","products.last-imported":"Zuletzt importiert","sulu.products.import":"Import","sulu.products.map-header":"Header zuordnen","sulu.products.map-header-desc":"Bitte Spalten der existierenden Datenstruktur zuordnen.","sulu.products.unmatched-columns":"Nicht zugeordnete Spalten","public.deactivate":"Deaktivieren","contact.account.type.basic":"Kontakt","contact.account.type.lead":"Interessent","contact.account.type.customer":"Kunde","contact.account.type.supplier":"Lieferant","contact.account.add-basic":"Neues Unternehmen erstellen","contact.account.add-lead":"Neuen Interessenten erstellen","contact.account.add-customer":"Neuen Kunden erstellen","contact.account.add-supplier":"Neuen Lieferanten erstellen","contact.accounts.type":"Typ","public.add-fields":"Neue Felder hinzuf\u00fcgen","public.edit-fields":"Felder editieren","public.fax":"Fax","public.url":"Website","public.note":"Notiz","public.all":"Alle","public.comments":"Kommentare","contact.add.address":"Adresse hinzuf\u00fcgen","dropdown.please-choose":"Bitte w\u00e4hlen..","navigation.webspaces.content":"Inhalte","navigation.webspaces.index-page":"Startseite","url.home":"Privat","sulu.overlay.be-careful":"Sei vorsichtig","sulu.overlay.delete-desc":"Die Operation die Sie machen m\u00f6chten l\u00f6scht Daten und l\u00e4sst sich nicht r\u00fcckg\u00e4ngig machen. Bitte\n denken Sie genau dar\u00fcber nach und akzeptieren Sie oder brechen Sie ab.\n ","sulu.overlay.unsaved-changes-confirm":"Sie haben \u00c4nderungen die noch nicht gespeichert wurden.Wollen Sie wirklich fortfahren ohne zu speichern?","sulu.overlay.save-unsaved-changes-confirm":"Sie haben \u00c4nderungen die noch nicht gespeichert wurden.Wollen Sie speichern und fortfahren?","public.show-history":"Verlauf anzeigen","public.url-history":"Url Verlauf","sulu.property.title":"Titel","sulu.property.url":"Url","sulu.property.block.title":"Titel","sulu.property.block.article":"Artikel","sulu.property.tags":"Tags","sulu.property.article":"Artikel","sulu.property.smartcontent":"Smart-content","sulu.property.block":"Block","sulu.type.editor":"Editor","sulu.type.area":"Text","sulu.type.title_only":"Titel","contacts.accounts.manage.categories.title":"Kategorien","contacts.accounts.manage.categories":"Eintr\u00e4ge editieren","contacts.accounts.category.select":"Kategorie ausw\u00e4hlen","contacts.accounts.category":"Kategorie","sulu.overlay.delete-no-items":"Es wurden keine Felder ausgew\u00e4hlt.","sulu.overlay.error":"Fehler!","contact.accounts.delete.sub-found":"Ein oder mehrere Tochterunternehmen gefunden.","contact.accounts.delete.sub-found-desc":"Ein Unternehmen kann nicht gel\u00f6scht werden, solange es Tochterunternehmen hat. Bitte l\u00f6schen sie\n das Tochterunternehmen oder entfernen sie die Relation.\n ","contact.accounts.delete.desc":"Wollen Sie wirklich das ausgew\u00e4hlte Unternehmen l\u00f6schen? Die gespeicherten Daten gehen dabei\n verloren.\n ","public.and-number-more":"und <%= number %> weitere","contact.accounts.delete.contacts":"Alle <%= number %> zugeh\u00f6rigen Kontakte entfernen.","contact.accounts.delete.contacts-found":"Es wurden zugeh\u00f6rige Kontakte gefunden.","contact.accounts.delete.contacts-question":"Wollen sie die zugeh\u00f6rigen Kontakte zusammen mit dem Unternehmen l\u00f6schen?","contact.accounts.delete.contacts-checkbox":"Alle <%= number %> zugeh\u00f6rigen Kontakte l\u00f6schen.","public.open-all":"Alle \u00f6ffnen","public.close-all":"Alle schlie\u00dfen","pagination.show-all":"Zeige alle","public.elements":"Elemente","sulu.upload.dropzone-title":"Files hierher ziehen um hochzuladen","sulu.upload.dropzone-desc":"oder klicken um hinzuzuf\u00fcgen","sulu.list-toolbar.small-thumbnails":"Kleine Vorschaubilder","sulu.list-toolbar.big-thumbnails":"Gro\u00dfe Vorschaubilder","sulu.list-toolbar.table":"Tabelle","contact.accounts.number":"Nummer","contact.accounts.registerNumber":"Firmenbuchnummer","contact.accounts.uid":"UID","contact.accounts.division":"Abteilung","public.disabled":"Deaktiviert","navigation.financials":"Finanzdaten","contact.accounts.bankName":"Name der Bank","contact.accounts.bank-accounts":"Bankverbindungen","contact.accounts.add-bank-account":"Neues Konto hinzuf\u00fcgen","public.public":"\u00d6ffentlich","public.iban":"IBAN","public.bic":"BIC","contact.accounts.manage.categories.title":"Kategorien verwalten","contact.accounts.manage.categories":"Kategorien verwalten","contact.accounts.category.select":"Kategorie ausw\u00e4hlen","contact.accounts.category":"Kategorie","public.please-choose":"Bitte w\u00e4hlen","contacts.edit-address":"Adresse editieren","contact.accounts.bonusSettlement":"Bonusabrechnung","contact.accounts.bonusConditions":"Bonuskonditionen","contact.accounts.correspondence":"Korrespondenz per","contact.contacts.salutation":"Gru\u00dfformel","contact.contacts.formOfAddress":"Anrede","contact.contacts.formOfAddress.select":"Anrede ausw\u00e4hlen","contact.contacts.formOfAddress.male":"Herr","contact.contacts.formOfAddress.female":"Frau","public.color":"Farbe","contact.contacts.details":"Kontaktdetails","url.work":"Arbeit","fax.work":"Arbeit","public.internal":"Intern","address.delivery":"Lieferadresse","address.invoice":"Rechnungsadresse","phone.mobile":"Mobil","public.forbidden.description":"Operation verboten","public.forbidden":"Die verf\u00fcgbaren Berechtigungen reichen f\u00fcr diese Operation nicht aus","public.server_error":"Serverfehler","contact.contacts.hobbies":"Hobbies","contact.contacts.partner":"Partner","contact.contacts.aviso":"Aviso an","public.add-entry":"Neuen Eintrag erstellen","public.edit-entries":"Eintr\u00e4ge editieren","public.info":"Info","public.description":"Beschreibung","contact.contacts.isPoolAlpinEmployee":"PA-Mitarbeiter","contact.address.primaryAddress":"Prim\u00e4re Adresse","contact.address.deliveryAddress":"Lieferadresse","contact.address.billingAddress":"Rechnungsadresse","contact.address.type":"Adresstyp","contact.address.postbox.number":"Postfach #","contact.address.postbox.postcode":"Postfach PLZ","contact.address.postbox.city":"Postfach Stadt","contact.address.type.select":"Adresstyp ausw\u00e4hlen","contact.address.add.label":"Adresse hinzuf\u00fcgen","contact.accounts.type.conversion.message":"Die Operation die Sie machen m\u00f6chten konvertiert dieses Unternehmen und l\u00e4sst sich nicht\n r\u00fcckg\u00e4ngig machen. Bitte\n denken Sie genau dar\u00fcber nach und akzeptieren Sie oder brechen Sie ab.\n ","contact.account.type.customer.conversion":"Zu Kunde konvertieren","contact.account.type.lead.conversion":"Zu Interessent konvertieren","sulu.upload.small-dropzone-title":"Klicken oder neue Version hierher ziehen","public.show-descriptions":"Beschreibungen anzeigen","template.example":"Beispiel","sulu.property.phone":"Telefon","sulu.property.password":"Passwort","sulu.property.link":"Link","sulu.property.email":"Email","sulu.property.color":"Farbe","sulu.property.date":"Datum","sulu.property.time":"Zeit","sulu.property.note":"Notiz","contact.accounts.bankAccount.label":"Konto","contact.accounts.bankAccounts.add.label":"Verbindung hinzuf.","contact.accounts.bankAccounts.edit.label":"Bankverbindung editieren","public.locked":"Gesperrt","contact.accounts.placeOfJurisdiction":"Gerrichtsstand","contact.termsOfPayment":"Zahlungsbed.","contact.termsOfDelivery":"Lieferbedingungen","contact.accounts.termsOfDelivery.select":"Bitte w\u00e4hlen ...","contact.accounts.termsOfPayment.select":"Bitte w\u00e4hlen ...","content-navigation.contacts.activities":"Aktivit\u00e4ten","contact.activities.remove":"Aktivit\u00e4t entfernen","contact.activities.type":"Typ","contact.activities.priority":"Priorit\u00e4t","contact.activities.status":"Status","contact.activities.subject":"Betreff","contact.activities.note":"Bemerkung","contact.activities.dueDate":"F\u00e4lligkeitsdatum","contact.activities.assignedContact":"Verantwortlicher","contact.contacts.activities.edit":"Aktivit\u00e4t editieren","contact.contacts.activities.add":"Aktivit\u00e4t hinzuf\u00fcgen","contact.activity.type.phone.intern":"Ausgehender Anruf","contact.activity.type.phone.extern":"Eingehender Anruf","contact.activity.type.mail.intern":"Eingehende Mail","contact.activity.type.mail.extern":"Ausgehende Mail","contact.activity.type.appointment":"Termin","contact.activity.type.noInterest":"Kein Interesse","contact.activity.type.recall":"Erneuter Anruf","contact.activity.state.open":"Offen","contact.activity.state.closed":"Abgeschlossen","contact.activity.state.inProgress":"In Arbeit","contact.activity.priority.low":"Niedrig","contact.activity.priority.mid":"Mittel","contact.activity.priority.high":"Hoch","content-navigation.contact.accounts.contacts":"Ansprechpersonen","fax.home":"Privat","contact.accounts.contact-remove":"Kontakt vom Unternehmen entfernen","contact.accounts.add-contact":"Kontakt hinzuf\u00fcgen","contact.accounts.corporation":"Gesellschaft","dropdown.no-selection":"Keine Angabe","content-navigation.contents.seo":"SEO","content-navigation.contents.excerpt":"Auszug & Kategorien","contact.contacts.main-contact":"Hauptansprechpartner","sulu.preview.auto":"Auto","sulu.preview.desktop":"Desktop","sulu.preview.tablet":"Tablet","sulu.preview.smartphone":"Smartphone","contact.accounts.responsiblePerson":"Verantwortlicher","select.edit-entries":"Bearbeiten","select.no-choice":"Keine Auswahl","select.add-item":"Neuer Eintrag","public.choose":"Ausw\u00e4hlen","public.visible":"sichtbar","public.of":"von","internal-links.add":"Interne Links hinzuf\u00fcgen","internal-links.nolinks-selected":"Keine internen Links ausgew\u00e4hlt","public.no-title":"Kein Titel","public.previous":"Zur\u00fcck","public.overview":"\u00dcbersicht","public.details":"Details","public.selection":"Auswahl","form.validation-warning":"Bitte \u00fcberpr\u00fcfen deine Eingabe.Erst wenn alle Felder korrekt ausgef\u00fcllt sind, kann gespeichert werden.","public.status":"Status","public.number":"Nummer","labels.successfully-saved":"Daten wurden erfolgreich gespeichert."} \ No newline at end of file diff --git a/web/admin/translations/sulu.en.json b/web/admin/translations/sulu.en.json index 28704cc409..49fe5b105b 100644 --- a/web/admin/translations/sulu.en.json +++ b/web/admin/translations/sulu.en.json @@ -1 +1 @@ -{"contacts.sidebar.web-and-mail":"Web & Email","contacts.sidebar.mainContact":"Main contact","public.company":"Company","contacts.sidebar.mainCompany":"Main company","content-navigation.accounts.documents":"Documents","content-navigation.contacts.documents":"Documents","contact.contacts.assignment":"Assignment","contact.contacts.categories.label":"Categories","contact.account.add-account-contact":"Add contact","contact.accounts.add-new-contact-to-account":"Create and add new contact","navigation.media":"Assets","navigation.media.collections":"Collections","content-navigation.media.files":"Files","media.media.description":"Description","media.media.size":"Filesize","media.media.thumbnails":"Thumbnail","sulu.media.new-collection":"New collection","sulu.media.add-collection":"Add new collection","content-navigation.media.settings":"Settings","labels.success.media-save-desc":"Media successfully saved","sulu.media.multiple-edit.title":"Edit medias","labels.success.media-upload-desc":"Media successfully uploaded.","media-selection.collections":"Collections","media.collections.title":"Collections","media.collection.title":"Collection title","labels.success.collection-save-desc":"Collection successfully saved","labels.success.collection-deleted-desc":"Collection successfully deleted","sulu.collections.delete-collection":"Delete collection","media-selection.new-collection":"New collection","media-selection.create-new-collection":"Create new collection","media-selection.upload-to-collection":"Upload to collection","media-selection.upload-new":"Upload new","media-selection.add-images":"Add images","media-selection.nomedia-selected":"No media selected","security.user.error.notUnique":"This username is already in use!","security.user.error.missingPassword":"To add a new user you need to define a password!","security.user.activate":"Activate user","content-navigation.category.details":"Details","category.categories.title":"Categories","navigation.settings.categories":"Categories","sulu.category.new-category":"New category","sulu.category.category-name":"Category name","sulu.category.category-key":"Category key","labels.success.category-save-desc":"Category successfully saved","labels.success.category-delete-desc":"Category successfully deleted","labels.error.category-unique-key":"The category key has to be unique","labels.success.category-save-error":"An error occurred while saving the category","sulu.category.no-categories-available":"No categories available","navigation.snippets":"Snippets","snippets.snippet.title":"Snippets","snippets.list.template":"Type","content-navigation.snippets.details":"Details","navigation.global-content":"Global Content","snippet-content.add":"Choose snippet","snippet.delete-referenced-by-following":"This snippet is referenced by the following pages:","snippet.delete-confirm-text":"Are you sure you want to remove it?","snippet.delete-confirm-title":"Confirm delete","snippet.delete-do-it":"Yes, I am sure","snippet.delete-no-snippets-selected":"There are no snippets selected","snippet-content.nosnippets-selected":"No snippets selected","public.url-history.none":"No history for this node exists ...","single-internal-link.title":"Select single Internal Link","content-navigation.contents.internal-link":"Internal Link","content-navigation.contents.external-link":"External Link","sulu.content.form.settings.show-in-navigation":"Show in Navigation","sulu.content.form.settings.type":"Content Type","sulu.content.form.settings.type.content":"Content","sulu.content.form.settings.type.internal-link":"Internal Link","sulu.content.form.settings.type.external-link":"External Link","content.contents.settings.delete":"Delete node","content.contents.settings.copy":"Copy page","content.contents.settings.copy.title":"Choose parent-page","content.contents.settings.move":"Move page","content.contents.settings.move.title":"Choose parent-page","content.contents.settings.order":"Order pages","content.contents.settings.order.title":"Place node","smart-content.nocontent-found":"No content found","smart-content.nocontent-selected":"No content selected","smart-content.visible":"visible","smart-content.of":"of","smart-content.configure-smart-content":"Configure {title}","smart-content.data-source":"Data source","smart-content.include-sub-folders":"Include sub-pages","smart-content.filter-by-category":"Filter by category","smart-content.filter-by-tags":"Filter by tags","smart-content.sort-by":"Sort by","smart-content.no-sorting":"Default Sorting","smart-content.ascending":"Ascending","smart-content.descending":"Descending","smart-content.present-as":"Present as","smart-content.limit-result-to":"Limit result to","smart-content.no-category":"No category","smart-content.choose-present-as":"Choose..","smart-content.choose-data-source":"Choose data source","smart-content.from":"From","smart-content.sub-folders-inclusive":"incl. sub folders","smart-content.view-all":"view all","smart-content.view-less":"view less","smart-content.title":"Title","content.template.dialog.titile":"Change Template","content.template.dialog.content":"You have unchanged Data.Do you want to leave this site?","content.template.dialog.submit-button":"Yes","content.template.dialog.cancel-button":"Cancel","content.delete.dialog.title":"Delete Node","content.delete.dialog.content":"Do you realy want to delete the selected node?","content.delete.dialog.cancel":"Don't do it","content.delete.dialog.submit":"Do it, I understand","content.contents.show-ghost-pages":"Show ghosts and shadow pages","content.preview.resolutions":"Resolutions","sulu.content.add-type":"Add Block","smart-content.data-source.label":"Data source","smart-content.data-source.button":"Choose source","smart-content.choose-data-source.cancel":"Back","sulu.content.seo.title":"Title","sulu.content.seo.description":"Description","sulu.content.seo.keywords":"Keywords","sulu.content.seo.canonical":"Canonical URL (Canonical Tag)","sulu.content.seo.robots":"Robots settings (robots.txt)","sulu.content.seo.robots.no-index":"no-index (page will not be indexed by search engines)","sulu.content.seo.robots.no-follow":"no-follow (links on this page will not be followed by the search engine)","sulu.content.excerpt.title":"Title","sulu.content.excerpt.description":"Description","sulu.content.excerpt.images":"Images","sulu.content.seo.descriptions.note":"The meta description is limited to 155 characters.","sulu.content.seo.characters-left":"characters left","sulu.content.seo.keywords.note":"Please use a max. of 5 keywords, dependend from the content of the page, seperated by commas.","sulu.content.seo.keywords-left":"keywords left","content.contents.title":"Content","sulu.content.form.settings.nav-contexts":"Navigation context","sulu.content.form.settings.all-nav-contexts":"All navigation contexts chosen ...","sulu.content.form.settings.no-nav-contexts":"No navigation contexts chosen ...","sulu.content.form.settings.shadow_page":"Shadow Page","sulu.content.form.settings.shadow.enable":"Enable Shadow","sulu.content.form.settings.shadow.base_language":"Shadow Base Language","sulu.content.form.settings.shadow.no_base_language":"No Shadow Page language exists ...","sulu.content.form.settings.shadow.select_base_language":"Choose language ...","sulu.content.form.settings.type.internal-link.title":"Title","sulu.content.form.settings.type.internal-link.link":"Linked Content","sulu.content.form.settings.type.external-link.title":"Title","sulu.content.form.settings.type.external-link.url":"URL","sulu.content.sort.blocks":"Sort text blocks","sulu.content.edit.blocks":"Edit text blocks","content.contents.settings.copy-locales.title":"Copy language","content.contents.settings.copy-locales.copy-from":"Copy from","content.contents.settings.copy-locales.current-language":"current language","content.contents.settings.copy-locales.target":"Target languages","content.contents.settings.copy-locales.info":"New page will be created","content.contents.settings.copy-locales.ok":"Copy languages","content.contents.settings.copy-locale.title":"What would you like to do?","content.contents.settings.copy-locale.info":"This page does not exists in this language.Please select one of the following options:","content.contents.settings.copy-locale.new":"Create a new empty page<\/b> in this language","content.contents.settings.copy-locale.copy":"Create a new page in this language and copy content from<\/b>:","content.contents.settings.copy-locale.select-default":"Choose ...","content.contents.settings.copy-locale-overlay.ok":"Create page","toolbar.copy-locale":"Copy languages","content.contents.new":"Create page","content.contents.settings.copy-locales.default-label":"Choose language ...","tag.error.notUnique":"The tag name is not unique!","navigation.settings.cache":"Cache","sulu.website.cache.remove":"Cache clear","sulu.website.cache.title":"Cache settings","sulu.website.cache.remove.success.title":"Cache","sulu.website.cache.remove.success.description":"successfully cleared","sulu.website.cache.remove.error.title":"Cache","sulu.website.cache.remove.error.description":"clear failed","sulu.location.configure":"Configure Location","sulu.location.locate-address":"Locate Address","sulu.location.title":"Title","sulu.location.street":"Street","sulu.location.number":"Number","sulu.location.code":"Code","sulu.location.town":"Town","sulu.location.country":"Country","sulu.location.coords":"Coordinates (Long \/ Lat \/ Zoom)","sulu.location.map":"Map","sulu.location.search":"Search","public.name":"Name","public.key":"Key","public.edit":"Edit","public.empty-list":"This list is empty","public.tags":"Tags","public.show-tags":"Show tags","public.view-all":"view all","public.view-less":"view less","header.add":"Add","header.save":"Save","header.saved":"Saved","header.delete":"Delete","navigation.list":"Back to list","translate.package.title":"Package","translate.package.catalogues":"Language Catalogues","translate.package.settings.locale":"Locale","translate.package.settings.addCatalogue":"Add Catalogue","translate.package.details.key":"Key","translate.package.details.translation":"Translation","translate.package.details.suggestion":"Suggestion","translate.package.details.maxLength":"Maximum length","translate.package.details.length":"Length","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Add element","public.delete":"Delete","public.no-pages":"No Pages","translate.package.settings.title":"Title","contact.contacts.title":"Person","contact.contacts.contactTitle":"Title","contact.contacts.firstName":"First Name","contact.contacts.lastName":"Last Name","contact.contacts.position":"Position","contact.contacts.company":"Company","contact.form.addEmail":"Add E-Mail","contact.form.addPhone":"Add Phone","contact.form.addAddress":"Add Address","contact.address.street":"Street","contact.address.number":"Number","contact.address.additional":"Additional","contact.address.zip":"Postal Code","contact.address.city":"City","contact.address.state":"Region","contact.address.country":"Country","public.email":"E-Mail","public.phone":"Phone","public.address":"Address","email.home":"Home","email.work":"Work","phone.home":"Home","phone.work":"Work","phone.fax":"Fax","address.home":"Home","address.work":"Work","country.austria":"Austria","country.germany":"Germany","contact.accounts.title":"Account","contact.accounts.name":"Company","contact.accounts.website":"Website","contact.accounts.company":"Parent company","security.roles.title":"Permissions","security.roles.name":"Role title","security.roles.system":"System","security.roles.godMode":"God Mode","security.roles.godModeDescription":"Thats the god mode","security.roles.section":"Section","security.roles.permissions":"Permissions","security.roles.all":"Select all","security.roles.none":"Select none","security.roles.security-type":"Type","security.permission.title":"Username and Password","security.permission.username":"Username","security.permission.password":"Password","security.permission.passwordRepeat":"Repeat password","security.permission.email":"Default email","security.permission.titlePermissions":"Permissions","security.permission.role.title":"Title","security.permission.role.language":"Language","security.permission.role.permissions":"Permissions","security.permission.role.chooseLanguage":"Choose language","security.permission.role.allLanguages":"all selected","toolbar.delete":"Delete","sulu.list-toolbar.import":"Import","sulu.list-toolbar.export":"Export","navigation.tools":"Tools","navigation.settings":"Settings","navigation.settings.roles":"Permissions","navigation.settings.translate":"Translate","navigation.contacts":"CRM","navigation.contacts.people":"People","navigation.contacts.companies":"Accounts","navigation.webspaces":"Global Content & Webspaces","navigation.webspaces.pages":"Pages","navigation.version-history":"Version history","navigation.user":"User","content-navigation.security.permissions":"Permissions","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.content":"Content","content-navigation.contents.settings":"Settings","public.search":"Search ...","navigation.hide":"HIDE","navigation.show":"SHOW","security.permission.locale":"System language","pagination.page":"Page","pagination.of":"of","pagination.elements":"elements","pagination.show":"Show","pagination.elements-of":"elements of","pagination.elements-per-page":"elements per page","pagination.show-all-elements":"Show all elements","navigation.settings.tags":"Tags","public.id":"ID","list-toolbar.column-options":"Column options","tags.name":"Title","tags.author":"Author","tags.changed":"Last changed","public.changed":"Last changed","public.created":"Created on","contact.contacts.birthday":"Birthday","contact.contacts.middleName":"Middle Name","public.title":"Title","tag.tags.title":"Tags","toolbar.state-publish":"Published","toolbar.state-unpublish":"Unpublished","toolbar.state-test":"Test","template.default":"Default","template.simple":"Simple","template.overview":"Overview","template.complex":"Complex","public.published":"Published","labels.state-changed.success-desc":"state changed","labels.success":"Success","labels.state-changed.error-desc":"state could not be changed","labels.error":"Error","labels.warning":"Warning","labels.success.content-deleted-desc":"Node successfully deleted.","labels.success.content-save-desc":"Node sucessfully saved","labels.error.content-save-desc":"Node could not be saved.","sulu.matcher.unmatched-column":"Unmatched column","sulu.matcher.matched-column":"Matched column","sulu.matcher.edit":"Edit","sulu.matcher.skip":"Skip","sulu.matcher.skipped":"Skipped","sulu.matcher.column":"Column","sulu.matcher.please-choose":"Please choose..","navigation.pim":"PIM","navigation.pim.products":"Products","pim.products.title":"Products","products.key":"Key","products.contractual-article":"Contractual article","products.name":"Name","products.article-number":"Article number","products.manufacturer":"Manufacturer","products.categories":"Categories","products.last-imported":"Last imported","sulu.products.import":"Import","sulu.products.map-header":"Map header","sulu.products.map-header-desc":"Please map headers with existing data structure.","sulu.products.unmatched-columns":"Unmatched columns","public.deactivate":"Deactivate","contact.account.type.basic":"Contact","contact.account.type.lead":"Lead","contact.account.type.customer":"Customer","contact.account.type.supplier":"Supplier","contact.account.add-basic":"Create new account","contact.account.add-lead":"Create new lead","contact.account.add-customer":"Create new customer","contact.account.add-supplier":"Create new supplier","contact.accounts.type":"Type","public.add-fields":"Add new fields","public.edit-fields":"Edit fields","public.fax":"Fax","public.url":"Website","public.note":"Note","public.all":"All","public.comments":"Comments","contact.add.address":"Add address","dropdown.please-choose":"Please choose..","navigation.webspaces.content":"Content","navigation.webspaces.index-page":"Homepage","url.home":"Home","sulu.overlay.be-careful":"Be careful","sulu.overlay.delete-desc":"The operation you are about to do will delete data. This is not undoable! Please think about it\n and accept or decline.\n ","sulu.overlay.unsaved-changes-confirm":"You have unsaved changes.Do you realy want to continue without saving?","sulu.overlay.save-unsaved-changes-confirm":"You have unsaved changes.Would you like to save and continue?","public.show-history":"Show history","public.url-history":"Url history","sulu.property.title":"Title","sulu.property.url":"Url","sulu.property.block.title":"Title","sulu.property.block.article":"Article","sulu.property.tags":"Tags","sulu.property.article":"Article","sulu.property.smartcontent":"Smart-content","sulu.property.block":"Block","sulu.type.editor":"Editor","sulu.type.area":"Text","sulu.type.title_only":"Title","contacts.accounts.manage.categories.title":"Manage categories","contacts.accounts.manage.categories":"Manage categories","contacts.accounts.category.select":"Choose a Category","contacts.accounts.category":"Category","sulu.overlay.delete-no-items":"No items for deletion selected.","sulu.overlay.error":"Error!","contact.accounts.delete.sub-found":"One or more sub-companies found.","contact.accounts.delete.sub-found-desc":"A company cannot be deleted as long as it has sub-companies. Please delete the sub-companies or\n remove the relation.\n ","contact.accounts.delete.desc":"Do you really want to delete the selected company? All data is going to be lost.","public.and-number-more":"and <%= number %> more","contact.accounts.delete.contacts":"Delete all <%= number %> related contacts.","contact.accounts.delete.contacts-found":"Related contacts have been found.","contact.accounts.delete.contacts-question":"Would you like to delete them together with the selected company?","contact.accounts.delete.contacts-checkbox":"Delete all <%= number %> related contacts.","public.open-all":"Open all","public.close-all":"Close all","pagination.show-all":"Show all","public.elements":"elements","sulu.upload.dropzone-title":"Drag and drop assets here to upload","sulu.upload.dropzone-desc":"Or click to add","sulu.list-toolbar.small-thumbnails":"Small thumbnails","sulu.list-toolbar.big-thumbnails":"Large thumbnails","sulu.list-toolbar.table":"Table","contact.accounts.number":"Number","contact.accounts.registerNumber":"Register Number","contact.accounts.uid":"UID","contact.accounts.division":"Division","public.disabled":"Disabled","navigation.financials":"Financial Infos","contact.accounts.bankName":"Bank name","contact.accounts.bank-accounts":"Bank accounts","contact.accounts.add-bank-account":"Add new bank account","public.public":"Public","public.iban":"IBAN","public.bic":"BIC","contact.accounts.manage.categories.title":"Manage categories","contact.accounts.manage.categories":"Manage categories","contact.accounts.category.select":"Choose a category","contact.accounts.category":"Category","public.please-choose":"Please choose","contacts.edit-address":"Edit Address","contact.accounts.bonusSettlement":"Bonus-settlement","contact.accounts.bonusConditions":"Bonus-conditions","contact.accounts.correspondence":"Correspondence via","contact.contacts.salutation":"Salutation","contact.contacts.formOfAddress":"Form of address","contact.contacts.formOfAddress.select":"Choose form of address","contact.contacts.formOfAddress.male":"Mr.","contact.contacts.formOfAddress.female":"Mrs.","public.color":"Color","contact.contacts.details":"Contact details","url.work":"Work","fax.work":"Work","public.internal":"Internal","address.delivery":"Delivery address","address.invoice":"Invoice address","phone.mobile":"Mobile","contact.contacts.hobbies":"Hobbies","contact.contacts.partner":"Partner","contact.contacts.aviso":"Aviso to","public.add-entry":"Add new Entry","public.edit-entries":"Edit entries","public.info":"Info","public.description":"Description","contact.contacts.isPoolAlpinEmployee":"PA-Employee","contact.address.primaryAddress":"Primary address","contact.address.deliveryAddress":"Delivery address","contact.address.billingAddress":"Billing address","contact.address.type":"Address type","contact.address.postbox.number":"Postbox #","contact.address.postbox.postcode":"Postbox ZIP","contact.address.postbox.city":"Postbox city","contact.address.type.select":"Choose address type","contact.address.add.label":"Add address","contact.accounts.type.conversion.message":"The operation you are about to do will convert this account. This is not undoable! Please think\n about it and accept or decline.\n ","contact.account.type.customer.conversion":"Convert to customer","contact.account.type.lead.conversion":"Convert to lead","sulu.upload.small-dropzone-title":"Click or drag and drop new version","public.show-descriptions":"Show descriptions","template.example":"Example","sulu.property.phone":"Phone","sulu.property.password":"Password","sulu.property.link":"Link","sulu.property.email":"Email","sulu.property.color":"Color","sulu.property.date":"Date","sulu.property.time":"Time","sulu.property.note":"Note","contact.accounts.bankAccount.label":"Bank account","contact.accounts.bankAccounts.add.label":"Add bank account","contact.accounts.bankAccounts.edit.label":"Edit bank account","public.locked":"Locked","contact.accounts.placeOfJurisdiction":"Jurisdiction","contact.termsOfPayment":"Terms of payment","contact.termsOfDelivery":"Terms of delivery","contact.accounts.termsOfDelivery.select":"Please choose ...","contact.accounts.termsOfPayment.select":"Please choose ...","content-navigation.contacts.activities":"Activities","contact.activities.remove":"Remove activity","contact.activities.type":"Type","contact.activities.priority":"Priority","contact.activities.status":"Status","contact.activities.subject":"Subject","contact.activities.note":"Note","contact.activities.dueDate":"Duedate","contact.activities.assignedContact":"Contact","contact.contacts.activities.edit":"Edit activity","contact.contacts.activities.add":"Add activity","contact.activity.type.phone.intern":"Phone intern","contact.activity.type.phone.extern":"Phone extern","contact.activity.type.mail.intern":"Mail intern","contact.activity.type.mail.extern":"Mail extern","contact.activity.type.appointment":"Appointment","contact.activity.type.noInterest":"No interest","contact.activity.type.recall":"Recall","contact.activity.state.open":"Open","contact.activity.state.closed":"Closed","contact.activity.state.inProgress":"In progress","contact.activity.priority.low":"Low","contact.activity.priority.mid":"Mid","contact.activity.priority.high":"High","content-navigation.contact.accounts.contacts":"Contacts","fax.home":"Home","contact.accounts.contact-remove":"Remove contacts from company","contact.accounts.add-contact":"Add contact to company","contact.accounts.corporation":"Corporation","dropdown.no-selection":"No selection","content-navigation.contents.seo":"SEO","content-navigation.contents.excerpt":"Excerpt & Categories","contact.contacts.main-contact":"Main contact","sulu.preview.auto":"Auto","sulu.preview.desktop":"Desktop","sulu.preview.tablet":"Tablet","sulu.preview.smartphone":"Smartphone","contact.accounts.responsiblePerson":"Responsible","select.edit-entries":"Edit","select.no-choice":"No Selection","select.add-item":"New Entry","public.choose":"Choose","public.visible":"visible","public.of":"of","internal-links.add":"Add internal links","internal-links.nolinks-selected":"No internal links selected","public.no-title":"No Title","public.previous":"Back","public.overview":"Overview","public.details":"Details","public.selection":"Selection","form.validation-warning":"Please check your input.You cannot save as long as not all required fields are filled properly.","public.status":"Status","public.number":"Nummer","contact.account.condition.select":"Bitte w\u00e4hlen ...","public.current-entry":"Current","public.forbidden.description":"Operation forbidden","public.forbidden":"The available permissions are not sufficient for this operation","labels.successfully-saved":"Data has been successfully saved."} \ No newline at end of file +{"contacts.sidebar.web-and-mail":"Web & Email","contacts.sidebar.mainContact":"Main contact","public.company":"Company","contacts.sidebar.mainCompany":"Main company","content-navigation.accounts.documents":"Documents","content-navigation.contacts.documents":"Documents","contact.contacts.assignment":"Assignment","contact.contacts.categories.label":"Categories","contact.account.add-account-contact":"Add contact","contact.accounts.add-new-contact-to-account":"Create and add new contact","contacttype.home":"Home","contacttype.work":"Work","contacts.sidebar.company":"Other companies","navigation.media":"Assets","navigation.media.collections":"Collections","content-navigation.media.files":"Files","media.media.description":"Description","media.media.size":"Filesize","media.media.thumbnails":"Thumbnail","sulu.media.new-collection":"New collection","sulu.media.add-collection":"Add new collection","content-navigation.media.settings":"Settings","labels.success.media-save-desc":"Media successfully saved","sulu.media.multiple-edit.title":"Edit medias","labels.success.media-upload-desc":"Media successfully uploaded.","media-selection.collections":"Collections","media.collections.title":"Collections","media.collection.title":"Collection title","labels.success.collection-save-desc":"Collection successfully saved","labels.success.collection-deleted-desc":"Collection successfully deleted","sulu.collections.delete-collection":"Delete collection","media-selection.new-collection":"New collection","media-selection.create-new-collection":"Create new collection","media-selection.upload-to-collection":"Upload to collection","media-selection.upload-new":"Upload new","media-selection.add-images":"Add images","media-selection.nomedia-selected":"No media selected","security.user.error.notUnique":"This username is already in use!","security.user.error.missingPassword":"To add a new user you need to define a password!","security.user.activate":"Activate user","security.roles.error.non-unique":"Name of role has to be unique","content-navigation.category.details":"Details","category.categories.title":"Categories","navigation.settings.categories":"Categories","sulu.category.new-category":"New category","sulu.category.category-name":"Category name","sulu.category.category-key":"Category key","labels.success.category-save-desc":"Category successfully saved","labels.success.category-delete-desc":"Category successfully deleted","labels.error.category-unique-key":"The category key has to be unique","labels.success.category-save-error":"An error occurred while saving the category","sulu.category.no-categories-available":"No categories available","navigation.snippets":"Snippets","snippets.snippet.title":"Snippets","snippets.list.template":"Type","content-navigation.snippets.details":"Details","navigation.global-content":"Global Content","snippet-content.add":"Choose snippet","snippet.delete-referenced-by-following":"This snippet is referenced by the following pages:","snippet.delete-confirm-text":"Are you sure you want to remove it?","snippet.delete-confirm-title":"Confirm delete","snippet.delete-do-it":"Yes, I am sure","snippet.delete-no-snippets-selected":"There are no snippets selected","snippet-content.nosnippets-selected":"No snippets selected","public.url-history.none":"No history for this node exists ...","single-internal-link.title":"Select single Internal Link","content-navigation.contents.internal-link":"Internal Link","content-navigation.contents.external-link":"External Link","sulu.content.form.settings.show-in-navigation":"Show in Navigation","sulu.content.form.settings.type":"Content Type","sulu.content.form.settings.type.content":"Content","sulu.content.form.settings.type.internal-link":"Internal Link","sulu.content.form.settings.type.external-link":"External Link","content.contents.settings.delete":"Delete node","content.contents.settings.copy":"Copy page","content.contents.settings.copy.title":"Choose parent-page","content.contents.settings.move":"Move page","content.contents.settings.move.title":"Choose parent-page","content.contents.settings.order":"Order pages","content.contents.settings.order.title":"Place node","smart-content.nocontent-found":"No content found","smart-content.nocontent-selected":"No content selected","smart-content.visible":"visible","smart-content.of":"of","smart-content.configure-smart-content":"Configure {title}","smart-content.data-source":"Data source","smart-content.include-sub-folders":"Include sub-pages","smart-content.filter-by-category":"Filter by category","smart-content.filter-by-tags":"Filter by tags","smart-content.sort-by":"Sort by","smart-content.no-sorting":"Default Sorting","smart-content.ascending":"Ascending","smart-content.descending":"Descending","smart-content.present-as":"Present as","smart-content.limit-result-to":"Limit result to","smart-content.no-category":"No category","smart-content.choose-present-as":"Choose..","smart-content.choose-data-source":"Choose data source","smart-content.from":"From","smart-content.sub-folders-inclusive":"incl. sub folders","smart-content.view-all":"view all","smart-content.view-less":"view less","smart-content.title":"Title","content.template.dialog.titile":"Change Template","content.template.dialog.content":"You have unchanged Data.Do you want to leave this site?","content.template.dialog.submit-button":"Yes","content.template.dialog.cancel-button":"Cancel","content.delete.dialog.title":"Delete Node","content.delete.dialog.content":"Do you realy want to delete the selected node?","content.delete.dialog.cancel":"Don't do it","content.delete.dialog.submit":"Do it, I understand","content.contents.show-ghost-pages":"Show ghosts and shadow pages","content.preview.resolutions":"Resolutions","sulu.content.add-type":"Add Block","smart-content.data-source.label":"Data source","smart-content.data-source.button":"Choose source","smart-content.choose-data-source.cancel":"Cancel","sulu.content.seo.title":"Title","sulu.content.seo.description":"Description","sulu.content.seo.keywords":"Keywords","sulu.content.seo.canonical":"Canonical URL (Canonical Tag)","sulu.content.seo.robots":"Robots settings (robots.txt)","sulu.content.seo.robots.no-index":"no-index (page will not be indexed by search engines)","sulu.content.seo.robots.no-follow":"no-follow (links on this page will not be followed by the search engine)","sulu.content.seo.sitemap":"Sitemap","sulu.content.seo.sitemap.hide":"Hide in sitemap","sulu.content.excerpt.title":"Title","sulu.content.excerpt.description":"Description","sulu.content.excerpt.images":"Images","sulu.content.seo.descriptions.note":"The meta description is limited to 155 characters.","sulu.content.seo.characters-left":"characters left","sulu.content.seo.keywords.note":"Please use a max. of 5 keywords, dependend from the content of the page, seperated by commas.","sulu.content.seo.keywords-left":"keywords left","content.contents.title":"Content","sulu.content.form.settings.nav-contexts":"Navigation context","sulu.content.form.settings.all-nav-contexts":"All navigation contexts chosen ...","sulu.content.form.settings.no-nav-contexts":"No navigation contexts chosen ...","sulu.content.form.settings.shadow_page":"Shadow Page","sulu.content.form.settings.shadow.enable":"Enable Shadow","sulu.content.form.settings.shadow.base_language":"Shadow Base Language","sulu.content.form.settings.shadow.no_base_language":"No Shadow Page language exists ...","sulu.content.form.settings.shadow.select_base_language":"Choose language ...","sulu.content.form.settings.type.internal-link.title":"Title","sulu.content.form.settings.type.internal-link.link":"Linked Content","sulu.content.form.settings.type.external-link.title":"Title","sulu.content.form.settings.type.external-link.url":"URL","sulu.content.sort.blocks":"Sort text blocks","sulu.content.edit.blocks":"Edit text blocks","content.contents.settings.copy-locales.title":"Copy language","content.contents.settings.copy-locales.copy-from":"Copy from","content.contents.settings.copy-locales.current-language":"current language","content.contents.settings.copy-locales.target":"Target languages","content.contents.settings.copy-locales.info":"New page will be created","content.contents.settings.copy-locales.ok":"Copy languages","content.contents.settings.copy-locale.title":"What would you like to do?","content.contents.settings.copy-locale.info":"This page does not exists in this language.Please select one of the following options:","content.contents.settings.copy-locale.new":"Create a new empty page<\/b> in this language","content.contents.settings.copy-locale.copy":"Create a new page in this language and copy content from<\/b>:","content.contents.settings.copy-locale.select-default":"Choose ...","content.contents.settings.copy-locale-overlay.ok":"Create page","toolbar.copy-locale":"Copy languages","content.contents.new":"Create page","content.contents.settings.copy-locales.default-label":"Choose language ...","content.contents.start-preview":"Start preview","tag.error.notUnique":"The tag name is not unique!","navigation.settings.cache":"Cache","sulu.website.cache.remove":"Cache clear","sulu.website.cache.title":"Cache settings","sulu.website.cache.remove.success.title":"Cache","sulu.website.cache.remove.success.description":"successfully cleared","sulu.website.cache.remove.error.title":"Cache","sulu.website.cache.remove.error.description":"clear failed","sulu.location.configure":"Configure Location","sulu.location.locate-address":"Locate Address","sulu.location.title":"Title","sulu.location.street":"Street","sulu.location.number":"Number","sulu.location.code":"Code","sulu.location.town":"Town","sulu.location.country":"Country","sulu.location.coords":"Coordinates (Long \/ Lat \/ Zoom)","sulu.location.map":"Map","sulu.location.search":"Search","public.name":"Name","public.key":"Key","public.edit":"Edit","public.empty-list":"This list is empty","public.tags":"Tags","public.show-tags":"Show tags","public.view-all":"view all","public.view-less":"view less","header.add":"Add","header.save":"Save","header.saved":"Saved","header.delete":"Delete","navigation.list":"Back to list","translate.package.title":"Package","translate.package.catalogues":"Language Catalogues","translate.package.settings.locale":"Locale","translate.package.settings.addCatalogue":"Add Catalogue","translate.package.details.key":"Key","translate.package.details.translation":"Translation","translate.package.details.suggestion":"Suggestion","translate.package.details.maxLength":"Maximum length","translate.package.details.length":"Length","translate.package.details.frontend":"Frontend","translate.package.details.backend":"Backend","translate.package.details.addElement":"Add element","public.delete":"Delete","public.no-pages":"No Pages","translate.package.settings.title":"Title","contact.contacts.title":"Person","contact.contacts.contactTitle":"Title","contact.contacts.firstName":"First Name","contact.contacts.lastName":"Last Name","contact.contacts.position":"Position","contact.contacts.company":"Company","contact.form.addEmail":"Add E-Mail","contact.form.addPhone":"Add Phone","contact.form.addAddress":"Add Address","contact.address.street":"Street","contact.address.number":"Number","contact.address.additional":"Additional","contact.address.zip":"Postal Code","contact.address.city":"City","contact.address.state":"Region","contact.address.country":"Country","public.email":"E-Mail","public.phone":"Phone","public.address":"Address","email.home":"Home","email.work":"Work","phone.home":"Home","phone.work":"Work","phone.fax":"Fax","address.home":"Home","address.work":"Work","country.austria":"Austria","country.germany":"Germany","contact.accounts.title":"Account","contact.accounts.name":"Company","contact.accounts.website":"Website","contact.accounts.company":"Parent company","security.roles.title":"Permissions","security.roles.name":"Role title","security.roles.system":"System","security.roles.godMode":"God Mode","security.roles.godModeDescription":"Thats the god mode","security.roles.section":"Section","security.roles.permissions":"Permissions","security.roles.all":"Select all","security.roles.none":"Select none","security.roles.security-type":"Type","security.permission.title":"Username and Password","security.permission.username":"Username","security.permission.password":"Password","security.permission.passwordRepeat":"Repeat password","security.permission.email":"Default email","security.permission.titlePermissions":"Permissions","security.permission.role.title":"Title","security.permission.role.language":"Language","security.permission.role.permissions":"Permissions","security.permission.role.chooseLanguage":"Choose language","security.permission.role.allLanguages":"all selected","toolbar.delete":"Delete","sulu.list-toolbar.import":"Import","sulu.list-toolbar.export":"Export","navigation.tools":"Tools","navigation.settings":"Settings","navigation.settings.roles":"Permissions","navigation.settings.translate":"Translate","navigation.contacts":"Contacts","navigation.contacts.people":"People","navigation.contacts.companies":"Accounts","navigation.webspaces":"Global Content & Webspaces","navigation.webspaces.pages":"Pages","navigation.version-history":"Version history","navigation.user":"User","content-navigation.security.permissions":"Permissions","content-navigation.security.details":"Details","content-navigation.contacts.details":"Details","content-navigation.contents.content":"Content","content-navigation.contents.settings":"Settings","public.search":"Search ...","navigation.hide":"HIDE","navigation.show":"SHOW","security.permission.locale":"System language","pagination.page":"Page","pagination.of":"of","pagination.elements":"elements","pagination.show":"Show","pagination.elements-of":"elements of","pagination.elements-per-page":"elements per page","pagination.show-all-elements":"Show all elements","navigation.settings.tags":"Tags","public.id":"ID","list-toolbar.column-options":"Column options","tags.name":"Title","tags.author":"Author","tags.changed":"Last changed","public.changed":"Last changed","public.created":"Created on","contact.contacts.birthday":"Birthday","contact.contacts.middleName":"Middle Name","public.title":"Title","tag.tags.title":"Tags","toolbar.state-publish":"Published","toolbar.state-unpublish":"Unpublished","toolbar.state-test":"Test","template.default":"Default","template.simple":"Simple","template.overview":"Overview","template.complex":"Complex","public.published":"Published","labels.state-changed.success-desc":"state changed","labels.success":"Success","labels.state-changed.error-desc":"state could not be changed","labels.error":"Error","labels.warning":"Warning","labels.success.content-deleted-desc":"Node successfully deleted.","labels.success.content-save-desc":"Node sucessfully saved","labels.error.content-save-desc":"Node could not be saved.","sulu.matcher.unmatched-column":"Unmatched column","sulu.matcher.matched-column":"Matched column","sulu.matcher.edit":"Edit","sulu.matcher.skip":"Skip","sulu.matcher.skipped":"Skipped","sulu.matcher.column":"Column","sulu.matcher.please-choose":"Please choose..","navigation.pim":"PIM","navigation.pim.products":"Products","pim.products.title":"Products","products.key":"Key","products.contractual-article":"Contractual article","products.name":"Name","products.article-number":"Article number","products.manufacturer":"Manufacturer","products.categories":"Categories","products.last-imported":"Last imported","sulu.products.import":"Import","sulu.products.map-header":"Map header","sulu.products.map-header-desc":"Please map headers with existing data structure.","sulu.products.unmatched-columns":"Unmatched columns","public.deactivate":"Deactivate","contact.account.type.basic":"Contact","contact.account.type.lead":"Lead","contact.account.type.customer":"Customer","contact.account.type.supplier":"Supplier","contact.account.add-basic":"Create new account","contact.account.add-lead":"Create new lead","contact.account.add-customer":"Create new customer","contact.account.add-supplier":"Create new supplier","contact.accounts.type":"Type","public.add-fields":"Add new fields","public.edit-fields":"Edit fields","public.fax":"Fax","public.url":"Website","public.note":"Note","public.all":"All","public.comments":"Comments","contact.add.address":"Add address","dropdown.please-choose":"Please choose..","navigation.webspaces.content":"Content","navigation.webspaces.index-page":"Homepage","url.home":"Home","sulu.overlay.be-careful":"Be careful","sulu.overlay.delete-desc":"The operation you are about to do will delete data. This is not undoable! Please think about it\n and accept or decline.\n ","sulu.overlay.unsaved-changes-confirm":"You have unsaved changes.Do you realy want to continue without saving?","sulu.overlay.save-unsaved-changes-confirm":"You have unsaved changes.Would you like to save and continue?","public.show-history":"Show history","public.url-history":"Url history","sulu.property.title":"Title","sulu.property.url":"Url","sulu.property.block.title":"Title","sulu.property.block.article":"Article","sulu.property.tags":"Tags","sulu.property.article":"Article","sulu.property.smartcontent":"Smart-content","sulu.property.block":"Block","sulu.type.editor":"Editor","sulu.type.area":"Text","sulu.type.title_only":"Title","contacts.accounts.manage.categories.title":"Manage categories","contacts.accounts.manage.categories":"Manage categories","contacts.accounts.category.select":"Choose a Category","contacts.accounts.category":"Category","sulu.overlay.delete-no-items":"No items for deletion selected.","sulu.overlay.error":"Error!","contact.accounts.delete.sub-found":"One or more sub-companies found.","contact.accounts.delete.sub-found-desc":"A company cannot be deleted as long as it has sub-companies. Please delete the sub-companies or\n remove the relation.\n ","contact.accounts.delete.desc":"Do you really want to delete the selected company? All data is going to be lost.","public.and-number-more":"and <%= number %> more","contact.accounts.delete.contacts":"Delete all <%= number %> related contacts.","contact.accounts.delete.contacts-found":"Related contacts have been found.","contact.accounts.delete.contacts-question":"Would you like to delete them together with the selected company?","contact.accounts.delete.contacts-checkbox":"Delete all <%= number %> related contacts.","public.open-all":"Open all","public.close-all":"Close all","pagination.show-all":"Show all","public.elements":"elements","sulu.upload.dropzone-title":"Drag and drop assets here to upload","sulu.upload.dropzone-desc":"Or click to add","sulu.list-toolbar.small-thumbnails":"Small thumbnails","sulu.list-toolbar.big-thumbnails":"Large thumbnails","sulu.list-toolbar.table":"Table","contact.accounts.number":"Number","contact.accounts.registerNumber":"Register Number","contact.accounts.uid":"UID","contact.accounts.division":"Division","public.disabled":"Disabled","navigation.financials":"Financial Infos","contact.accounts.bankName":"Bank name","contact.accounts.bank-accounts":"Bank accounts","contact.accounts.add-bank-account":"Add new bank account","public.public":"Public","public.iban":"IBAN","public.bic":"BIC","contact.accounts.manage.categories.title":"Manage categories","contact.accounts.manage.categories":"Manage categories","contact.accounts.category.select":"Choose a category","contact.accounts.category":"Category","public.please-choose":"Please choose","contacts.edit-address":"Edit Address","contact.accounts.bonusSettlement":"Bonus-settlement","contact.accounts.bonusConditions":"Bonus-conditions","contact.accounts.correspondence":"Correspondence via","contact.contacts.salutation":"Salutation","contact.contacts.formOfAddress":"Form of address","contact.contacts.formOfAddress.select":"Choose form of address","contact.contacts.formOfAddress.male":"Mr.","contact.contacts.formOfAddress.female":"Mrs.","public.color":"Color","contact.contacts.details":"Contact details","url.work":"Work","fax.work":"Work","public.internal":"Internal","address.delivery":"Delivery address","address.invoice":"Invoice address","phone.mobile":"Mobile","public.forbidden.description":"Operation forbidden","public.forbidden":"The available permissions are not sufficient for this operation","public.server_error":"Server error","contact.contacts.hobbies":"Hobbies","contact.contacts.partner":"Partner","contact.contacts.aviso":"Aviso to","public.add-entry":"Add new Entry","public.edit-entries":"Edit entries","public.info":"Info","public.description":"Description","contact.contacts.isPoolAlpinEmployee":"PA-Employee","contact.address.primaryAddress":"Primary address","contact.address.deliveryAddress":"Delivery address","contact.address.billingAddress":"Billing address","contact.address.type":"Address type","contact.address.postbox.number":"Postbox #","contact.address.postbox.postcode":"Postbox ZIP","contact.address.postbox.city":"Postbox city","contact.address.type.select":"Choose address type","contact.address.add.label":"Add address","contact.accounts.type.conversion.message":"The operation you are about to do will convert this account. This is not undoable! Please think\n about it and accept or decline.\n ","contact.account.type.customer.conversion":"Convert to customer","contact.account.type.lead.conversion":"Convert to lead","sulu.upload.small-dropzone-title":"Click or drag and drop new version","public.show-descriptions":"Show descriptions","template.example":"Example","sulu.property.phone":"Phone","sulu.property.password":"Password","sulu.property.link":"Link","sulu.property.email":"Email","sulu.property.color":"Color","sulu.property.date":"Date","sulu.property.time":"Time","sulu.property.note":"Note","contact.accounts.bankAccount.label":"Bank account","contact.accounts.bankAccounts.add.label":"Add bank account","contact.accounts.bankAccounts.edit.label":"Edit bank account","public.locked":"Locked","contact.accounts.placeOfJurisdiction":"Jurisdiction","contact.termsOfPayment":"Terms of payment","contact.termsOfDelivery":"Terms of delivery","contact.accounts.termsOfDelivery.select":"Please choose ...","contact.accounts.termsOfPayment.select":"Please choose ...","content-navigation.contacts.activities":"Activities","contact.activities.remove":"Remove activity","contact.activities.type":"Type","contact.activities.priority":"Priority","contact.activities.status":"Status","contact.activities.subject":"Subject","contact.activities.note":"Note","contact.activities.dueDate":"Duedate","contact.activities.assignedContact":"Contact","contact.contacts.activities.edit":"Edit activity","contact.contacts.activities.add":"Add activity","contact.activity.type.phone.intern":"Phone intern","contact.activity.type.phone.extern":"Phone extern","contact.activity.type.mail.intern":"Mail intern","contact.activity.type.mail.extern":"Mail extern","contact.activity.type.appointment":"Appointment","contact.activity.type.noInterest":"No interest","contact.activity.type.recall":"Recall","contact.activity.state.open":"Open","contact.activity.state.closed":"Closed","contact.activity.state.inProgress":"In progress","contact.activity.priority.low":"Low","contact.activity.priority.mid":"Mid","contact.activity.priority.high":"High","content-navigation.contact.accounts.contacts":"Contacts","fax.home":"Home","contact.accounts.contact-remove":"Remove contacts from company","contact.accounts.add-contact":"Add contact to company","contact.accounts.corporation":"Corporation","dropdown.no-selection":"No selection","content-navigation.contents.seo":"SEO","content-navigation.contents.excerpt":"Excerpt & Categories","contact.contacts.main-contact":"Main contact","sulu.preview.auto":"Auto","sulu.preview.desktop":"Desktop","sulu.preview.tablet":"Tablet","sulu.preview.smartphone":"Smartphone","contact.accounts.responsiblePerson":"Responsible","select.edit-entries":"Edit","select.no-choice":"No Selection","select.add-item":"New Entry","public.choose":"Choose","public.visible":"visible","public.of":"of","internal-links.add":"Add internal links","internal-links.nolinks-selected":"No internal links selected","public.no-title":"No Title","public.previous":"Back","public.overview":"Overview","public.details":"Details","public.selection":"Selection","form.validation-warning":"Please check your input.You cannot save as long as not all required fields are filled properly.","public.status":"Status","public.number":"Nummer","labels.successfully-saved":"Data has been successfully saved.","contact.account.condition.select":"Bitte w\u00e4hlen ...","public.current-entry":"Current"} \ No newline at end of file diff --git a/web/config.php b/web/config.php deleted file mode 100755 index 162acfc7b2..0000000000 --- a/web/config.php +++ /dev/null @@ -1,124 +0,0 @@ -getFailedRequirements(); -$minorProblems = $symfonyRequirements->getFailedRecommendations(); - -?> - - - - - - Symfony Configuration - - - - - -
-
- - -
-
-
- - - - - - -
-
-
-
- -
-
-
-

Welcome!

-

Welcome to your new Symfony project.

-

- This script will guide you through the basic configuration of your project. - You can also do the same by editing the ‘app/config/parameters.yml’ file directly. -

- - -

Major problems

-

Major problems have been detected and must be fixed before continuing:

-
    - -
  1. getHelpHtml() ?>
    2. - -
- - - -

Recommendations

-

- Additionally, toTo enhance your Symfony experience, - it’s recommended that you fix the following: -

-
    - -
  1. getHelpHtml() ?>
    2. - -
- - - hasPhpIniConfigIssue()): ?> -

* - getPhpIniConfigPath()): ?> - Changes to the php.ini file must be done in "getPhpIniConfigPath() ?>". - - To change settings, create a "php.ini". - -

- - - -

Your configuration looks good to run Symfony.

- - - -
-
-
-
Symfony Standard Edition
-
- - diff --git a/web/website.php b/web/website.php index 5207c7470c..10dd2878c9 100644 --- a/web/website.php +++ b/web/website.php @@ -5,34 +5,40 @@ use Symfony\Component\Debug\Debug; // Define application environment -defined('APP_ENV') || define('APP_ENV', (getenv('APP_ENV') ? getenv('APP_ENV') : 'prod')); +defined('SYMFONY_ENV') || define('SYMFONY_ENV', getenv('SYMFONY_ENV') ?: 'prod'); +defined('SYMFONY_DEBUG') || + define('SYMFONY_DEBUG', filter_var(getenv('SYMFONY_DEBUG') ?: SYMFONY_ENV === 'dev', FILTER_VALIDATE_BOOLEAN)); $loader = require_once __DIR__ . '/../app/bootstrap.php.cache'; -if (APP_ENV == 'dev') { +if (SYMFONY_DEBUG) { Debug::enable(); } // Use APC for autoloading to improve performance. // Change 'sf2' to a unique prefix in order to prevent cache key conflicts // with other applications also using APC. -/* -$apcLoader = new ApcClassLoader('sf2', $loader); -$loader->unregister(); -$apcLoader->register(true); -*/ +// +// $apcLoader = new ApcClassLoader('sf2', $loader); +// $loader->unregister(); +// $apcLoader->register(true); require_once __DIR__ . '/../app/WebsiteKernel.php'; -$kernel = new WebsiteKernel(APP_ENV, (APP_ENV == 'dev') ? true : false); +$kernel = new WebsiteKernel(SYMFONY_ENV, SYMFONY_DEBUG); $kernel->loadClassCache(); -if (APP_ENV != 'dev') { +// Comment this line if you want to use the "varnish" http +// caching strategy. See http://sulu.readthedocs.org/en/latest/cookbook/caching-with-varnish.html +if (SYMFONY_ENV != 'dev') { require_once __DIR__ . '/../app/WebsiteCache.php'; $kernel = new WebsiteCache($kernel); + + // When using the HttpCache, you need to call the method in your front controller + // instead of relying on the configuration parameter + Request::enableHttpMethodParameterOverride(); } -Request::enableHttpMethodParameterOverride(); $request = Request::createFromGlobals(); $response = $kernel->handle($request); $response->send();