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

14916 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
jygaulier
e6dc6bc7c9 - fix phpstorm warnings 2020-09-14 17:43:52 +02:00
jygaulier
e829e91bee - fix err500 because expecting Datetime (signature), receive null (null IS ok); Could use NullableDatetime but too many changes required. 2020-09-14 17:41:41 +02:00
jygaulier
0ec33829df - fix : "validate" token is created for every user (participant) of a validation 
the expiration date of tokens is same as validation session
- fix : changing the exp. date of a validation session updates the tokens exp. dates
- fix : remind is done even for validation sessions with force-auth (no tokens)
- change : no more 'null' user for basket validation (never used)
 2020-09-14 16:57:53 +02:00
Nicolas Maillat
559962f9ba Merge pull request #3604 from alchemy-fr/PHRAS-3212_Js_error_on_upload 
PHRAS-3212 merge Port 4.1 - JS Error message during upload: "img.toDataURL is not a function"
 2020-09-11 16:06:20 +02:00
Nicolas Maillat
4946a270b8 Merge branch 'master' into PHRAS-3212_Js_error_on_upload 2020-09-11 15:36:46 +02:00
moctardiouf
0f47a1ccad Merge pull request #3607 from alchemy-fr/ADD-PHP-LDAP-SUPPORT 
Add php-ldap extension to the docker-compose stack
 2020-09-10 17:28:14 +02:00
Moctar
928da80a23 Add php-ldap extension to the docker-compose stack 2020-09-10 15:20:06 +02:00
Harrys
c7fa7b3784 PHRAS-3212 remove js error on upload 2020-09-07 15:45:30 +04:00
Nicolas Maillat
c5e569c026 Update README.md 4.1.2 2020-08-07 19:28:41 +02:00
Nicolas Maillat
59f1c35acc Merge pull request #3592 from alchemy-fr/PHRAS-3184-api-token-header-only 
PHRAS-3184 Merge API api_token_header refacto change behavior , name and place in configuration.yml
 2020-08-07 16:43:56 +02:00
Nicolas Maillat
b742d955ab Merge branch 'master' into PHRAS-3184-api-token-header-only 2020-08-07 16:15:23 +02:00
Jennifer
ec2108c03a Translated using Weblate (German) 
Currently translated at 99.9% (2605 of 2606 strings)
 2020-08-07 14:10:21 +00:00
Nicolas Maillat
b91ad17c24 Translated using Weblate (French) 
Currently translated at 99.5% (2593 of 2606 strings)
 2020-08-07 14:10:21 +00:00
Nicolas Maillat
5ee00116f7 Translated using Weblate (English) 
Currently translated at 99.5% (2593 of 2606 strings)
 2020-08-07 14:10:21 +00:00
Nicolas Maillat
3cbfc58830 Translated using Weblate (German) 
Currently translated at 98.8% (2577 of 2606 strings)
 2020-08-07 13:56:49 +00:00
Nicolas Maillat
dc745b75f9 Merge pull request #3596 from alchemy-fr/PHRAS-3203-add-column-payload 
PHRAS-3203 Merge - Admin - worker manager - job tab - WorkerRunningJob add colon and store payload as Json
 2020-08-07 15:52:08 +02:00
Nicolas Maillat
cdddf1f757 Merge branch 'master' into PHRAS-3203-add-column-payload 2020-08-07 15:20:02 +02:00
Nicolas Maillat
6822940365 Merge branch 'master' into PHRAS-3184-api-token-header-only 2020-08-07 15:19:42 +02:00
Nicolas Maillat
366ec99208 Merge pull request #3595 from alchemy-fr/PHRAS-3139_subview_size_db_model 
PHRAS-3139 merge default geolocalisation fields setting and default subview attributes
 2020-08-07 15:19:23 +02:00
