- Mar 24, 2016
-
-
Benni Mack authored
The Clear Cache Menu on top of the TYPO3 Backend contains the URLs to call tce_db which has an additional GET parameter called "ajaxCall" which is not evaluated anymore and can be removed. Further cleanup could use the ajax action to fetch additional data and evalute that data. Resolves: #75246 Releases: master Change-Id: I9b5f5816c5d3ac9d72cf0b382b5646e7631d0afe Reviewed-on: https://review.typo3.org/47377 Reviewed-by:
Michael Oehlhof <typo3@oehlhof.de> Tested-by:
Michael Oehlhof <typo3@oehlhof.de> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
- Mar 23, 2016
-
-
Andreas Fernandez authored
Due to a wrong assignment, modSharedTSconfig is always used to set the default language label in PageLayoutController, even if modTSconfig is set. modTSconfig is now used if possible. Resolves: #75242 Releases: master, 7.6, 6.2 Change-Id: I517c03f02ffc8d05ed74a865517ee775e1542bfe Reviewed-on: https://review.typo3.org/47371 Reviewed-by:
Alexander Opitz <opitz.alexander@googlemail.com> Tested-by:
Alexander Opitz <opitz.alexander@googlemail.com> Reviewed-by:
Mathias Schreiber <mathias.schreiber@wmdb.de> Tested-by:
Mathias Schreiber <mathias.schreiber@wmdb.de> Reviewed-by:
Daniel Goerz <ervaude@gmail.com> Tested-by:
Daniel Goerz <ervaude@gmail.com> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
Wouter Wolters authored
Copied the less files from the 0.9.3 release because they stepped over to sass. Resolves: #73747 Releases: master Change-Id: Icdc68b7114c149adfebaf673bbd52721768e5d0f Reviewed-on: https://review.typo3.org/47079 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Daniel Goerz <ervaude@gmail.com> Tested-by:
Daniel Goerz <ervaude@gmail.com> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
Andreas Fernandez authored
The save / abort buttons in the edit view of the permission controller are replaced by DocHeader buttons to ensure are more consistent UI. Change-Id: Ic035f2bd1f5063a8d0b52310b1f011078f7e6c25 Resolves: #68378 Releases: master, 7.6 Reviewed-on: https://review.typo3.org/47186 Reviewed-by:
Daniel Goerz <ervaude@gmail.com> Tested-by:
Daniel Goerz <ervaude@gmail.com> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
Wouter Wolters authored
When dealing with a PHP version like "7.0.4-6+deb.sury.org~trusty+5" the text overflow the box. Put a word-wrap: break-word; on the dd-tag. Resolves: #75234 Releases: master,7.6 Change-Id: I0df5f13bfd2d66e8c85eb28f06c248bdca93a182 Reviewed-on: https://review.typo3.org/47363 Reviewed-by:
Michael Oehlhof <typo3@oehlhof.de> Tested-by:
Michael Oehlhof <typo3@oehlhof.de> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
Georg Ringer authored
If the 3rd parameter is set to 'date', the age must be returned as date without any time information. Resolves: #75235 Releases: master, 7.6 Change-Id: I7ebf76dc635f7dbca42c6486c585eb140832e6c4 Reviewed-on: https://review.typo3.org/47364 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Daniel Goerz <ervaude@gmail.com> Tested-by:
Daniel Goerz <ervaude@gmail.com> Reviewed-by:
Morton Jonuschat <m.jonuschat@mojocode.de> Tested-by:
Morton Jonuschat <m.jonuschat@mojocode.de>
-
Wouter Wolters authored
Resolves: #75230 Releases: master Change-Id: I44c34a7ddb804a28031395b7e100b33d43e12a76 Reviewed-on: https://review.typo3.org/47360 Reviewed-by:
Michael Oehlhof <typo3@oehlhof.de> Tested-by:
Michael Oehlhof <typo3@oehlhof.de> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
- Mar 22, 2016
-
-
TYPO3 Release Team authored
Change-Id: I4c64fce65a1f81c2037a374ff036183335f1cf96 Reviewed-on: https://review.typo3.org/47356 Reviewed-by:
TYPO3 Release Team <typo3cms@typo3.org> Tested-by:
TYPO3 Release Team <typo3cms@typo3.org>
-
TYPO3 Release Team authored
Change-Id: Idcbacb7c6d5e08cc6a0dbf64fecebe93e02e633c Reviewed-on: https://review.typo3.org/47355 Reviewed-by:
TYPO3 Release Team <typo3cms@typo3.org> Tested-by:
TYPO3 Release Team <typo3cms@typo3.org>
-
Benni Mack authored
During the refactoring of the impexp module a check for the page ID was introduced to show the pagetree and additional fields only if a page ID was given, which disallows to export records on ID 0. Additionally, a minor JavaScript bug which popped up then is fixed as well. Resolves: #75183 Releases: master, 7.6 Change-Id: I0adbd933ecc5da938b511d531178ac707cb035c3 Reviewed-on: https://review.typo3.org/47347 Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org> Reviewed-by:
Christian Kuhn <lolli@schwarzbu.ch> Tested-by:
Christian Kuhn <lolli@schwarzbu.ch>
-
Mathias Schreiber authored
In order to make navigating the docs possible, we added the TOCs Resolves: # Releases: master Change-Id: I91e03693743e299a20d5a0f580e927c99143647f Reviewed-on: https://review.typo3.org/47352 Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org>
-
Oliver Hader authored
Adjust unit tests concerning changed internal class dependencies. Resolves: #75214 Releases: master Change-Id: I3bbb261300370f1d0cafb62bd8f79379c3ef8909 Reviewed-on: https://review.typo3.org/47351 Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org>
-
Benni Mack authored
There are several problems due to the implementation of JsonView that returns spaces around a JSON returned to the extension manager that will update the latest extensions. Resolves: #75214 Releases: master Change-Id: Iee837da392f62cd1df72c03dca0a03bb763c5790 Reviewed-on: https://review.typo3.org/47343 Reviewed-by:
Benni Mack <benni@typo3.org> Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Tested-by:
Frank Naegler <frank.naegler@typo3.org> Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org>
-
- Mar 21, 2016
-
-
Nicole Cordes authored
This patch ensures the correct record information for saving and inserting a new record even in a workspace. Resolves: #70542 Releases: master, 7.6 Change-Id: I3b88b08a55600f8c7bc5e2c2f05444624181db83 Reviewed-on: https://review.typo3.org/47153 Reviewed-by:
Nicole Cordes <typo3@cordes.co> Tested-by:
Nicole Cordes <typo3@cordes.co> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Claus Due authored
Fixes the following issues: * https://github.com/TYPO3Fluid/Fluid/pull/76 BUG Possibly NULL value in SpacelessViewHelper * https://github.com/TYPO3Fluid/Fluid/pull/80 PERFORMANCE Internal cache of resolved ViewHelpers * https://github.com/TYPO3Fluid/Fluid/pull/82 BUG Key used in ForViewHelper defaults to NULL * https://github.com/TYPO3Fluid/Fluid/pull/84 BUG Improper array accessing * https://github.com/TYPO3Fluid/Fluid/pull/85 BUG/TASK Prefix to avoid reserving "sections" variable name * https://github.com/TYPO3Fluid/Fluid/pull/72 BUG Windows paths support in TemplatePaths * https://github.com/TYPO3Fluid/Fluid/pull/87 BUG Avoid invalid class name in compiled code when using non-file template sources * https://github.com/TYPO3Fluid/Fluid/pull/77 BUG Recursive section rendering accesses incorrect RenderingContext (see https://forge.typo3.org/issues/74393) * https://github.com/TYPO3Fluid/Fluid/pull/94 BUG Avoid double HTML encoding on chained view helpers (see https://forge.typo3.org/issues/75133) Change-Id: I30062eb4a7fee1c2745a8067764f18d0753db88e Releases: master Resolves: #75135 Resolves: #74393 Reviewed-on: https://review.typo3.org/47279 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Frank Naegler authored
Fix handling of inline records in JavaScript. Prevent wrong count of elements by adding a trimExplode function intead of usage native split function. Resolves: #72379 Releases: master, 7.6 Change-Id: Id6cde49eb6179ddc3d5b0ef796a0a6883dfa747e Reviewed-on: https://review.typo3.org/47337 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
Mathias Schreiber authored
Moved Feature Docs because Github Docs have been updated Resolves: # Releases: master Change-Id: I2dd09a81b14334f944b0adba4412864390940d98 Reviewed-on: https://review.typo3.org/47339 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Benni Mack authored
PHP 5.5 does not support APC anymore, but instead uses APCu for everything that is in the userland. Our code should be adapted to use APCu instead, since TYPO3 CMS 7 LTS requires PHP 5.5+. However, there are some edge cases where APCu is available as APC, so the existing APC code is kept. Resolves: #63291 Releases: master, 7.6 Change-Id: Ica6bac270b54e5a645d37679e5663479ef36f394 Reviewed-on: https://review.typo3.org/47024 Reviewed-by:
Steffen Müller <typo3@t3node.com> Tested-by:
Steffen Müller <typo3@t3node.com> Reviewed-by:
Alexander Opitz <opitz.alexander@googlemail.com> Tested-by:
Alexander Opitz <opitz.alexander@googlemail.com> Reviewed-by:
Oliver Hader <oliver.hader@typo3.org> Tested-by:
Oliver Hader <oliver.hader@typo3.org>
-
Mathias Schreiber authored
Moved breaking Docs because Github Docs have been updated Resolves: # Releases: master Change-Id: I280c4081fd9b2d52e929f7e13aa961d2cb7ad8e3 Reviewed-on: https://review.typo3.org/47338 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Andreas Fernandez authored
The ResourceCompressor must ensure the correct order of @-rules, which is: 1. charset 2. namespace 3. import If the concatenated CSS contains multiple @charset rules, only the first one is taken into account. Change-Id: I8c912874d486eac16505884e68a04b0bba400611 Resolves: #55690 Releases: master, 7.6 Reviewed-on: https://review.typo3.org/47251 Reviewed-by:
Jigal van Hemert <jigal.van.hemert@typo3.org> Tested-by:
Jigal van Hemert <jigal.van.hemert@typo3.org> Reviewed-by:
Michael Oehlhof <typo3@oehlhof.de> Tested-by:
Riccardo De Contardi <erredeco@gmail.com> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
Michael Oehlhof authored
The text on the OK button was changed from "Yes, delete this file" to "Yes, delete this folder" when a folder should be deleted. Resolves: #75190 Releases: master Change-Id: I9568865b8f8536e4bc9993e6ab8e607fb7b13eb7 Reviewed-on: https://review.typo3.org/47330 Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Riccardo De Contardi <erredeco@gmail.com> Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Tested-by:
Frank Naegler <frank.naegler@typo3.org>
-
Mathias Schreiber authored
Proofread breaking Docs - one got left behind Resolves: # Releases: master Change-Id: If2181495ef7ecf3f0b2159482b40a7fb8d143147 Reviewed-on: https://review.typo3.org/47335 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
- Mar 20, 2016
-
-
Benni Mack authored
The new hook introduced for BackendUtility::viewOnClick() added a parameter "backPath" which was never evaluated and was there for legacy reasons. The option has no effect and should not be part of the hook signature. The followup patch removes the property again. Resolves: #54887 Releases: master Change-Id: I6d0fec5d7639c1de00d73a4dc1196fb65268f1ce Reviewed-on: https://review.typo3.org/47326 Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Tested-by:
Frank Naegler <frank.naegler@typo3.org> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Tested-by:
Wouter Wolters <typo3@wouterwolters.nl>
-
- Mar 18, 2016
-
-
Michael Oehlhof authored
Proofread breaking Docs Resolves: # Releases: master Change-Id: Ia0803361711f84ffb0637e30651d5f3bfc1a9add Reviewed-on: https://review.typo3.org/47327 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Mathias Schreiber authored
Proofread breaking Docs Resolves: # Releases: master Change-Id: I1c86c278d466d47e4bc866443f9267f00d2973e3 Reviewed-on: https://review.typo3.org/47322 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Mathias Schreiber authored
Proofread Deprecation Docs Resolves: # Releases: master Change-Id: I9ac836f1833f7957581e83353a902ef4bdecc1ee Reviewed-on: https://review.typo3.org/47304 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Mathias Schreiber authored
Proofread Deprecation Docs Resolves: # Releases: master Change-Id: I6fb335255f8117815aa4b717bf2eca9788502c21 Reviewed-on: https://review.typo3.org/47303 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Mathias Schreiber authored
Proofread breaking Docs Resolves: # Releases: master Change-Id: I5cba29ffb42a33d2b5807f09d7e5c4ceceafff7d Reviewed-on: https://review.typo3.org/47301 Reviewed-by:
Benni Mack <benni@typo3.org> Tested-by:
Benni Mack <benni@typo3.org>
-
Markus Sommer authored
Stop the toggle animation an the module headline first before a new animation is started Resolves: #75179 Releases: master, 7.6 Change-Id: I1dc683ba7740a0a939d699e6d3c01b154583a00a Reviewed-on: https://review.typo3.org/47310 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Tested-by:
Frank Naegler <frank.naegler@typo3.org>
-
Alexander Jahn authored
Removing @injects introduced explicit injectFunctions into WidgetRequestHandler. These functions were named after the object they inject. This resulted in two methods injecting different objects into the same property and in the end the parent class' function reverted the local implementation. Change-Id: I345d04f150fe6413ffc67c159c43cdda7e979e7b Resolves: #74536 Related: #73018 Releases: master, 7.6 Reviewed-on: https://review.typo3.org/47163 Reviewed-by:
Nicole Cordes <typo3@cordes.co> Tested-by:
Nicole Cordes <typo3@cordes.co> Reviewed-by:
Markus Klein <markus.klein@typo3.org> Tested-by:
Markus Klein <markus.klein@typo3.org> Reviewed-by:
Daniel Goerz <ervaude@gmail.com> Reviewed-by:
Jan Helke <typo3@helke.de> Tested-by:
Jan Helke <typo3@helke.de>
-
Frank Naegler authored
The difference between translation changes of records are now highlighted again in FormEngine. Resolves: #73501 Releases: master, 7.6 Change-Id: I88f4a67c5392cf9ddca4410ddb07d57439a26b3a Reviewed-on: https://review.typo3.org/47253 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Jan Helke <typo3@helke.de> Tested-by:
Jan Helke <typo3@helke.de>
-
Benni Mack authored
The deprecated property "includeJSlibs" is removed in favor of the introduced property "includeJSLibs". Resolves: #75150 Releases: master Change-Id: I120a644a55cadb1bc345b3c9af0bb08dec470508 Reviewed-on: https://review.typo3.org/47297 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Mathias Brodala <mbrodala@pagemachine.de> Reviewed-by:
Wouter Wolters <typo3@wouterwolters.nl> Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Tested-by:
Frank Naegler <frank.naegler@typo3.org>
-
Marco Huber authored
To enable links with spaces and other special chars the service class to build the correctly escaped <link> tag is used. Resolves: #73675 Releases: master,7.6 Change-Id: I530cb7569372d2da12d0015e820b458c8299f435 Reviewed-on: https://review.typo3.org/46896 Reviewed-by:
Markus Klein <markus.klein@typo3.org> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Jan Helke <typo3@helke.de> Tested-by:
Jan Helke <typo3@helke.de>
-
Heiko Hardt authored
This fix solves the problem that hidden page translations not are not reviewable if logged in and "Show hidden pages" in admin panel is enabled. Treat records of "pages_language_overlay" as pages to make use of the showHiddenPage flag. Resolves: #75116 Releases: master, 7.6 Change-Id: I083ee3a90230b6c97eb20def93c9e96bfe31c4cb Reviewed-on: https://review.typo3.org/47263 Reviewed-by:
Frank Naegler <frank.naegler@typo3.org> Reviewed-by:
Mathias Schreiber <mathias.schreiber@wmdb.de> Tested-by:
Mathias Schreiber <mathias.schreiber@wmdb.de> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
Benjamin Serfhos authored
When TCA [ctrl][security][ignoreRootLevelRestriction] is enabled, the root level should be ignored on creation too. Resolves: #75147 Releases: master,7.6 Change-Id: I55414696838a256d967d410cf523edc031ebe952 Reviewed-on: https://review.typo3.org/47290 Tested-by:
Benjamin Serfhos <serfhos@gmail.com> Reviewed-by:
Frans Saris <franssaris@gmail.com> Tested-by:
Frans Saris <franssaris@gmail.com> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
Andreas Wolf authored
In a workspace, when a record is saved which contains an IRRE-managed relation in a flexform field, the relation is duplicated. The reason is that the workspace information is lost along the way when processing the flexform content. This commit introduces an additional method parameter to the relevant flexform processing callbacks. Additionally, this fixes an error in the Flexform XML fixture, which (apparently) made the test go into an endless loop. Work time for this patch was sponsored by Matthias Krappitz (aemka.de), the time for developing the test was sponsored by me. Releases: master, 7.6, 6.2 Resolves: #70962 Change-Id: If6d71cf966408fcf976365fc01e6a2529bf1902d Reviewed-on: https://review.typo3.org/44233 Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de> Reviewed-by:
Markus Sommer <markussom@posteo.de> Tested-by:
Markus Sommer <markussom@posteo.de> Reviewed-by:
Andreas Wolf <andreas.wolf@typo3.org> Tested-by:
Andreas Wolf <andreas.wolf@typo3.org>
-
Andreas Fernandez authored
The LocalizationController used by the localization wizard is now covered by some functional tests. For better testability, the DataHandler processing in the controller is moved into its own method. Resolves: #75160 Related: #73617 Releases: master, 7.6 Change-Id: I3275f51d3dfec55ace3d8dbe7130c3f18b963341 Reviewed-on: https://review.typo3.org/47305 Reviewed-by:
Nicole Cordes <typo3@cordes.co> Tested-by:
Nicole Cordes <typo3@cordes.co> Reviewed-by:
Steffen Müller <typo3@t3node.com> Tested-by:
Steffen Müller <typo3@t3node.com>
-
Christian Weiske authored
Resolves: #72981 Releases: master, 7.6 Change-Id: I75deb2dd8808c0dccfe30b90b2459937b40dbd7c Reviewed-on: https://review.typo3.org/46273 Reviewed-by:
Frans Saris <franssaris@gmail.com> Tested-by:
Frans Saris <franssaris@gmail.com> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
- Mar 17, 2016
-
-
Andreas Fernandez authored
Change-Id: I920cab82f1e9304be6c718b33c1a8ce13c745e17 Resolves: #73617 Releases: master, 7.6 Reviewed-on: https://review.typo3.org/47264 Tested-by:
Armin Ruediger Vieweg <armin@v.ieweg.de> Reviewed-by:
Frans Saris <franssaris@gmail.com> Tested-by:
Frans Saris <franssaris@gmail.com> Reviewed-by:
Ruud Silvrants <ruudsilvrants@gmail.com> Tested-by:
Ruud Silvrants <ruudsilvrants@gmail.com> Reviewed-by:
Andreas Fernandez <typo3@scripting-base.de> Tested-by:
Andreas Fernandez <typo3@scripting-base.de>
-
Thorsten Griebenow authored
Resolves: #74317 Releases: master Change-Id: Iacbe2358fa9d62da6c2f7604c70a438e55fca0e1 Reviewed-on: https://review.typo3.org/47093 Reviewed-by:
Bjoern Jacob <bjoern.jacob@tritum.de> Tested-by:
Bjoern Jacob <bjoern.jacob@tritum.de> Reviewed-by:
Frans Saris <franssaris@gmail.com> Tested-by:
Frans Saris <franssaris@gmail.com>
-