Commit Graph

79 Commits

Author SHA1 Message Date
poka 680c4b67e8 Move avatar_user.png to images 2019-11-26 00:38:09 +01:00
poka d915fd4c64 Create products.css 2019-11-25 23:36:41 +01:00
poka b509f655f9 Improve home CSS 2019-11-25 23:24:13 +01:00
poka 449201652d Change CSS stuff in home page and products page, remove style= in twig template for style.css 2019-11-25 21:28:28 +01:00
poka 5b3332b798 Add default pictures where no image uploaded for products 2019-11-25 20:17:45 +01:00
poka f3728dd939 Change button type to submit for Valider connexion 2019-11-25 00:51:24 +01:00
poka 65fa534743 Fix relative path 2019-11-24 05:10:39 +01:00
poka 022cf49eea Lock transaction hash ever applied 2019-11-24 04:44:56 +01:00
poka 1987ca71b3 Add piscine scanning. Deincrease quantity rather than status 2019-11-24 03:48:51 +01:00
poka 46a4b54118 Add case for several solds 2019-11-23 18:43:13 +01:00
poka b035d4022d Merge remote-tracking branch 'origin' into dev-check-sold 2019-11-23 17:26:07 +01:00
poka f73d15220e Standard g1 node from config, sudo mysql 2019-11-23 17:24:08 +01:00
nox e557174e96 Correction des urls 2019-11-23 17:18:44 +01:00
nox a2121389bb Mise en place de la carte de France interactive 2019-11-23 16:50:18 +01:00
nox e4e2ae854a Merge branch 'master' of https://git.p2p.legal/axiom-team/gmarche 2019-11-22 20:46:58 +01:00
poka 49ea6216d6 Merge branch 'master' into dev-check-sold 2019-11-22 18:48:20 +01:00
nox 4f7d557147 Réglage bug affichage Produits 2019-11-21 23:36:39 +01:00
poka 7984a95d17 Merge remote-tracking branch 'origin' into dev-new-conf 2019-11-21 16:37:05 +01:00
nox 8770a46caa Ajout du css mapael 2019-11-21 14:52:57 +01:00
poka b42726ff2d Fix produits and recherches routes 2019-11-21 14:16:02 +01:00
poka f371847214 Fix regions link in home page by removing / in src/Gmarche/GmarcheModule.php line 24 2019-11-21 13:43:48 +01:00
poka 6296f10b3f Fix home button with standard location 2019-11-21 13:42:06 +01:00
poka 7e3d9537c7 Comment check if (->matches()) line 94 in vendor/nikic/fast-route/src/DataGenerator/RegexBasedAbstract.php 2019-11-21 13:40:50 +01:00
poka 8eeafbe1fb typo readme 2019-11-21 13:02:18 +01:00
poka bf21fcf396 Improve README.md 2019-11-21 13:00:35 +01:00
poka 6cdfb46025 Improve configs files 2019-11-21 12:57:32 +01:00
poka 24d3336d00 Change config var names, fusion config, remove prefix in url routing 2019-11-20 21:59:17 +01:00
nox c06fe37d69 Corrections connexion user et affichage dans produits des boutons Actions - Renommage dossier ajax en models 2019-11-19 23:09:14 +01:00
poka 7da07e5b16 Change [solde] to [Vendu] 2019-11-19 17:44:36 +01:00
poka 48668e7433 Add solde status to products when transaction is detected 2019-11-19 00:59:03 +01:00
nox 3e65bf1fcf Finalisation Connexion user - Ajout lien Reinit mot de passe - Ajout Profil user 2019-11-18 21:46:33 +01:00
nox 0e895c8ae1 Correction de la connexion user sur tous les écrans 2019-11-14 00:49:03 +01:00
poka 64114df2ff Merge branch 'dev-signup-check-pubkey' 2019-11-13 22:09:57 +01:00
poka 8ec3348229 add variable to conf.php 2019-11-13 22:08:52 +01:00
nox 73a5ac8968 Changement version jquery 2019-11-10 03:23:00 +01:00
nox 3183205b0a Correction bug sur création d'un produit 2019-11-10 01:42:48 +01:00
nox fd02c29a68 Correction bug sur ajout d'un produit 2019-11-09 23:40:04 +01:00
nox ae70c27b94 Implémentation de la connexion de l'utilisateur sur les différents écrans 2019-11-09 23:23:19 +01:00
poka 8d5d361e38 Merge branch 'dev-signup-check-pubkey' 2019-11-08 16:03:12 +01:00
poka 1427481330 Merge branch 'master' of https://git.p2p.legal/axiom-team/gmarche 2019-11-08 15:52:51 +01:00
poka 0ad78697ac Add title on pubkey hover, fix css for breadcrumbs navigation 2019-11-08 04:06:39 +01:00
poka 7dd186b47c Add prefere node for cesium api 2019-11-08 03:17:28 +01:00
poka ac0ae0f2ef Improve signup css 2019-11-08 02:58:13 +01:00
poka 980148e2bb Improve signup css 2019-11-08 02:55:37 +01:00
poka a5652703b1 Add Cesium link profile to pseudo in readRecords1/2.php 2019-11-08 01:25:31 +01:00
poka 514f8936a9 Add short pubkey in Recherche tab 2019-11-08 00:50:21 +01:00
poka 09737870d0 Add link in pubkey to pay via Cesium in readRecords.php 2019-11-08 00:43:00 +01:00
poka 659a86eba4 Add loading animation when searching pubkey 2019-11-07 23:39:33 +01:00
nox 14cba978fe Ajout du popup de connexion et correction affichage des actions en fonction du connecté 2019-11-04 23:26:02 +01:00
poka 30ecfb23c8 Voir la clé des vendeurs dans la liste des produits recherchés V1 2019-11-04 05:18:05 +01:00