3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-22 19:33:11 +00:00
Commit graph

172 commits

Author SHA1 Message Date
66e5299395 Fix categories 2019-05-06 09:40:50 +02:00
6e00a4658b Fix categories 2019-05-06 09:40:40 +02:00
Nanoy
6792c0e099 Merge branch 'add-features-categories' into 'dev'
Add features categories

See merge request coope/coopev3!15
2019-05-06 08:42:37 +02:00
9c8487efec Only show category when not empty 2019-05-06 08:41:34 +02:00
acf770a4ef Add number of products on product's list 2019-05-06 08:39:31 +02:00
524f3dcc06 Préparation de la version 3.5.1 2019-05-06 08:35:55 +02:00
b1c7d08ac5 Mise à jour du changelog 2019-05-03 23:30:59 +02:00
67cb3565e6 Mise à jour des informations de version 2019-05-03 23:29:58 +02:00
33f6073f8d Ajout des stats 2019-05-03 23:27:11 +02:00
6cb0982261 Modification form 2019-05-03 21:14:47 +02:00
f1241be0c8 Add categories 2019-05-03 21:09:32 +02:00
4849cac128 Préparation de la version 3.5 2019-05-03 18:31:51 +02:00
32d4cf3356 Changelog 2019-04-28 18:36:42 +02:00
b490edfc51 Informations de version 2019-04-28 18:36:17 +02:00
6c12b716cf Fix getconfig 2019-04-28 18:35:48 +02:00
e79c42fab4 Merge branch 'release-3.4.1' 2019-04-28 13:33:57 +02:00
43804981f0 Update changelog 2019-04-28 13:33:37 +02:00
3d03369b0e Change version information 2019-04-28 13:31:46 +02:00
d4346cf4ee Remove vice-president, grocer, brewer and add phoenixTM_responsible 2019-04-28 13:30:11 +02:00
9464fe3caf Remove vice-president, grocer, brewer and add phoenixTM_responsible 2019-04-28 13:30:07 +02:00
b82fef0634 Add alcohol charter 2019-04-28 13:22:09 +02:00
7a2c4e14ee Active button when editing keg 2019-04-28 13:13:30 +02:00
aa1c948367 Modifs 2019-04-28 13:08:51 +02:00
c2ddbdbfed Merge branch 'release-3.4.0' 2019-02-28 13:26:50 +01:00
db0df75a1b Informations de version 2019-02-28 13:26:26 +01:00
3a79cfb0ce Doc 2019-02-28 13:18:41 +01:00
84e2a529c6 Admin 2019-02-27 08:59:41 +01:00
eabf4cdb2b Merge branch 'inscription' into dev 2019-02-26 23:19:34 +01:00
4bb8d00c90 Suppression de cotisations, informations utilisateurs 2019-02-26 23:18:53 +01:00
f9cea66804 Résolution du problème de Foulques 2019-02-25 11:13:42 +01:00
3025ed6cf4 Oubli de la migration 2019-02-21 20:08:47 +01:00
dedd30303a Meilleure inscription 2019-02-21 20:08:29 +01:00
9b71c52302 Verify oubli 2019-02-19 08:27:25 +01:00
e455859e13 Vue verify 2019-02-19 08:26:54 +01:00
ebb4ca36b2 Merge branch 'docs' into dev 2019-02-18 19:20:39 +01:00
e7e2153ab4 Ajout des documents 2019-02-18 19:20:09 +01:00
a25970e8b6 Préparation de la version 3.4 2019-02-18 17:56:02 +01:00
Nanoy
de65a5c726 Merge branch 'fix-3.3.3' into 'dev'
Fix 3.3.3

See merge request coope/coopev3!14
2019-01-26 17:04:38 +01:00
Nanoy
9f03e66a0b Merge branch 'fix-3.3.3' into 'master'
Fix 3.3.3

See merge request coope/coopev3!13
2019-01-26 17:04:28 +01:00
72bc1c7619 Mise à jour des informations de version 2019-01-26 17:03:14 +01:00
c6f45b4407 Fix order 2019-01-26 17:02:23 +01:00
Nanoy
320022adf1 Merge branch 'fix-3.3.2' into 'master'
Fix 3.3.2

See merge request coope/coopev3!11
2019-01-24 22:36:40 +01:00
Nanoy
511c75d2c2 Merge branch 'fix-3.3.2' into 'dev'
Fix 3.3.2

See merge request coope/coopev3!12
2019-01-24 22:36:30 +01:00
70f315204c Mise à jour des informations de version 2019-01-24 22:35:04 +01:00
2e07ed433c Reparation commande 2019-01-24 22:33:48 +01:00
3090356842 Fix de la liste des futs 2019-01-24 22:26:38 +01:00
Nanoy
cb3c9a80d1 Merge branch 'fix-3.3.1' into 'dev'
Fix 3.3.1

See merge request coope/coopev3!10
2019-01-23 12:33:01 +01:00
Nanoy
787d5fa2ba Merge branch 'fix-3.3.1' into 'master'
fi-3.3.1

See merge request coope/coopev3!9
2019-01-23 12:32:19 +01:00
Nanoy
ec980634ed contains devient icontains 2019-01-23 12:31:33 +01:00
Nanoy
9364838c34 Merge branch 'release-3.3.0' into 'master'
Release 3.3.0

Closes #29, #30, #31, #32, #34, #35, #36, #37, #38, and #39

See merge request coope/coopev3!7
2019-01-23 10:59:22 +01:00