hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 22:13:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,801 Commits 268 Branches 107 Tags
79d303ec867f6c0d13b4df1b51e7d5738212d2cc
Commit Graph

15801 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aynsix
79d303ec86 ftp config to false by default 2021-06-22 15:12:03 +03:00
aynsix
2c7d18529e remove authmod config 2021-06-22 13:56:16 +03:00
aynsix
ecc84e61da PHRAS-3438 fix squid container 2021-06-22 11:59:27 +03:00
aynsix
98a00039fb update test config 2021-06-21 16:49:18 +03:00
aynsix
7c28d17b6a Merge branch 'PHRAS-3438-http-server-proxy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3438-http-server-proxy 2021-06-21 16:38:32 +03:00
aynsix
e4d722b5a5 PHRAS-3438 use http proxy on uploader 2021-06-21 16:37:35 +03:00
Nicolas Maillat
c3492530ca Merge branch 'master' into PHRAS-3438-http-server-proxy 2021-06-18 19:54:04 +02:00
aynsix
9f42b7e9b6 add proxy config and add command to test defined configuration 2021-06-18 17:05:04 +03:00
Nicolas Maillat
8b87e4f72b Merge pull request #3798 from alchemy-fr/PHRAS-3447_file-lock-in-workers_4.1 
PHRAS-3447 Merge file lock in workers 4.1
 2021-06-18 14:43:40 +02:00
aynsix
efe90edd69 fix conf 2021-06-18 14:08:47 +03:00
aynsix
138fce905d add squid image 2021-06-16 18:01:23 +03:00
jygaulier
6c9ac8aba3 PHRAS-3447_file-lock-in-workers_4.1 
add traces because writemeta is ignored on alpha ?
 2021-06-16 12:11:37 +02:00
jygaulier
e87a51f7f3 PHRAS-3447_file-lock-in-workers_4.1 
add : writemeta on document : do not retry when exiftools says something like "looks more like a png"
 2021-06-16 12:11:37 +02:00
jygaulier
bc173c93b0 PHRAS-3447_file-lock-in-workers_4.1 
fix : missing "created" date
 2021-06-16 12:11:37 +02:00
jygaulier
336861b7c7 PHRAS-3447_file-lock-in-workers_4.1 
fix : replace doctrine by sql ; refacto ; add traces
 2021-06-16 12:11:37 +02:00
jygaulier
d041a4542b PHRAS-3447_file-lock-in-workers_4.1 
fix : add trace into writemeta
 2021-06-16 12:11:37 +02:00
jygaulier
9b3886d3dd PHRAS-3447_file-lock-in-workers_4.1 
fix : get mutex retry loop is ok (plain sql, no use of EM... no more "EM is closed")
 2021-06-16 12:11:37 +02:00
jygaulier
5f5ee4af95 PHRAS-3447_file-lock-in-workers_4.1 
fix : prevent file access with rules depending on job, wrap rules with mutex
 2021-06-16 12:11:37 +02:00
jygaulier
7c236a531a PHRAS-3447_file-lock-in-workers_4.1 
fix : exclusive lock for a worker to work on a subdef file
 2021-06-16 12:11:37 +02:00
Nicolas Maillat
efd335207b Merge pull request #3806 from alchemy-fr/PHRAS-3443-maintenance-message 
PHRAS-3443 merge Prod - Maintenance message is not displayed to the end user
 2021-06-09 11:39:58 +02:00
aynsix
1bb3e28be3 fix dialog 2021-06-07 17:56:17 +03:00
aynsix
655e335ecf show message maintenance notification 2021-06-04 17:48:33 +03:00
Nicolas Maillat
c0371a0804 Merge pull request #3804 from alchemy-fr/PHRAS-3102-add-env-mysql 
PHRAS-3102 Merge Docker Docker-compose - MariaDb container- Add env for set slow query - max_connection etc ...
 2021-06-03 23:35:44 +02:00
Nicolas Maillat
8a2162be12 Merge branch 'master' into PHRAS-3102-add-env-mysql 2021-06-03 23:02:52 +02:00
Nicolas Maillat
9f31e5a99c Merge pull request #3805 from alchemy-fr/PHRAS-3445-editrecord-some-fix 
PHRAS-3445 merge some fix for edit worker
 2021-06-03 23:02:36 +02:00
