Skip to content

Instantly share code, notes, and snippets.

View grena's full-sized avatar

Adrien Pétremann grena

View GitHub Profile
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()
{
"values": [
{
"attribute": "",
"locale": "",
"channel": "",
"data": "",
"context": {
"labels": [
{
<!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
grena / namegen.js
Created November 12, 2018 22:01 — forked from BonsaiDen/namegen.js
Planet Name Generator thing
function NameGenerator(state) {
// Syllables shamelessly stolen from elite
var syllables = 'folexegezacebisousesarmaindirea.eratenberalavetiedorquanteisrion',
vocals = 'aeiou';
// Some improvements
var vocalMustFollow = 'tdbr',
notFollowdBySelf = 'rstie',
onlyAtStart = 'xyz',
#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
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">
--- 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
grena / test.md
Last active January 24, 2017 10:48

By default in the pre-filled cartouche:

Q A
Added Specs Todo
Added Behats Todo
Added integration tests Todo
Changelog updated Todo
Review and 2 GTM Todo
Micro Demo to the PO (Story only) Todo

Keybase proof

I hereby claim:

  • I am grena on github.
  • I am grena (https://keybase.io/grena) on keybase.
  • I have a public key whose fingerprint is B051 D11C 8DDE 71E4 50E9 9FAF F8AA 53AC 4B68 ED90

To claim this, I am signing this object:

@grena
grena / association_type.md
Last active June 15, 2016 10:02
Structured formats for PIM entities

AssociationType

Standard

[
	'code'   => 'mycode',
	'labels' => [
	   'fr_FR' => 'XSELL',
	   'en_US' => 'Vente croisée',
	]