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

14336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
a5ddb4e44a Merge pull request #3452 from alchemy-fr/PHRAS-2963_Prod_publication_reader 
PHRAS-2963 #comment prod - publication reader - suscribing to a feed - refacto design windows
 2020-04-24 12:59:53 +02:00
Nicolas Maillat
1737992a88 Merge branch 'master' into PHRAS-3033_Prod_tools_with_storie 2020-04-24 12:43:52 +02:00
Harrys Ravalomanana
22f6bb3a02 PHRAS-3035 #comment fix save message #comment 2h 2020-04-24 12:40:57 +04:00
Harrys Ravalomanana
6235cbb574 PHRAS-2963 2020-04-23 20:21:04 +04:00
Jennifer
0eb21a607e Translated using Weblate (German) 
Currently translated at 98.9% (2452 of 2478 strings)
 2020-04-23 14:35:17 +00:00
Nicolas Maillat
4cb65eabbd Translated using Weblate (French) 
Currently translated at 99.8% (2475 of 2478 strings)
 2020-04-23 14:35:17 +00:00
Harrys Ravalomanana
697628450d PHRAS-3033 2020-04-23 15:23:39 +04:00
aynsix
2545d41e8d trim email from form 2020-04-23 12:14:40 +03:00
Nicolas Maillat
d247bc35cb Merge pull request #3448 from alchemy-fr/PHRAS-2184-list-manager-email-domain-filter 
PHRAS-2184 : #comment merge of  list manager fill the email domain filter
 2020-04-22 21:59:40 +02:00
aynsix
001e5af572 revert : remove trim 2020-04-22 16:58:23 +03:00
aynsix
ada4702d92 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2184-list-manager-email-domain-filter 2020-04-22 13:58:02 +03:00
aynsix
620943c2cf trim field in where clause 2020-04-22 13:53:47 +03:00
Nicolas Maillat
90cd595834 Merge pull request #3449 from alchemy-fr/PHRAS-2669_upgrade_production_client 
PHRAS-2669 #comment merge  upgrade phraseanet-production-client , fix regression on video chaptering GUI
 2020-04-22 12:04:00 +02:00
Nicolas Maillat
749944a63a Merge branch 'master' into PHRAS-2669_upgrade_production_client 2020-04-22 11:35:16 +02:00
Nicolas Maillat
8c90920616 Merge pull request #3446 from alchemy-fr/PHRAS-2888_Remove_unused_strings 
PHRAS-2888 #comment merge of removing  unused strings
 2020-04-22 11:35:00 +02:00
Harrys Ravalomanana
ad7cad5e16 PHRAS-2669 upgrade phraseanet-production-client 2020-04-22 12:28:59 +04:00
Nicolas Maillat
caec5e87f5 Merge branch 'master' into PHRAS-2888_Remove_unused_strings 2020-04-21 22:51:22 +02:00
Nicolas Maillat
ed44497cbe Merge pull request #3447 from alchemy-fr/PHRAS-2991_Prod_Fix-twitter-Sharing 
PHRAS-2991 #comment merge Prod - Sharing screen : Sharing to Twitter NOK
 2020-04-21 22:46:23 +02:00
Harrys Ravalomanana
037d8a13c9 PHRAS-2991 #comment fix twitter sharing #time 1h 2020-04-21 17:29:01 +04:00
Nicolas Maillat
26df189dcd Merge branch 'master' into PHRAS-2184-list-manager-email-domain-filter 2020-04-21 14:41:14 +02:00
Harrys Ravalomanana
cc2869464e PHRAS-2888 Remove unused translation 2020-04-21 16:19:19 +04:00
Nicolas Maillat
aead79f0c8 Merge pull request #3445 from alchemy-fr/PHRAS-3669_Prod_set_default_color_selection 
PHRAS-2669 #comment merge  Prod set default color selection to vivid color and other design fix
 2020-04-21 11:21:25 +02:00
