Andi
commit
8d274694ad
5 changed files with 57 additions and 53 deletions
|
|
@ -37,7 +37,7 @@
|
|||
"doctrine/migrations": "dev-master",
|
||||
"doctrine/doctrine-migrations-bundle": "dev-master",
|
||||
"jbroadway/urlify" : "~1.0",
|
||||
"enko/relativedateparser" : "v0.2"
|
||||
"enko/relativedateparser" : "v0.3"
|
||||
},
|
||||
"require-dev": {
|
||||
"sensio/generator-bundle": "~2.3"
|
||||
|
|
|
|||
102
composer.lock
generated
Executable file → Normal file
102
composer.lock
generated
Executable file → Normal file
|
|
@ -4,20 +4,20 @@
|
|||
"Read more about it at http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
|
||||
"This file is @generated automatically"
|
||||
],
|
||||
"hash": "ce7476174febffa01f09dfba2d9e3bb5",
|
||||
"hash": "76317aae6b4148c72d1d1afc039502d9",
|
||||
"packages": [
|
||||
{
|
||||
"name": "doctrine/annotations",
|
||||
"version": "v1.2.0",
|
||||
"version": "v1.2.1",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/doctrine/annotations.git",
|
||||
"reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd"
|
||||
"reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
|
||||
"reference": "d9b1a37e9351ddde1f19f09a02e3d6ee92e82efd",
|
||||
"url": "https://api.github.com/repos/doctrine/annotations/zipball/6a6bec0670bb6e71a263b08bc1b98ea242928633",
|
||||
"reference": "6a6bec0670bb6e71a263b08bc1b98ea242928633",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -44,17 +44,6 @@
|
|||
"MIT"
|
||||
],
|
||||
"authors": [
|
||||
{
|
||||
"name": "Jonathan Wage",
|
||||
"email": "jonwage@gmail.com",
|
||||
"homepage": "http://www.jwage.com/",
|
||||
"role": "Creator"
|
||||
},
|
||||
{
|
||||
"name": "Guilherme Blanco",
|
||||
"email": "guilhermeblanco@gmail.com",
|
||||
"homepage": "http://www.instaclick.com"
|
||||
},
|
||||
{
|
||||
"name": "Roman Borschel",
|
||||
"email": "roman@code-factory.org"
|
||||
|
|
@ -63,11 +52,17 @@
|
|||
"name": "Benjamin Eberlei",
|
||||
"email": "kontakt@beberlei.de"
|
||||
},
|
||||
{
|
||||
"name": "Guilherme Blanco",
|
||||
"email": "guilhermeblanco@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "Jonathan Wage",
|
||||
"email": "jonwage@gmail.com"
|
||||
},
|
||||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
"email": "schmittjoh@gmail.com"
|
||||
}
|
||||
],
|
||||
"description": "Docblock Annotations Parser",
|
||||
|
|
@ -77,7 +72,7 @@
|
|||
"docblock",
|
||||
"parser"
|
||||
],
|
||||
"time": "2014-07-06 15:52:21"
|
||||
"time": "2014-09-25 16:45:30"
|
||||
},
|
||||
{
|
||||
"name": "doctrine/cache",
|
||||
|
|
@ -203,7 +198,7 @@
|
|||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -279,7 +274,7 @@
|
|||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -541,7 +536,7 @@
|
|||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -595,7 +590,7 @@
|
|||
{
|
||||
"name": "Johannes Schmitt",
|
||||
"email": "schmittjoh@gmail.com",
|
||||
"homepage": "https://github.com/schmittjoh",
|
||||
"homepage": "http://jmsyst.com",
|
||||
"role": "Developer of wrapped JMSSerializerBundle"
|
||||
}
|
||||
],
|
||||
|
|
@ -792,22 +787,25 @@
|
|||
},
|
||||
{
|
||||
"name": "enko/relativedateparser",
|
||||
"version": "v0.2",
|
||||
"version": "v0.3",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/HackspaceJena/RelativeDateParser.git",
|
||||
"reference": "0f1e587c652eac6c109c05637da9e6b5328c8564"
|
||||
"reference": "55b94901ad919f3ca1bc661b624e9d0b764728eb"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/HackspaceJena/RelativeDateParser/zipball/0f1e587c652eac6c109c05637da9e6b5328c8564",
|
||||
"reference": "0f1e587c652eac6c109c05637da9e6b5328c8564",
|
||||
"url": "https://api.github.com/repos/HackspaceJena/RelativeDateParser/zipball/55b94901ad919f3ca1bc661b624e9d0b764728eb",
|
||||
"reference": "55b94901ad919f3ca1bc661b624e9d0b764728eb",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"symfony/config": "~2.5",
|
||||
"symfony/translation": "~2.5"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "4.2.*"
|
||||
},
|
||||
"type": "library",
|
||||
"autoload": {
|
||||
"psr-0": {
|
||||
|
|
@ -824,7 +822,7 @@
|
|||
"email": "tim@bandenkrieg.hacked.jp"
|
||||
}
|
||||
],
|
||||
"time": "2014-09-21 17:06:28"
|
||||
"time": "2014-09-30 05:06:16"
|
||||
},
|
||||
{
|
||||
"name": "incenteev/composer-parameter-handler",
|
||||
|
|
@ -1177,29 +1175,33 @@
|
|||
},
|
||||
{
|
||||
"name": "monolog/monolog",
|
||||
"version": "1.10.0",
|
||||
"version": "1.11.0",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/Seldaek/monolog.git",
|
||||
"reference": "25b16e801979098cb2f120e697bfce454b18bf23"
|
||||
"reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/25b16e801979098cb2f120e697bfce454b18bf23",
|
||||
"reference": "25b16e801979098cb2f120e697bfce454b18bf23",
|
||||
"url": "https://api.github.com/repos/Seldaek/monolog/zipball/ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
|
||||
"reference": "ec3961874c43840e96da3a8a1ed20d8c73d7e5aa",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"php": ">=5.3.0",
|
||||
"psr/log": "~1.0"
|
||||
},
|
||||
"provide": {
|
||||
"psr/log-implementation": "1.0.0"
|
||||
},
|
||||
"require-dev": {
|
||||
"aws/aws-sdk-php": "~2.4, >2.4.8",
|
||||
"doctrine/couchdb": "~1.0@dev",
|
||||
"graylog2/gelf-php": "~1.0",
|
||||
"phpunit/phpunit": "~3.7.0",
|
||||
"raven/raven": "~0.5",
|
||||
"ruflin/elastica": "0.90.*"
|
||||
"ruflin/elastica": "0.90.*",
|
||||
"videlalvaro/php-amqplib": "~2.4"
|
||||
},
|
||||
"suggest": {
|
||||
"aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
|
||||
|
|
@ -1209,12 +1211,13 @@
|
|||
"graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
|
||||
"raven/raven": "Allow sending log messages to a Sentry server",
|
||||
"rollbar/rollbar": "Allow sending log messages to Rollbar",
|
||||
"ruflin/elastica": "Allow sending log messages to an Elastic Search server"
|
||||
"ruflin/elastica": "Allow sending log messages to an Elastic Search server",
|
||||
"videlalvaro/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib"
|
||||
},
|
||||
"type": "library",
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "1.10.x-dev"
|
||||
"dev-master": "1.11.x-dev"
|
||||
}
|
||||
},
|
||||
"autoload": {
|
||||
|
|
@ -1230,8 +1233,7 @@
|
|||
{
|
||||
"name": "Jordi Boggiano",
|
||||
"email": "j.boggiano@seld.be",
|
||||
"homepage": "http://seld.be",
|
||||
"role": "Developer"
|
||||
"homepage": "http://seld.be"
|
||||
}
|
||||
],
|
||||
"description": "Sends your logs to files, sockets, inboxes, databases and various web services",
|
||||
|
|
@ -1241,7 +1243,7 @@
|
|||
"logging",
|
||||
"psr-3"
|
||||
],
|
||||
"time": "2014-06-04 16:30:04"
|
||||
"time": "2014-09-30 13:30:58"
|
||||
},
|
||||
{
|
||||
"name": "psr/log",
|
||||
|
|
@ -1551,20 +1553,22 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/icu",
|
||||
"version": "v1.0.1",
|
||||
"version": "v1.2.2",
|
||||
"target-dir": "Symfony/Component/Icu",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/Icu.git",
|
||||
"reference": "fdba214b1e087c149843bde976263c53ac10c975"
|
||||
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/Icu/zipball/fdba214b1e087c149843bde976263c53ac10c975",
|
||||
"reference": "fdba214b1e087c149843bde976263c53ac10c975",
|
||||
"url": "https://api.github.com/repos/symfony/Icu/zipball/d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
|
||||
"reference": "d4d85d6055b87f394d941b45ddd3a9173e1e3d2a",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
"ext-intl": "*",
|
||||
"lib-icu": ">=4.4",
|
||||
"php": ">=5.3.3",
|
||||
"symfony/intl": "~2.3"
|
||||
},
|
||||
|
|
@ -1594,7 +1598,7 @@
|
|||
"icu",
|
||||
"intl"
|
||||
],
|
||||
"time": "2013-10-04 09:12:07"
|
||||
"time": "2014-07-25 09:58:17"
|
||||
},
|
||||
{
|
||||
"name": "symfony/monolog-bundle",
|
||||
|
|
@ -1714,16 +1718,16 @@
|
|||
},
|
||||
{
|
||||
"name": "symfony/symfony",
|
||||
"version": "v2.5.4",
|
||||
"version": "v2.5.5",
|
||||
"source": {
|
||||
"type": "git",
|
||||
"url": "https://github.com/symfony/symfony.git",
|
||||
"reference": "3a369dddea56596df91977d8c2083e70784852f2"
|
||||
"reference": "2aef97bbc95d0c4ae63537cca81bd6d984427d81"
|
||||
},
|
||||
"dist": {
|
||||
"type": "zip",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/3a369dddea56596df91977d8c2083e70784852f2",
|
||||
"reference": "3a369dddea56596df91977d8c2083e70784852f2",
|
||||
"url": "https://api.github.com/repos/symfony/symfony/zipball/2aef97bbc95d0c4ae63537cca81bd6d984427d81",
|
||||
"reference": "2aef97bbc95d0c4ae63537cca81bd6d984427d81",
|
||||
"shasum": ""
|
||||
},
|
||||
"require": {
|
||||
|
|
@ -1824,7 +1828,7 @@
|
|||
"keywords": [
|
||||
"framework"
|
||||
],
|
||||
"time": "2014-09-03 09:51:48"
|
||||
"time": "2014-09-28 17:33:53"
|
||||
},
|
||||
{
|
||||
"name": "twig/extensions",
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ class EventController extends Controller
|
|||
if (strlen($location_lon) > 0) {
|
||||
$location_obj->lon = $location_lon;
|
||||
}
|
||||
$location_obj->slug = $location_obj->generateSlug($location->name,$em);
|
||||
$location_obj->slug = $location_obj->generateSlug($location_obj->name,$em);
|
||||
$em->persist($location_obj);
|
||||
$em->flush();
|
||||
$entity->setLocation($location_obj);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
<h1>
|
||||
Termine
|
||||
{% if tag|default(false) %} für Tag „{{ tag.name }}“{% endif %}
|
||||
{% if location|default(false) %} für Ort „{{ location.name }}“ <a class="location-edit" href="{{ path("location_edit",{slug:location.slug}) }}"><i class="ui icon edit inverted green circular link"></i> </a> {% endif %}
|
||||
{% if location|default(false) %} für Ort „{{ location.name }}“ <a class="location-edit" href="{{ path("location_edit",{slug:location.slug}) }}"><i class="ui icon edit inverted green circular link" data-content="Ort bearbeiten" title="Ort bearbeiten"></i> </a> {% endif %}
|
||||
</h1>
|
||||
{% if tag|default(false) %}
|
||||
<a href="{{ path('tag_show',{'slug' : tag.slug }) }}.ics"><i class="icon calendar"></i>Link zur Kalenderdatei</a>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
{% block body -%}
|
||||
<div class="ui one column page grid">
|
||||
<div class="ui column">
|
||||
<h1>Termin bearbeiten</h1>
|
||||
<h1>Ort bearbeiten</h1>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
Reference in a new issue