Adrien Pétremann grena
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| --- a/.ci/Jenkinsfile | |
| +++ b/.ci/Jenkinsfile | |
| @@@ -105,7 -95,11 +105,13 @@@ stage("Build") | |
| // Compatibility layer while the EE is not up to date with the new CI | |
| sh "cp vendor/akeneo/pim-community-dev/Dockerfile ." | |
| sh "cp -R vendor/akeneo/pim-community-dev/.ci ." | |
| - sh "mkdir -m 777 -p app/build/logs/behat app/build/logs/consumer " | |
| ++<<<<<<< HEAD | |
| ++======= |
grena
/ azeaze.diff
Created
February 15, 2018 09:13
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --cc src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig | |
| index 2ee1827c98,dfdba77451..0000000000 | |
| --- a/src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig | |
| +++ b/src/Pim/Bundle/EnrichBundle/Resources/views/MassEditAction/configure.html.twig | |
| @@@ -37,34 -34,19 +37,50 @@@ | |
| {% block formContent %} | |
| {% endblock %} | |
| </div> | |
| ++<<<<<<< HEAD | |
| + <div class="AknWidget-footer"> |
grena
/ gist:d1b7aedc8f8bdca519da051ead66069c
Last active
September 17, 2018 21:06
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| #home/clean | |
| #tool/406272863/use?from=home | |
| #tool/406273899/removeFromBag | |
| #tool/406272864/addToBag | |
| #city/enter#home | |
| #city/giveTown?tid=406273899 | |
| #city/takeFromCity?tid=2885 | |
| #city/closeDoor |
grena
/ namegen.js
Created
November 12, 2018 22:01
— forked from BonsaiDen/namegen.js
Planet Name Generator thing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| function NameGenerator(state) { | |
| // Syllables shamelessly stolen from elite | |
| var syllables = 'folexegezacebisousesarmaindirea.eratenberalavetiedorquanteisrion', | |
| vocals = 'aeiou'; | |
| // Some improvements | |
| var vocalMustFollow = 'tdbr', | |
| notFollowdBySelf = 'rstie', | |
| onlyAtStart = 'xyz', |
grena
/ index.html
Created
December 19, 2018 09:19
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| <!doctype html> | |
| <html xmlns="http://www.w3.org/1999/xhtml" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office"> | |
| <head> | |
| <title>%%subject%%</title> | |
| <!--[if !mso]><!-- --> | |
| <meta http-equiv="X-UA-Compatible" content="IE=edge"> | |
| <!--<![endif]--> | |
| <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> | |
| <style type="text/css"> | |
| #outlook a { padding: 0; } |
grena
/ context.json
Last active
March 29, 2019 14:46
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| { | |
| "values": [ | |
| { | |
| "attribute": "", | |
| "locale": "", | |
| "channel": "", | |
| "data": "", | |
| "context": { | |
| "labels": [ | |
| { |
grena
/ custom.diff
Created
January 20, 2021 11:42
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/src/Webkul/PrestashopConnectorBundle/Controller/Rest/ExportMappingController.php b/src/Webkul/PrestashopConnectorBundle/Controller/Rest/ExportMappingController.php | |
| index aa153d0..1391116 100644 | |
| --- a/src/Webkul/PrestashopConnectorBundle/Controller/Rest/ExportMappingController.php | |
| +++ b/src/Webkul/PrestashopConnectorBundle/Controller/Rest/ExportMappingController.php | |
| @@ -322,4 +322,13 @@ class ExportMappingController extends Controller | |
| ]; | |
| } | |
| + | |
| + public function getChannels() |
OlderNewer