Harrys Ravalomanana
3aa38e8af0 PHRAS-2669 2020-04-20 20:12:28 +04:00
Harrys Ravalomanana
dc899f5e87 Merge branch 'PHRAS-3669_Prod_set_default_color_selection' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3669_Prod_set_default_color_selection 2020-04-20 19:00:58 +04:00
Harrys Ravalomanana
03856d9dd7 PHRAS-2669 add auto resizable workzone basket 2020-04-20 18:57:16 +04:00
Harrys Ravalomanana
02491b6e83 Merge branch 'master' into PHRAS-3669_Prod_set_default_color_selection 2020-04-20 11:19:37 +04:00
Harrys Ravalomanana
51aeb4bd5a PHRAS-2669 #comment Workzone basket : add border color for selected item #time 4h 2020-04-20 11:13:39 +04:00
Jennifer
c081bafd96 Translated using Weblate (German) 
Currently translated at 98.9% (2455 of 2482 strings)
 2020-04-19 09:07:45 +00:00
Jennifer
6c2ceb0bc3 Translated using Weblate (French) 
Currently translated at 99.5% (2472 of 2482 strings)
 2020-04-19 09:07:45 +00:00
Harrys Ravalomanana
53a5dd2bdb PHRAS-3669 align workzone basket 2020-04-17 17:28:18 +04:00
Harrys Ravalomanana
87f4647623 PHRAS-3669 2020-04-17 16:14:32 +04:00
Jennifer
559e0644de Translated using Weblate (German) 
Currently translated at 98.7% (2451 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Nicolas Maillat
bf1fe1c3a5 Translated using Weblate (French) 
Currently translated at 99.5% (2472 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Nicolas Maillat
8c76a81cb4 Translated using Weblate (English) 
Currently translated at 99.5% (2472 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Jennifer
ed254ac347 Translated using Weblate (French) 
Currently translated at 99.5% (2471 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Jennifer
6d4daeb9d6 Translated using Weblate (English) 
Currently translated at 99.5% (2471 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Nicolas Maillat
cd4bf07982 Translated using Weblate (English) 
Currently translated at 98.6% (2449 of 2482 strings)
 2020-04-16 21:11:12 +00:00
Nicolas Maillat
7e76a2a13c Merge pull request #3440 from alchemy-fr/PHRAS-3023_slow-query-while-indexing_4.1 
PHRAS-3023 #comment merge slow query while indexing 4.1
 2020-04-16 10:24:07 +02:00
Nicolas Maillat
8ad2981a70 Merge branch 'master' into PHRAS-3023_slow-query-while-indexing_4.1 2020-04-16 00:57:28 +02:00
Nicolas Maillat
037620cd04 Merge pull request #3442 from alchemy-fr/PHRAS-3022_prod-editing 
PHRAS-3022 #comment merge  prod - editing - add button for select all records of story and design fix
 2020-04-15 19:53:54 +02:00
Harrys Ravalomanana
892d798dfc Merge branch 'PHRAS-3022_prod-editing' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3022_prod-editing 2020-04-15 15:05:59 +04:00
Harrys Ravalomanana
a01b14e335 PHRAS-3022 Fix zoom icon display 2020-04-15 15:05:09 +04:00
Harrys Ravalomanana
70a1497bd6 Revert proxy file 
Revert resources/proxies/__CG__AlchemyPhraseaModelEntitiesWebhookEvent.php
 2020-04-15 12:40:04 +04:00
Harrys Ravalomanana
770e98b006 PHRAS-3022 upgrade phraseanet-production-client 2020-04-15 12:30:53 +04:00
Harrys Ravalomanana
27fc361342 PHRAS-3022 Prod editing #comment Clean PR with translation 2020-04-14 20:37:59 +04:00
Nicolas Maillat
024b750539 Merge pull request #3441 from alchemy-fr/PHRAS-3025-send-phraseanet-log-stderr 
PHRAS-3025 #comment merge send Phraseanet log on stdout
 2020-04-10 23:16:55 +02:00
Nicolas Maillat
188b30b8fe Merge branch 'master' into PHRAS-3023_slow-query-while-indexing_4.1 2020-04-10 22:26:24 +02:00
aynsix
462cb53b7f use stderr output instead of php fpm error log file 2020-04-10 19:54:27 +03:00
Nicolas Maillat
fb218c92eb Merge pull request #3434 from alchemy-fr/PHRAS-3014_Prod_editing_dont_fill-Latitude_and_Longitude_if_not_empty 
PHRAS-3014 #comment  merge Prod - Editing Confirm before  filling  field, latitude and longitude (field define in configuration.yml)
 2020-04-10 15:13:06 +02:00
Harrys Ravalomanana
e4c587fe2d PHRAS-3014 #comment add translations 2020-04-10 11:27:36 +04:00