aynsix
e19746163a PHRAS-3445 some fix 2021-06-03 15:43:23 +03:00
jygaulier
3b49f6e27e Merge branch 'master' into PHRAS-3102-add-env-mysql 2021-06-03 10:55:10 +02:00
aynsix
77f12b1387 PHRAS-3102 add mysql env variable 2021-06-03 11:30:44 +03:00
Nicolas Maillat
3225513c9a Merge pull request #3803 from alchemy-fr/PHRAS-3454-write-meta--index-count 
PHRAS-3454 merge Worker - write metadata « undefined index count »
 2021-06-02 15:27:05 +02:00
aynsix
0a94a84274 PHRAS-3454 check count if exist 2021-06-02 15:06:13 +03:00
Nicolas Maillat
c4b1f446d0 Merge pull request #3802 from alchemy-fr/PHRAS-3032-multi-stories-edit 
PHRAS-3032 merge  Do not edit multi stories
 2021-06-01 08:59:13 +02:00
aynsix
4993edcdad PHRAS-3032 cannot edit multi stories 2021-05-31 15:51:11 +03:00
Nicolas Maillat
afb7339316 Merge pull request #3800 from alchemy-fr/PHRAS-3445-fix-recordEdit-worker 
PHRAS-3445 Merge Worker - editing payload to db - rename queue "recordEdit" by EditRecord add retry and error queue
 2021-05-28 15:57:27 +02:00
Nicolas Maillat
3bc93c4bcb Merge branch 'master' into PHRAS-3445-fix-recordEdit-worker 2021-05-28 15:34:50 +02:00
Nicolas Maillat
0c5ba091c8 Merge pull request #3801 from alchemy-fr/PHRAS-3452-push-validation-remove-user 
PHRAS-3452 merge Prod - Push- Validation : Remove users is not possible
 2021-05-28 15:06:42 +02:00
aynsix
f786a7aac0 PHRAS-3452 fix remove user 2021-05-28 15:08:18 +03:00
aynsix
fa977e1cd5 save payload to DB 2021-05-28 11:52:41 +03:00
aynsix
2c1f20f69e fix log session in edit 2021-05-27 17:39:04 +03:00
aynsix
33b7a937e9 split message per record when editing 2021-05-27 12:54:51 +03:00
aynsix
6437023b21 PHRAS-3445 add edit retry and failed Q 2021-05-25 17:35:03 +03:00
Nicolas Maillat
12166e8533 Merge pull request #3797 from alchemy-fr/PHRAS-3445_editing-payload-to-db_4.1 
PHRAS-3445 merge Add record edit payload to DB table WorkerRunningJob
 2021-05-18 17:39:52 +02:00
jygaulier
761e665391 add payload to editworker 2021-05-18 15:02:07 +02:00
Nicolas Maillat
66b349ed0a Merge pull request #3795 from alchemy-fr/PHRAS-3416_Phraseanet_localization_weblate 
Translated using Weblate (French)
 2021-05-13 18:08:09 +02:00
Nicolas Maillat
21f4e294e5 Translated using Weblate (French) 
Currently translated at 99.0% (2711 of 2737 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-05-13 17:49:16 +02:00
Nicolas Maillat
43b24cefe2 Merge pull request #3794 from alchemy-fr/PHRAS-3416_Phraseanet_localization_weblate 
PHRAS-3416 merge phraseanet localization weblate
 2021-05-12 16:30:41 +02:00
Nicolas Maillat
b6b270e26b Translated using Weblate (French) 
Currently translated at 99.0% (2711 of 2737 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-05-12 11:37:06 +02:00
Nicolas Maillat
30fa13d009 Translated using Weblate (French) 
Currently translated at 99.0% (2712 of 2737 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2021-05-12 11:25:26 +02:00
Nicolas Maillat
283e715c16 Translated using Weblate (English) 
Currently translated at 99.0% (2712 of 2737 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2021-05-12 11:25:26 +02:00
Nicolas Maillat
54c1bc836a Translated using Weblate (German) 
Currently translated at 99.0% (2712 of 2737 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/de/
 2021-05-12 11:25:25 +02:00
Nicolas Maillat
0e8e271f60 Merge pull request #3789 from alchemy-fr/PHRAS-3316-description-hide-tree-button 
PHRAS-3316 merge add pub description, remove tree mode
 2021-05-12 11:07:57 +02:00