Nicolas Le Goff
|
5b3e699599
|
Merge remote-tracking branch 'upstream/3.8'
Conflicts:
bower.json
composer.lock
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngineQueryParser.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/User/Query.php
lib/classes/patch/320alpha4b.php
templates/web/admin/statusbit.html.twig
templates/web/prod/actions/Tools/index.html.twig
templates/web/prod/index.html.twig
templates/web/prod/upload/lazaret.html.twig
templates/web/prod/upload/upload-flash.html.twig
www/scripts/apps/login/home/config.js
www/skins/prod/000000/prodcolor.css
www/skins/prod/959595/prodcolor.css
|
2015-02-23 19:16:56 +01:00 |
|
Jean-Yves Gaulier
|
41cd9c3f17
|
#PHRAS-325
add parameter "adapt" to route "/embed/substitute"
fix : substituted was indicated only for thumbnails on prod/tools/recreate
|
2015-02-18 18:12:11 +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
|
10c3869ca3
|
PHRAS-374 Add command to rebuild subdefs
|
2015-01-21 16:14:45 +01:00 |
|
Nicolas Le Goff
|
6485b64e68
|
Fix latest merge
|
2014-08-20 15:13:41 +02:00 |
|
Nicolas Le Goff
|
779c29dd16
|
Allow to rotate thumbnails on all type of records
|
2014-08-19 11:45:19 +02:00 |
|
Nicolas Le Goff
|
fe6bdb21b2
|
Allow to rotate thumbnails on all type of records
|
2014-08-13 18:23:40 +02:00 |
|
Romain Neutron
|
64456a8964
|
Remove phraseanet registry
|
2013-12-20 16:44:22 +01:00 |
|
Romain Neutron
|
e7421e1fdd
|
Fix twig tags
|
2013-12-03 20:02:39 +01:00 |
|
Nicolas Le Goff
|
764fa42f14
|
Update to jquery ui 1.10.3
Fix conflict & ui bugs
Remove debug
|
2013-06-21 13:46:16 +02:00 |
|
Romain Neutron
|
4161ef2e31
|
Use url generator everywhere
|
2013-06-13 09:44:16 +02:00 |
|
Romain Neutron
|
77817d177f
|
Merge branch '3.7'
|
2013-03-22 15:07:12 +01:00 |
|
Nicolas Le Goff
|
e57bf3186e
|
Aspect ratio corrective
|
2013-03-22 15:03:01 +01:00 |
|
Nicolas Le Goff
|
02e5e2c216
|
Subsitution cleanup && test enhancement
|
2013-03-22 15:03:00 +01:00 |
|
Nicolas Le Goff
|
93aa9be0fa
|
Fix sub views substitution
|
2013-03-22 15:03:00 +01:00 |
|
Romain Neutron
|
370d603741
|
Merge branch '3.7'
|
2013-03-22 15:01:00 +01:00 |
|
Romain Neutron
|
84be237256
|
Merge pull request #322 from nlegoff/fix_1111
[3.7] Fix #1111 sub views substitution is broken
|
2013-03-21 11:42:56 -07:00 |
|
Nicolas Le Goff
|
3bcf24b611
|
Subsitution cleanup && test enhancement
|
2013-03-21 17:10:46 +01:00 |
|
Nicolas Le Goff
|
915749c224
|
Fix sub views substitution
|
2013-03-21 16:06:06 +01:00 |
|
Nicolas Le Goff
|
3dc3caf137
|
Remove ratio = 1 as default
|
2013-03-21 12:46:00 +01:00 |
|
Nicolas Le Goff
|
1a0753ea8f
|
Fix #1041 Keep video aspect ratio when extracting thumbnail using canva
|
2013-03-20 20:09:06 +01:00 |
|
Nicolas Le Goff
|
89eac37046
|
Fix tools window
|
2012-10-18 15:45:51 +02:00 |
|
Romain Neutron
|
4677f0e9a2
|
Remove providers instanciation in Twig setup
|
2012-10-04 15:44:48 +02:00 |
|
Romain Neutron
|
d39150b202
|
Fix #912 : rotate multiple documents
|
2012-09-27 14:21:34 +02:00 |
|
Romain Neutron
|
e06890b9a8
|
Fix #912 : rotate multiple documents
|
2012-09-27 12:54:50 +02:00 |
|
Romain Neutron
|
c5224de003
|
Substitute helper by record request in Basket / Feeds / Tools / Tooltips
|
2012-07-26 15:39:26 +02:00 |
|
Nicolas Le Goff
|
315c630764
|
Display fallback message when no preview available for HTML5 player
|
2012-07-12 13:01:24 +02:00 |
|
Romain Neutron
|
4bc55c0611
|
Fix rotate request
|
2012-06-19 18:39:33 +02:00 |
|
Nicolas Le Goff
|
4edb26c6c6
|
fix #728 check if thumbExtractor is supported
remove fileReader its not needed
fix unit tests
fix typo
remove unecessary message
|
2012-06-19 18:08:40 +02:00 |
|
Ysolyne Gresille
|
440ff3640e
|
labels updated for toolbox
|
2012-06-13 17:58:54 +02:00 |
|
Ysolyne Gresille
|
a06c74d548
|
bugfixes for toolbox skins
|
2012-06-13 17:58:53 +02:00 |
|
Nicolas Le Goff
|
5665d6b035
|
fix #684, #683, #681, #680, #676, #675, #674, #673, #672, #669, #668, #667
|
2012-06-01 12:29:54 +02:00 |
|
Romain Neutron
|
caf1e69370
|
Add HTML5 features
|
2012-05-30 16:35:24 +02:00 |
|
Nicolas Le Goff
|
5c19104bef
|
fix #646 Close dialog when action is done
|
2012-05-25 21:10:12 +02:00 |
|
Nicolas Le Goff
|
9aa13d33a8
|
change getValue() by asString() for metadatas
|
2012-05-22 11:15:39 +02:00 |
|
Romain Neutron
|
135420008b
|
Delegate all exiftool commands to PHPExiftool
|
2012-05-04 20:17:17 +02:00 |
|
Romain Neutron
|
dd994a9bd6
|
Fix CS
|
2012-04-25 17:38:49 +02:00 |
|
Nicolas Le Goff
|
e723ccf9f8
|
fix typo
|
2012-04-12 17:34:15 +02:00 |
|
Nicolas Le Goff
|
29ab98b9c7
|
update tool box templates
|
2012-04-12 17:28:49 +02:00 |
|
Nicolas Le Goff
|
ff97549401
|
add tools templates
|
2012-04-05 19:24:05 +02:00 |
|