jygaulier
7e42d03a24
PHRAS-3987: fix do not add text shadow if no shadow attribute ( #4454 )
2024-01-03 18:51:05 +01:00
jygaulier
07f4462672
PHRAS-3520_stamper-enhance ( #4385 )
...
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.
* fix test
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)
* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.
* fix test
* fix compatibility with download-async ; add registry/actions/stamp-subdefs=false to conf
2023-11-22 12:30:55 +01:00
Aina Sitraka
de120780f6
PHRAS-3826 ci test ( #4300 )
...
switching docker build image and unit test run on github action
2023-04-29 22:13:08 +02:00
jygaulier
f4a6969f98
PHRAS-3580
...
arial.ttf was moved in resources
2021-11-19 19:13:21 +01:00
jygaulier
e487553d9c
PHRAS-3580 WIP
...
new "watermark text" setting to subdef
2021-11-19 19:13:21 +01:00
jygaulier
259fd669a5
PHRAS-3523_some-images-not-stamped
...
fix memory leak
2021-09-09 17:52:57 +02:00
jygaulier
fbd6658f94
PHRAS-3499_stamper-in-download-worker
...
- for download by email, stamp is done by the worker (not by the prod controller)
- add "no-stamp" checkbox on download dlg (port from PHRAS-424)
- todo : add "no-stamp" to download-by-email dlg.
- todo ? apply stamp for download-by-ftp
2021-08-09 20:12:11 +02:00
Benoît Burnichon
6cdc9d7a31
Remove some deprecated methods calls
2016-03-06 23:05:55 +01:00
Benoît Burnichon
005524d572
Add typehints and reduce code duplication
2016-01-26 14:25:08 +01:00
Benoît Burnichon
614394edc7
Method renaming
2016-01-26 14:25:08 +01:00
Benoît Burnichon
401ed4f431
Group exiftool.writer calls into methods/variables
2016-01-22 17:17:31 +01:00
Benoît Burnichon
51023c5533
bump copyright year
2016-01-05 13:38:14 +01:00
Benoît Burnichon
61206fd517
Replace calls to mediavorus to getMediaFromUri
2015-05-12 18:12:02 +02:00
Benoît Burnichon
c72e31163b
Merge remote-tracking branch 'upstream/3.8'
2015-03-13 18:50:49 +01:00
Jean-Yves Gaulier
92f0b7a195
#PHRAS-423 #time 6h
...
restored transparency in stamp
2015-03-12 11:20:14 +01:00
Nicolas Le Goff
949bf06cac
Merge branch '3.8'
...
Conflicts:
CHANGELOG.md
bin/console
bin/developer
bin/setup
bower.json
composer.json
composer.lock
features/bootstrap/FeatureContext.php
features/bootstrap/GuiContext.php
lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
lib/Alchemy/Phrasea/Command/CreateCollection.php
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Client/Baskets.php
lib/Alchemy/Phrasea/Controller/Client/Root.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Property.php
lib/Alchemy/Phrasea/Controller/Prod/Records.php
lib/Alchemy/Phrasea/Controller/Prod/Tools.php
lib/Alchemy/Phrasea/Controller/Prod/Upload.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/User/Edit.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/Doctrine/Entities/AuthFailure.php
lib/Doctrine/Entities/Basket.php
lib/Doctrine/Entities/BasketElement.php
lib/Doctrine/Entities/LazaretAttribute.php
lib/Doctrine/Entities/LazaretCheck.php
lib/Doctrine/Entities/LazaretFile.php
lib/Doctrine/Entities/LazaretSession.php
lib/Doctrine/Entities/Session.php
lib/Doctrine/Entities/SessionModule.php
lib/Doctrine/Entities/StoryWZ.php
lib/Doctrine/Entities/UsrList.php
lib/Doctrine/Entities/UsrListEntry.php
lib/Doctrine/Entities/UsrListOwner.php
lib/Doctrine/Entities/ValidationData.php
lib/Doctrine/Entities/ValidationParticipant.php
lib/Doctrine/Entities/ValidationSession.php
lib/Doctrine/Logger/MonologSQLLogger.php
lib/Doctrine/Repositories/BasketRepository.php
lib/Doctrine/Repositories/ValidationParticipantRepository.php
lib/Doctrine/Types/Binary.php
lib/Doctrine/Types/Blob.php
lib/Doctrine/Types/Enum.php
lib/Doctrine/Types/LongBlob.php
lib/Doctrine/Types/VarBinary.php
lib/classes/API/OAuth2/Account.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/OAuth2/Application/OfficePlugin.php
lib/classes/API/OAuth2/AuthCode.php
lib/classes/API/OAuth2/RefreshToken.php
lib/classes/API/OAuth2/Token.php
lib/classes/API/V1/Abstract.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/exception/abstract.php
lib/classes/API/V1/exception/badrequest.php
lib/classes/API/V1/exception/forbidden.php
lib/classes/API/V1/exception/internalservererror.php
lib/classes/API/V1/exception/maintenance.php
lib/classes/API/V1/exception/methodnotallowed.php
lib/classes/API/V1/exception/notfound.php
lib/classes/API/V1/exception/unauthorized.php
lib/classes/API/V1/result.php
lib/classes/Exception/Feed/EntryNotFound.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/CollectionInterface.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/Image.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/User/Adapter.php
lib/classes/User/Interface.php
lib/classes/appbox/register.php
lib/classes/connection.php
lib/classes/connection/abstract.php
lib/classes/connection/interface.php
lib/classes/connection/pdo.php
lib/classes/connection/pdoStatementDebugger.php
lib/classes/deprecated/countries.php
lib/classes/deprecated/inscript.api.php
lib/classes/eventsmanager/event/test.php
lib/classes/ftpclient.php
lib/classes/http/request.php
lib/classes/media/subdef.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/patch/320alpha4b.php
lib/classes/patch/3715alpha1a.php
lib/classes/patch/379alpha1a.php
lib/classes/patch/380alpha10a.php
lib/classes/patch/380alpha11a.php
lib/classes/patch/380alpha13a.php
lib/classes/patch/380alpha14a.php
lib/classes/patch/380alpha15a.php
lib/classes/patch/380alpha16a.php
lib/classes/patch/380alpha17a.php
lib/classes/patch/380alpha18a.php
lib/classes/patch/380alpha3a.php
lib/classes/patch/380alpha4a.php
lib/classes/patch/380alpha6a.php
lib/classes/patch/380alpha8a.php
lib/classes/patch/380alpha9a.php
lib/classes/patch/381alpha1b.php
lib/classes/patch/381alpha2a.php
lib/classes/patch/381alpha3a.php
lib/classes/patch/381alpha4a.php
lib/classes/patch/383alpha1a.php
lib/classes/patch/383alpha2a.php
lib/classes/patch/383alpha3a.php
lib/classes/patch/383alpha4a.php
lib/classes/record/adapter.php
lib/classes/record/preview.php
lib/classes/recordutils.php
lib/classes/recordutils/audio.php
lib/classes/recordutils/document.php
lib/classes/recordutils/map.php
lib/classes/recordutils/video.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/apiwebhooks.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
templates/web/admin/collection/collection.html.twig
templates/web/common/dialog_export.html.twig
templates/web/common/menubar.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/upload-flash.html.twig
templates/web/prod/upload/upload.html.twig
templates/web/report/report_layout_child.html.twig
templates/web/setup/step2.html.twig
templates/web/thesaurus/new-synonym-dialog.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php
2015-02-05 18:38:49 +01:00
Nicolas Le Goff
d82adbf109
Bump year to 2015
2015-01-20 14:08:25 +01:00
Nicolas Le Goff
28eecf6a09
Merge branch '3.8'
...
Conflicts:
.gitignore
bin/console
composer.json
composer.lock
hudson/fixtures.sql
lib/Alchemy/Phrasea/Command/Developer/IniReset.php
lib/Alchemy/Phrasea/Command/Setup/Install.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
lib/Alchemy/Phrasea/Helper/Prod.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/Interface.php
lib/classes/API/V1/adapter.php
lib/classes/Setup/Upgrade.php
lib/classes/media/subdef.php
lib/classes/task/period/RecordMover.php
templates/web/prod/index.html.twig
templates/web/setup/step2.html.twig
tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/classes/api/v1/api_v1_adapterTest.php
tests/db-ref.sqlite
vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
2014-10-09 19:40:33 +02:00
Jean-Yves Gaulier
90e611de81
fix PHRAS-306 #time 6h
...
NB: can be set now, but will work only when PHPExiftool will be patched with the "copy" method (PR done).
2014-10-01 19:52:17 +02:00
Romain Neutron
e8ec3801e8
Remove unused files
2014-03-05 02:58:52 +01:00
Romain Neutron
12f9575a8b
Merge branch '3.8'
...
Conflicts:
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/classes/API/OAuth2/Adapter.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/User/Adapter.php
lib/classes/base.php
lib/classes/connection.php
lib/classes/databox/cgu.php
lib/classes/eventsmanager/notify/autoregister.php
lib/classes/eventsmanager/notify/bridgeuploadfail.php
lib/classes/eventsmanager/notify/order.php
lib/classes/eventsmanager/notify/orderdeliver.php
lib/classes/eventsmanager/notify/ordernotdelivered.php
lib/classes/eventsmanager/notify/push.php
lib/classes/eventsmanager/notify/register.php
lib/classes/eventsmanager/notify/validate.php
lib/classes/eventsmanager/notify/validationdone.php
lib/classes/eventsmanager/notify/validationreminder.php
lib/classes/module/console/taskState.php
lib/classes/module/console/taskrun.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/order.php
lib/classes/task/abstract.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
templates/web/prod/upload/lazaret.html.twig
2014-02-20 16:05:23 +01:00
Romain Neutron
2af21c064c
Avoid errors by explicitely namespacing root exception
2014-02-20 11:28:31 +01:00
Romain Neutron
e840df0b36
Decouple caption and its serialization
2014-01-27 20:12:13 +01:00
Romain Neutron
e233e5afa6
Merge branch '3.8'
...
Conflicts:
lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
lib/classes/Exception/Feed/ItemNotFound.php
lib/classes/Exception/Feed/PublisherNotFound.php
lib/classes/Feed/Abstract.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/CollectionInterface.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/Feed/Entry/Collection.php
lib/classes/Feed/Entry/Interface.php
lib/classes/Feed/Entry/Item.php
lib/classes/Feed/Entry/ItemInterface.php
lib/classes/Feed/Interface.php
lib/classes/Feed/Link.php
lib/classes/Feed/LinkInterface.php
lib/classes/Feed/Publisher/Adapter.php
lib/classes/Feed/Publisher/Interface.php
lib/classes/Feed/Token.php
lib/classes/Feed/TokenAggregate.php
lib/classes/Feed/XML/Abstract.php
lib/classes/Feed/XML/Atom.php
lib/classes/Feed/XML/Cooliris.php
lib/classes/Feed/XML/Interface.php
lib/classes/Feed/XML/RSS.php
lib/classes/Feed/XML/RSS/ImageInterface.php
lib/classes/http/request.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskState.php
lib/classes/module/console/tasklist.php
lib/classes/module/console/taskrun.php
lib/classes/registry.php
lib/classes/registryInterface.php
lib/classes/set/order.php
lib/classes/system/url.php
lib/classes/task/Scheduler.php
lib/classes/task/appboxAbstract.php
lib/classes/task/databoxAbstract.php
lib/classes/task/manager.php
lib/classes/task/period/RecordMover.php
lib/classes/task/period/apibridge.php
lib/classes/task/period/archive.php
lib/classes/task/period/cindexer.php
lib/classes/task/period/emptyColl.php
lib/classes/task/period/ftp.php
lib/classes/task/period/ftpPull.php
lib/classes/task/period/subdef.php
lib/classes/task/period/test.php
lib/classes/task/period/writemeta.php
lib/conf.d/PhraseaFixture/AbstractWZ.php
lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56
Bump copyright year
2014-01-06 15:28:12 +01:00
Romain Neutron
051d9f4035
Remove license comments
2013-11-20 16:49:29 +01:00
Romain Neutron
56b373ee6e
Use short array declaration
2013-11-18 13:57:33 +01:00
Romain Neutron
eb590780ca
Fix CS
2013-09-30 18:26:32 +02:00
Romain Neutron
7c9fbd48e1
Remove tests in loops
2013-09-04 14:20:35 +02:00
Romain Neutron
b6a8a90197
Fix CS
2013-09-04 12:14:52 +02:00
Romain Neutron
dbd06e9091
Remove dead code
2013-09-04 12:14:50 +02:00
Romain Neutron
c73b969c93
Merge pull request #607 from romainneutron/fix-1426
...
[3.8] Fix stamp text position
2013-09-02 08:14:18 -07:00
Romain Neutron
6661b532eb
Fix #1426 : stamp text position
2013-09-02 15:59:44 +02:00
Romain Neutron
f5cb2b993e
Fix #1427 stamp background
2013-09-02 15:42:02 +02:00
Romain Neutron
f892460589
Fix CS
2013-07-04 14:53:31 +02:00
Romain Neutron
153d3c4698
Update stamp and watermark to version 3.8
2013-07-04 14:05:06 +02:00
Romain Neutron
77b912f121
Update stamp and watermark to version 3.8
2013-07-04 14:04:52 +02:00
Romain Neutron
32875e6698
Remove support of binary paths by registry
2013-06-27 12:43:24 +02:00
Romain Neutron
3f47cc248d
Remove registry's GV_RootPath calls
2013-06-19 19:25:16 +02:00
Romain Neutron
c084f20f85
Labelize collections
2013-06-01 01:29:07 +02:00
jygaulier
360c09c3fd
CS
2013-03-13 16:10:00 +01:00
jygaulier
5121fe275f
fix : debug removed
2013-03-12 17:08:35 +01:00
jygaulier
da335ad65e
watermark with imagine
2013-03-12 15:46:44 +01:00
jygaulier
7bd79acad2
some fixes to stamper, add options for over-image stamp & alpha colors
2013-03-12 15:46:44 +01:00
Romain Neutron
c184278b40
Fix doc blocks
2013-01-29 18:34:50 +01:00
Romain Neutron
4414892b91
Fix CS lib/classes
2013-01-29 16:39:02 +01:00
Romain Neutron
842ad40985
Bump copyright year
2013-01-21 23:28:58 +01:00
Romain Neutron
2069d40544
Use composer as application autoloader
2013-01-18 17:47:25 +01:00
Romain Neutron
dff686c87d
Merge branch '3.7'
2013-01-09 11:25:14 +01:00
Nicolas Le Goff
c09614764a
Fix #1056 Affichage des watermarks ajouté à une collection
2013-01-02 13:55:56 +01:00
