hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,059 Commits 268 Branches 107 Tags
713562c679b65d63fcc278518c25032abbbfad3c
Commit Graph

15059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Harrys
777c47809f Merge branch 'PHRAS-3188-Prod_Expose_front_in_Phraseanet' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3188-Prod_Expose_front_in_Phraseanet 2020-08-06 10:52:00 +04:00
Harrys Ravalomanana
9358776b58 Merge branch 'master' into PHRAS-3188-Prod_Expose_front_in_Phraseanet 2020-08-06 10:51:44 +04:00
Harrys
2931e26bfa Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3188-Prod_Expose_front_in_Phraseanet 2020-08-06 10:30:23 +04: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
Nicolas Maillat
e7d1d4ca71 Translated using Weblate (French) 
Currently translated at 98.9% (2576 of 2603 strings)
 2020-08-05 13:33:39 +00:00
Nicolas Maillat
a24d3d5f2e Translated using Weblate (English) 
Currently translated at 99.0% (2579 of 2603 strings)
 2020-08-05 13:33:38 +00:00
Nicolas Maillat
1a0850c3b7 Translated using Weblate (English) 
Currently translated at 98.9% (2576 of 2603 strings)
 2020-08-05 13:31:35 +00:00
Nicolas Maillat
b24d422118 Translated using Weblate (French) 
Currently translated at 98.9% (2576 of 2603 strings)
 2020-08-05 13:29:21 +00:00
Jennifer
c08df9f0b9 Translated using Weblate (German) 
Currently translated at 99.1% (2580 of 2602 strings)
 2020-08-05 13:27:02 +00:00
Nicolas Maillat
c55b1a4d97 Translated using Weblate (French) 
Currently translated at 98.9% (2575 of 2602 strings)
 2020-08-05 13:27:02 +00:00
Nicolas Maillat
1f4f093617 Translated using Weblate (English) 
Currently translated at 98.9% (2575 of 2602 strings)
 2020-08-05 13:27:02 +00:00
Jennifer
b745091b0b Translated using Weblate (French) 
Currently translated at 99.0% (2576 of 2602 strings)
 2020-08-05 13:27:02 +00:00
Nicolas Maillat
860f1e0e93 Translated using Weblate (French) 
Currently translated at 99.0% (2576 of 2602 strings)
 2020-08-05 13:27:02 +00:00
Nicolas Maillat
cc3ae39df0 Merge pull request #3590 from alchemy-fr/PHRAS-2541_design_publish_window 
PHRAS-2541 merge Design-Prod/Publish window
 2020-08-05 14:43:18 +02:00
Harrys
d4dbf6f91d Merge from Master 2020-08-05 14:38:41 +04:00
Harrys
49eb2f29f6 PHRAS-2541 add translation 2020-08-05 14:35:37 +04:00
Harrys
369bff4271 PHRAS-2541 Design of publish window 2020-08-05 14:31:04 +04:00
Jennifer
e16f340bda Translated using Weblate (German) 
Currently translated at 99.2% (2582 of 2602 strings)
 2020-08-05 10:23:33 +00:00
Jennifer
1807706590 Translated using Weblate (French) 
Currently translated at 99.0% (2577 of 2602 strings)
 2020-08-05 10:23:32 +00:00
Jennifer
d5391ad48c Translated using Weblate (English) 
Currently translated at 99.0% (2577 of 2602 strings)
 2020-08-05 10:23:31 +00:00
Nicolas Maillat
212c4c3705 Translated using Weblate (French) 
Currently translated at 99.0% (2577 of 2602 strings)
 2020-08-05 09:50:05 +00:00
Nicolas Maillat
422fa93c72 Merge pull request #3589 from alchemy-fr/PHRAS-3196-change-download-file-in-uploader 
PHRAS-3196 merge Phraseanet worker uploader - report change made in Ps-uploader
 2020-08-04 19:33:04 +02:00
Nicolas Maillat
216001514f Merge branch 'master' into PHRAS-3196-change-download-file-in-uploader 2020-08-04 19:05:05 +02:00
Nicolas Maillat
e9b6512043 Merge pull request #3568 from alchemy-fr/PHRAS-3164_lightbox-download_link 
PHRAS-3164 Merge Record > export : display recipients email in a widget
 2020-08-04 19:04:43 +02:00