coopeTM/coope
3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-06-02 13:21:48 +00:00
Code Issues Releases Wiki Activity
230 commits 4 branches 6 tags 8.4 MiB
Commit graph

230 commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Yoann Pétri 70f315204c Mise à jour des informations de version 2019-01-24 22:35:04 +01:00
Yoann Pétri 2e07ed433c Reparation commande 2019-01-24 22:33:48 +01:00
Yoann Pétri 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
Nanoy cbd6dc389a Merge branch 'release-3.3.0' into 'dev' 
Informations de version

See merge request coope/coopev3!8
 2019-01-23 10:59:09 +01:00
Yoann Pétri a64fc2bb28 Informations de version 2019-01-23 10:57:00 +01:00
Yoann Pétri dcabaaf4c0 Merge branch 'search' into dev 2019-01-23 10:49:56 +01:00
Yoann Pétri dac7a8312b startswith devient contains 2019-01-23 10:49:33 +01:00
Yoann Pétri d99d5a9ae3 Merge branch 'fix_invalidate' into dev 2019-01-23 10:43:39 +01:00
Yoann Pétri a28d9660dd Fix invalidation 2019-01-23 10:42:54 +01:00
Yoann Pétri f377ffb7c2 Merge branch 'degree' into dev 2019-01-22 20:42:13 +01:00
Yoann Pétri 791488d3ff Ajout du degré sur certaines pages 2019-01-22 20:40:20 +01:00
Yoann Pétri 424da8261c Proprification de order et easy_cotis 2019-01-22 20:27:18 +01:00
Yoann Pétri cf038ae493 Belles couleurs 2019-01-20 14:08:14 +01:00
Yoann Pétri d421f4af4c Merge branch 'automatic_lock' into dev 2019-01-20 12:15:14 +01:00
Yoann Pétri 75329f510d Automatic logout 2019-01-20 12:14:53 +01:00
Yoann Pétri 2329f938d1 Merge branch 'coope-runner' into dev 2019-01-20 09:28:39 +01:00
Yoann Pétri 5a18899dc6 Coope-runner 2019-01-20 09:28:11 +01:00
Yoann Pétri 8265a7535b Page d'accueil 2019-01-19 23:39:48 +01:00
Yoann Pétri bb5e2258f6 Merge branch 'classement_produit' into dev 2019-01-18 15:39:02 +01:00
Yoann Pétri 130a42ae73 Ajout classement produit 2019-01-18 15:38:48 +01:00
Yoann Pétri 53d4acae01 Changement des widgtes 2019-01-17 23:25:56 +01:00
Yoann Pétri be65967e3c Ajour d'icones 2019-01-17 23:16:43 +01:00
Yoann Pétri 7907a91d7e Merge branch 'link_profile' into dev 2019-01-14 02:55:00 +01:00
Yoann Pétri 26f638251d Ajout de liens pour les profils users et produits 2019-01-14 02:43:47 +01:00
Yoann Pétri 81f5d15f72 Merge branch 'dev' of gitlab.rezometz.org:coope/coopeV3 into dev 2019-01-13 19:44:12 +01:00
Yoann Pétri bc4532f1a7 Prise en charge de pipenv 2019-01-13 19:42:44 +01:00
Nanoy 5ab2e034bb Merge branch 'fix-3.2.2' into 'dev' 
Fix 3.2.2

See merge request coope/coopev3!6
 2019-01-11 08:51:49 +01:00
Nanoy c7169aff4a Merge branch 'dev' into 'fix-3.2.2' 
# Conflicts:
#   templates/footer.html
 2019-01-11 08:51:26 +01:00
Nanoy cf00ff87a1 Merge branch 'fix-3.2.2' into 'master' 
Fix 3.2.2

See merge request coope/coopev3!5
 2019-01-11 08:51:02 +01:00
Nanoy bb7ed6a706 Update changelog et version 2019-01-11 08:49:59 +01:00
Nanoy 475dd8c091 Fix cotisation 2019-01-11 08:46:29 +01:00
Yoann Pétri e37c3d1c68 Préparation de la version 3.3 2019-01-06 16:01:22 +01:00
Yoann Pétri bfcdb18709 Merge branch 'fix-3.2.1' into dev 2019-01-06 15:59:20 +01:00
Yoann Pétri 811f10dada Merge branch 'fix-3.2.1' 2019-01-06 15:59:08 +01:00
Yoann Pétri 13c9f3421f Changelog 2019-01-06 15:58:29 +01:00
Yoann Pétri b7a59913b0 Informations de version 2019-01-06 15:57:43 +01:00
Yoann Pétri 0fa1ab34ea Fix 3.2.1 2019-01-06 15:57:02 +01:00
Yoann Pétri b5f1f99150 Préparation de la version 3.3.0 2019-01-06 06:24:28 +01:00
Nanoy 030da5e42e Merge branch 'release-3.2.0' into 'dev' 
Release 3.2.0

See merge request coope/coopeV3!4
 2019-01-06 06:20:52 +01:00
Nanoy 350027042e Merge branch 'release-3.2.0' into 'master' 
Release 3.2.0

Closes #26, #28, #24, #1, and #18

See merge request coope/coopeV3!3
 2019-01-06 06:20:31 +01:00
Yoann Pétri 6e8db2bafb Update du changelog 2019-01-06 06:17:13 +01:00
Yoann Pétri 848ee05a43 Update des informations de version 2019-01-06 06:10:08 +01:00
Yoann Pétri f242897793 Liens sur le profil 
Close #26
 2019-01-06 06:04:37 +01:00
Yoann Pétri f10309a1ce Merge branch 'export_group_list' into dev 
Close #28
 2019-01-06 06:02:45 +01:00
Yoann Pétri e5276693d3 Export_group_list 2019-01-06 06:02:16 +01:00