hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,008 Commits 268 Branches 107 Tags
b3345c137ce1942d38bb9d7756ac907dd429c45c
Commit Graph

17008 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aynsix
6086b3d4c3 use substitution image if subdef not available 2022-02-02 17:28:36 +03:00
aynsix
97ab8e1128 add warning string 2022-02-02 08:44:46 +03:00
aynsix
6240f1f888 check right on subdef 2022-02-01 16:44:24 +03:00
aynsix
720b8ba232 add check file on download 2022-02-01 11:28:15 +03:00
aynsix
d0d7599fd9 fix document subdef 2022-02-01 11:04:20 +03:00
aynsix
611b166a8a fix 2022-01-31 20:17:13 +03:00
aynsix
b52fdddb2b select subdef to download 2022-01-31 19:56:55 +03:00
Nicolas Maillat
4423eceb9a Merge branch 'master' into PHRAS-3595-publication-notification 2022-01-31 16:45:34 +01:00
Hosted Weblate
c7c2d11f56 Merge branch 'origin/master' into Weblate. 2022-01-31 16:41:04 +01:00
Nicolas Maillat
59f3d1ffb7 Merge pull request #3949 from alchemy-fr/PHRAS-3636-add-db-backup-container 
PHRAS-3636 add db backup container
 2022-01-31 16:41:00 +01:00
Nicolas Maillat
cc96d93add PHRAS-3618 adding bin/maintenance to .dockerignore 
[ci skip]
 2022-01-31 16:40:38 +01:00
aynsix
94a9a37569 subdef mapping 2022-01-31 17:07:34 +03:00
Nicolas Maillat
dff2db43ff Merge branch 'master' into PHRAS-3636-add-db-backup-container 2022-01-31 14:49:33 +01:00
Moctar
2ae10f9582 set default backup time value 2022-01-28 17:07:36 +01:00
aynsix
0c5b9f1d42 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3633-customable-title-message 2022-01-28 17:54:51 +03:00
aynsix
67d3055391 fix item number and force download 2022-01-28 16:58:22 +03:00
Moctar
9b8461e6ff Merge branch 'PHRAS-3636-add-db-backup-container' of github.com:alchemy-fr/Phraseanet into PHRAS-3636-add-db-backup-container 2022-01-28 11:18:53 +01:00
Moctar
326b0a2f9a remove backup from prod profile 2022-01-28 11:16:52 +01:00
Hosted Weblate
7d97173c7a Merge branch 'origin/master' into Weblate. 2022-01-28 09:00:46 +01:00
Nicolas Maillat
994f9472e7 Merge pull request #3941 from alchemy-fr/PHRAS-3618-bin-maintenance 
PHRAS-3618 merge clean references to orphans/missing data
 2022-01-28 09:00:41 +01:00
aynsix
8f915f322e add some options 2022-01-27 19:12:34 +03:00
Nicolas Maillat
37f6e6c947 Merge branch 'master' into PHRAS-3618-bin-maintenance 2022-01-26 23:47:27 +01:00
Nicolas Maillat
c984596ea4 tmp removing time 2022-01-26 23:08:47 +01:00
Nicolas Maillat
7d198a2c32 Merge branch 'master' into PHRAS-3636-add-db-backup-container 2022-01-26 22:44:37 +01:00
Hosted Weblate
3e07b54e6a Merge branch 'origin/master' into Weblate. 2022-01-26 22:44:29 +01:00
Nicolas Maillat
8172fafb97 Merge pull request #3942 from alchemy-fr/PHRAS-3620-admin-subview-bad-path 
PHRAS-3620  merge Admin - subviews : a bad path can lead to creating file at the roots of the Phraseanet sources.
 2022-01-26 22:44:22 +01:00
aynsix
f9446b55d5 update translation 2022-01-26 19:43:45 +03:00
aynsix
e65aa1ebeb fix 2022-01-26 18:33:52 +03:00
aynsix
d9d2fd0ac3 fix focus in ui dialog 2022-01-26 18:21:15 +03:00
aynsix
9584e91e3d use word subdefs instead subview 2022-01-26 16:32:51 +03:00
aynsix
308c2dd896 some fix 2022-01-26 16:27:03 +03:00
Nicolas Maillat
5726f9a8c0 Merge branch 'master' into PHRAS-3618-bin-maintenance 2022-01-25 14:59:19 +01:00
aynsix
f9aaec1e49 PHRAS-3633 add tittle and message on print 2022-01-25 16:24:51 +03:00
Moctar
4b4ccffef6 fix nginx error when adding simplesaml config 2022-01-25 12:37:11 +01:00
Moctar
0e171e3e23 PHRAS-3636 update .env and docker-compose-tools to add backup db 2022-01-25 12:28:36 +01:00
Moctar
b7fdae249c Merge branch 'master' of github.com:alchemy-fr/Phraseanet into HEAD 2022-01-25 10:25:14 +01:00
Nicolas Maillat
7ed464eaec Merge branch 'master' into PHRAS-3620-admin-subview-bad-path 2022-01-24 09:55:43 +01:00
Hosted Weblate
9da5d4d1d4 Merge branch 'origin/master' into Weblate. 2022-01-24 09:55:33 +01:00
Nicolas Maillat
c4c0a4e870 Merge pull request #3947 from alchemy-fr/PHRAS-3229-thesaurus-gui 
PHRAS-3229  merge Thesaurus GUI improvement - import - refresh candidat terms
 2022-01-24 09:55:27 +01:00
Nicolas Maillat
64d9a17880 Merge branch 'master' into PHRAS-3229-thesaurus-gui 2022-01-21 11:51:04 +01:00
Hosted Weblate
92c210b35f Merge branch 'origin/master' into Weblate. 2022-01-21 11:25:23 +01:00
jygaulier
1a5f74adef Update README.md 
add rm cache after build cmd line
 2022-01-21 11:25:18 +01:00
aynsix
d5b03a425b PHRAS-3229 fix properties 2022-01-21 12:05:55 +03:00
aynsix
2c16088f37 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3229-thesaurus-gui 2022-01-21 11:11:59 +03:00
Nicolas Maillat
c896f3f452 Merge branch 'master' into PHRAS-3620-admin-subview-bad-path 2022-01-20 16:43:18 +01:00
aynsix
464bfd0e2a fix table properties 2022-01-20 18:25:51 +03:00
aynsix
dfc51a0e31 merge master into branch 2022-01-20 16:40:02 +03:00
aynsix
7f1e747ea3 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3618-bin-maintenance 2022-01-20 16:27:11 +03:00
Hosted Weblate
77c6d8a881 Merge branch 'origin/master' into Weblate. 2022-01-20 14:26:18 +01:00
Nicolas Maillat
96e233ba4e Merge pull request #3948 from alchemy-fr/PHRAS-3285-fix-stock 
PHRAS-3285 merge Thesaurus - candidat panel - The Stock is not available
 2022-01-20 14:26:13 +01:00