3
0
Fork 0
mirror of https://github.com/nanoy42/coope synced 2024-11-25 04:43:11 +00:00
Commit graph

205 commits

Author SHA1 Message Date
53d4acae01 Changement des widgtes 2019-01-17 23:25:56 +01:00
be65967e3c Ajour d'icones 2019-01-17 23:16:43 +01:00
7907a91d7e Merge branch 'link_profile' into dev 2019-01-14 02:55:00 +01:00
26f638251d Ajout de liens pour les profils users et produits 2019-01-14 02:43:47 +01:00
81f5d15f72 Merge branch 'dev' of gitlab.rezometz.org:coope/coopeV3 into dev 2019-01-13 19:44:12 +01:00
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
e37c3d1c68 Préparation de la version 3.3 2019-01-06 16:01:22 +01:00
bfcdb18709 Merge branch 'fix-3.2.1' into dev 2019-01-06 15:59:20 +01:00
811f10dada Merge branch 'fix-3.2.1' 2019-01-06 15:59:08 +01:00
13c9f3421f Changelog 2019-01-06 15:58:29 +01:00
b7a59913b0 Informations de version 2019-01-06 15:57:43 +01:00
0fa1ab34ea Fix 3.2.1 2019-01-06 15:57:02 +01:00
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
6e8db2bafb Update du changelog 2019-01-06 06:17:13 +01:00
848ee05a43 Update des informations de version 2019-01-06 06:10:08 +01:00
f242897793 Liens sur le profil
Close #26
2019-01-06 06:04:37 +01:00
f10309a1ce Merge branch 'export_group_list' into dev
Close #28
2019-01-06 06:02:45 +01:00
e5276693d3 Export_group_list 2019-01-06 06:02:16 +01:00
4068c5212a Premières icônes 2019-01-06 05:35:28 +01:00
d61bb8204e Merge branch 'boutons_paimement' into dev
Close #24
2019-01-06 05:19:16 +01:00
f240a7b43f Boutons flottants 2019-01-06 05:18:31 +01:00
760f869e24 Merge branch 'diagramme_profil' into dev
Close #1
2019-01-06 04:39:45 +01:00
fb33396956 Fix diagramme profil 2019-01-06 04:39:30 +01:00
d94676d5ec Merge branch 'compta' into dev
Close #18
2019-01-06 00:02:04 +01:00
84b7e5281c Comptabilité 2019-01-06 00:01:30 +01:00
Nanoy
a70e707799 Merge branch 'release-3.1.0' into 'dev'
Release 3.1.0

See merge request coope/coopeV3!2
2018-12-24 11:37:25 +01:00
Nanoy
ae65ba6003 Merge branch 'release-3.1.0' into 'master'
Release 3.1.0

Closes #23, #20, #21, #12, #3, #10, #25, #2, #16, #15, #14, #9, and #8

See merge request coope/coopeV3!1
2018-12-24 11:36:46 +01:00
44db06a604 Changelog 2018-12-24 02:16:31 +01:00
28e32ba197 Mise à jour des informations de version 2018-12-24 02:04:44 +01:00
5683f86996 Merge branch 'cancel_reload' into dev
Close #23
2018-12-24 01:32:22 +01:00
b0d3084d4b Annulation de rechargement 2018-12-24 01:30:00 +01:00
db2c82cfe7 Merge branch 'product_autocomplete_manage' into dev
Close #20
2018-12-23 23:55:50 +01:00
16622c4ba7 Ajout du champ produit 2018-12-23 23:55:27 +01:00
efb9d3be23 Merge branch 'fix_permissions_affichage' into dev
Close #21
2018-12-23 23:17:36 +01:00
885f2c2af8 Fix permissions 2018-12-23 23:17:08 +01:00
613c2b8348 Merge branch 'words' into dev
Close #12
2018-12-23 21:57:28 +01:00
d1449f7b0f Corrections mineures 2018-12-23 21:57:02 +01:00
924e1cb60f Merge branch 'search_profile_admin' into dev
Close #3
2018-12-23 21:49:23 +01:00
f0aa02eeb4 Add search bar on profile admin 2018-12-23 21:48:49 +01:00
b4b88b1dba Merge branch 'activateUser' into dev
Close #10
2018-12-23 21:44:20 +01:00
e81152c717 Ajout d'un lien sur le profil 2018-12-23 21:44:06 +01:00
e01fb202ff Modification dans la liste 2018-12-23 21:38:53 +01:00
729434c1fb Merge branch 'suivi_pinte' into dev 2018-12-23 21:22:14 +01:00