aynsix
20fa7dd602 add translation 2020-08-07 15:51:18 +03:00
nmaillat
20f52af540 PHRAS-3139 set compression for thumbnail 2020-08-07 14:47:00 +02:00
aynsix
e5a514b294 add and display column payload 2020-08-07 15:35:42 +03:00
nmaillat
2a2e920a82 default position and geonames fields 2020-08-07 13:44:28 +02:00
nmaillat
278e2cb300 PHRAS-3139 fix typo in config 2020-08-07 10:43:02 +02:00
nmaillat
30d0a5e490 PHRAS-3139 default configuration fields for geoloc 2020-08-07 09:57:35 +02:00
nmaillat
1eba5b9005 PHRAS-3139 subview size and flaten attibute 2020-08-07 09:34:14 +02:00
nmaillat
949d6a4f21 PHRAS-3205 change docker tag version in env 2020-08-06 17:30:31 +02:00
Nicolas Maillat
00bd921c58 Merge branch 'master' into PHRAS-3184-api-token-header-only 2020-08-06 17:24:31 +02:00
Nicolas Maillat
c0d3f6c70a Translated using Weblate (French) 
Currently translated at 99.5% (2593 of 2605 strings)
 2020-08-06 15:23:35 +00:00
Nicolas Maillat
a4378076ca Translated using Weblate (English) 
Currently translated at 99.5% (2593 of 2605 strings)
 2020-08-06 15:23:35 +00:00
Nicolas Maillat
feb03ae652 Translated using Weblate (German) 
Currently translated at 98.9% (2577 of 2605 strings)
 2020-08-06 15:22:44 +00:00
Jennifer
37ad58e70e Translated using Weblate (German) 
Currently translated at 99.0% (2579 of 2605 strings)
 2020-08-06 15:21:48 +00:00
Nicolas Maillat
0f4cad4888 Merge branch 'master' into PHRAS-3184-api-token-header-only 2020-08-06 16:47:46 +02:00
Nicolas Maillat
6955b407a0 Merge pull request #3594 from alchemy-fr/PHRAS-3202-finished-manually 
PHRAS-3202 merge Admin - worker manager - job tab - set a job finish manually
 2020-08-06 16:47:27 +02:00
Nicolas Maillat
4b5f7345c8 Merge branch 'master' into PHRAS-3202-finished-manually 2020-08-06 16:26:09 +02:00
nmaillat
5fccb972d7 PHRAS-3184 renaming env for api-auth-token-header-only 2020-08-06 16:25:13 +02:00
Nicolas Maillat
3256ddaae4 Merge branch 'master' into PHRAS-3184-api-token-header-only 2020-08-06 16:16:29 +02:00
Nicolas Maillat
0c8c39f342 Merge pull request #3593 from alchemy-fr/PHRAS-3204-workerpopulate-repo-disconnect 
PHRAS-3204 merge worker sometime Populate is not acknowledge in WorkerRunnigJob table
 2020-08-06 16:13:31 +02:00
aynsix
8907e85b8a change const value 2020-08-06 17:05:14 +03:00
aynsix
baf22aae86 change key name 2020-08-06 16:14:17 +03:00
aynsix
b5b69343bd add and display interrupt status 2020-08-06 15:17:06 +03:00
nmaillat
9f3ffc8de3 PHRAS-3134 change name for token header 2020-08-06 11:59:41 +02:00
nmaillat
e9f3c83d5e PHRAS-3134 docker define API setting in entrypoint and during install 2020-08-06 11:54:22 +02:00
aynsix
dc66e80a93 reconnect if connection closed 2020-08-06 11:16:53 +03:00
aynsix
2e1ce43321 change behavior api_token_header 2020-08-05 19:57:53 +03:00
Nicolas Maillat
f6854caaba Merge pull request #3591 from alchemy-fr/PHRAS-3200_prod_email_export 
PHRAS-3200 merge  Prod - email export - auto switch from export to export by email, recipient email is not fill and string correction
 2020-08-05 18:18:42 +02:00
Harrys
47c933eaa3 PHRAS-3200 Fix export email on lightbox 2020-08-05 18:25:30 +04:00
Harrys
ae86986871 PHRAS-3200 update translation 2020-08-05 17:49:37 +04:00
Harrys
912cb78969 PHRAS-3200 Prod fix email export 2020-08-05 17:38:43 +04:00
Jennifer
8af4b5a3e5 Translated using Weblate (German) 
Currently translated at 99.1% (2580 of 2603 strings)
 2020-08-05 13:33:39 +00:00