Nicolas Maillat
8cec0db55e
PHRAS-2840 add input collection key
...
PHRASE-2840 #comment add input collection key as collections: [] , the collection where check is triggered
2020-02-19 19:12:04 +01:00
Nicolas Maillat
d5992461c8
PHRAS-2840 add compare-ignore-collections
...
PHRAS-2840 #comment add compare-ignore-collections to configuration.sample.yml
2020-02-19 19:02:59 +01:00
aynsix
90db5f7358
merge master
2020-02-19 10:46:03 +03:00
Jean-Yves Gaulier
6838198a69
PHRAS-2879_facet-order_4.1
...
fix setup:install.
2020-02-17 20:17:08 +01:00
aynsix
a6e5e504ca
change vttFieldName to ChapterVttFieldName in configuration
2020-01-23 16:28:27 +03:00
aynsix
c40802265d
update config
2019-12-17 14:34:18 +04:00
Harrys Ravalomanana
e38dd3c645
PRHAS-2621 #comment update embed-bundle and configuration.yml
2019-07-11 17:49:59 +04:00
aina-esokia
eff72083ba
update delete account config structure
...
#time 0.5h
2019-04-25 17:27:33 +04:00
aynsix
5cdf473c7f
PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas ( #2918 )
...
* allow user to delete account
* generate translation and add checkbox in the windows confirmation
* change text an configuration key
* update delete account fonctionality
* rename variable
* write in explicite condition
* merge yarn.lock
* regenerate translation
2019-04-08 14:25:17 +02:00
aina-esokia
8015c5ec7b
add substitution icon for font otc and ttc
2019-04-02 14:58:34 +04:00
aina-esokia
fd495e7966
update configuration.sample.yml for api_token_header config
2019-01-15 17:06:34 +04:00
Mike Ng
75c79da3a5
update configuration.sample.yml file with geocoding-provider settings
2018-06-11 14:04:04 +04:00
Sandeep
7f8251d4e2
PHRAS-1819: add quarantine rule based on media type
2018-05-07 14:31:12 +04:00
Toky Herizo
6c853cf98c
udpate facebook SDK to 5.6
2018-02-12 11:24:14 +04:00
Thibaud Fabre
939098f6d1
Update sample configuration with worker configuration
2016-11-30 16:13:06 +01:00
Thibaud Fabre
9597a775e2
Merge pull request #1964 from alchemy-fr/4.0
...
Merge 4.0 into master
2016-09-29 09:32:30 +02:00
Thibaud Fabre
f62c22bc5c
Move setting to registry and form type
2016-09-28 20:58:26 +02:00
Thibaud Fabre
5666286e33
Fix typo in api_disable param name
2016-09-28 20:25:25 +02:00
Thibaud Fabre
c13e086120
Add option to disable API via configuration setting
2016-09-28 20:25:25 +02:00
Thibaud Fabre
73826d535c
PHRAS-1248 Merge branch '4.0'
...
Conflicts:
Makefile
composer.json
composer.lock
lib/Alchemy/Phrasea/Collection/CollectionService.php
lib/Alchemy/Phrasea/Controller/Thesaurus/ThesaurusXmlHttpController.php
lib/Alchemy/Phrasea/Core/Event/Subscriber/RecordEditSubscriber.php
lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
lib/Alchemy/Phrasea/Model/Manipulator/LazaretManipulator.php
lib/classes/record/adapter.php
resources/ansible/roles/app/tasks/main.yml
resources/www/prod/js/jquery.Edit.js
resources/www/prod/js/jquery.main-prod.js
resources/www/prod/skins/ui-components/_answers-tools.scss
templates/web/common/dialog_export.html.twig
templates/web/prod/thesaurus.js.twig
2016-09-28 19:52:33 +02:00
Thibaud Fabre
87a9f532c8
Set extra API settings during provisioning
2016-09-27 11:11:25 +02:00
Thibaud Fabre
9ca8dee44f
PHRAS-1180 Add configuration entry to enable CORS on custom paths
2016-07-12 14:22:12 +02:00
Thibaud Fabre
1917b3dba3
Merge branch 4.0 into master
2016-05-25 17:21:08 +02:00
Thibaud Fabre
888a2b4bb6
Add configuration option to disable SSL requirement on API
2016-05-24 15:38:59 +02:00
Florian BLOUET
68670dd028
add mapBox services into record preview
2016-04-06 17:37:22 +02:00
Florian BLOUET
7428f12600
update configuration sample for embed bundle
2016-02-23 15:49:13 +01:00
Florian BLOUET
bfed7bcce4
add configuration options for pdfJs
2015-12-14 17:02:39 +01:00
Florian BLOUET
46bf7794b4
add configuration options for embedBundle, fix frontend dependencies build issues
2015-12-07 16:59:34 +01:00
Florian BLOUET
261339ecd5
remove recess, bower, grunt and uglifyJs dependencies in php utils and tests
...
updated minifier tests
2015-12-02 17:36:37 +01:00
Benoît Burnichon
31116a14a9
Remove OpCache options as now bundled with PHP5.5+
2015-05-06 12:00:28 +02:00
Benoît Burnichon
ef68007132
Remove references to Phrasea Indexer.
2015-03-23 18:13:58 +01:00
Benoît Burnichon
8cc24dcaad
fixup configuration sample yml with proper yaml
2015-03-12 15:08:23 +01:00
Mathieu Darse
63eaaf1596
Merge remote-tracking branch 'upstream/master' into elastic-indexer
...
Conflicts:
composer.lock
www/scripts/apps/admin/main/app.js
2015-03-10 15:25:20 +01:00
Nicolas Le Goff
ed3ffb59a6
Merge remote-tracking branch 'upstream/master' into 20150306-elastic-indexer
...
Conflicts:
bin/console
bower.json
composer.json
composer.lock
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Border/Manager.php
lib/Alchemy/Phrasea/Controller/Api/V1.php
lib/Alchemy/Phrasea/Core/PhraseaEvents.php
lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
lib/classes/caption/field.php
lib/classes/record/Interface.php
templates/web/prod/index.html.twig
www/skins/prod/000000/prodcolor.css
2015-03-10 14:36:31 +01:00
Nicolas Le Goff
bd4836aaa7
Remove Websockets dependencies
2015-03-10 09:55:43 +01:00
Nicolas Le Goff
a3ef1b606c
Makes static thumbnails delivery as default delivery && set symlink dir in www directory
2015-02-16 15:01:44 +01:00
Mathieu Darse
5b24664001
Merge branch 'master' into elastic-indexer
...
Conflicts:
bin/console
2014-10-15 12:18:44 +02: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
Mathieu Darse
de8e9e3bfc
Refactor search engine provider
2014-09-10 16:45:22 +02:00
Nicolas Le Goff
df013d4f21
Allow to specify symlink directory
2014-09-10 11:25:31 +02:00
Nicolas Le Goff
e72a8ebda3
Update configuration
2014-09-10 11:24:43 +02:00
Nicolas Le Goff
de7988689e
Update directory structure & allow to configure paths (tmp, log, cache)
2014-09-05 15:57:00 +02:00
Nicolas Le Goff
b9bb9f5f0e
Merge branch '3.8'
...
Conflicts:
.gitignore
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/databox.php
lib/classes/task/abstract.php
lib/classes/task/manager.php
lib/classes/task/period/subdef.php
lib/classes/task/period/writemeta.php
lib/conf.d/bases_structure.xml
templates/web/admin/tasks/list.html.twig
2014-08-26 13:38:01 +02:00
Nicolas Le Goff
bc88d0f474
Add crossdomain file generator command
2014-08-19 16:35:57 +02:00
Nicolas Le Goff
2899f152fb
Merge branch '3.8' into fix-latest-merge
...
Conflicts:
README.md
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
lib/Alchemy/Phrasea/Controller/Prod/Basket.php
lib/Alchemy/Phrasea/Core/Event/Subscriber/ApiExceptionHandlerSubscriber.php
lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php
lib/Alchemy/Phrasea/Core/Version.php
lib/classes/API/V1/adapter.php
lib/classes/API/V1/result.php
lib/classes/module/console/schedulerStart.php
lib/classes/module/console/schedulerState.php
lib/classes/module/console/schedulerStop.php
lib/classes/module/console/taskrun.php
lib/classes/set/export.php
lib/conf.d/_GV_template.inc
lib/conf.d/configuration.yml
templates/web/admin/setup.html.twig
templates/web/admin/tasks/list.html.twig
templates/web/api/auth/end_user_authorization.html.twig
templates/web/prod/actions/Feedback/list.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/upload/upload.html.twig
tests/classes/api/v1/api_v1_adapterTest.php
tests/classes/api/v1/api_v1_resultTest.php
2014-08-11 20:28:03 +02:00
Nicolas Le Goff
c752141ff2
Use configurtion file instead of GV
2014-07-28 11:59:21 +02:00
Nicolas Le Goff
a8da584666
Merge branch '3.8'
...
Conflicts:
composer.json
composer.lock
config/configuration.sample.yml
lib/Alchemy/Phrasea/Application.php
lib/Alchemy/Phrasea/Application/Api.php
lib/Alchemy/Phrasea/Controller/Admin/Collection.php
lib/Alchemy/Phrasea/Controller/Admin/Users.php
lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
lib/Alchemy/Phrasea/Controller/Prod/Export.php
lib/Alchemy/Phrasea/Controller/Prod/Language.php
lib/Alchemy/Phrasea/Controller/Prod/Push.php
lib/Alchemy/Phrasea/Controller/Prod/Tooltip.php
lib/Alchemy/Phrasea/Controller/Report/Informations.php
lib/Alchemy/Phrasea/Controller/Report/Root.php
lib/Alchemy/Phrasea/Controller/Root/Developers.php
lib/Alchemy/Phrasea/Controller/Root/Login.php
lib/Alchemy/Phrasea/Controller/Root/Session.php
lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.php
lib/Alchemy/Phrasea/Controller/Utils/ConnectionTest.php
lib/Alchemy/Phrasea/Controller/Utils/PathFileTest.php
lib/Alchemy/Phrasea/Core/Version.php
lib/Alchemy/Phrasea/Form/Login/PhraseaAuthenticationForm.php
lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
lib/Alchemy/Phrasea/SearchEngine/SphinxSearch/SphinxSearchEngine.php
lib/classes/API/OAuth2/Application.php
lib/classes/API/V1/adapter.php
lib/classes/Feed/Adapter.php
lib/classes/Feed/Aggregate.php
lib/classes/Feed/Collection.php
lib/classes/Feed/Entry/Adapter.php
lib/classes/ZipArchiveImproved.php
lib/classes/caption/Field/Value.php
lib/classes/caption/record.php
lib/classes/eventsmanager/notify/feed.php
lib/classes/media/subdef.php
lib/classes/module/report/connexion.php
lib/classes/module/report/download.php
lib/classes/record/adapter.php
lib/classes/registry.php
lib/classes/set/export.php
lib/classes/setup.php
lib/classes/task/abstract.php
lib/classes/task/period/emptyColl.php
lib/classes/uuid.php
lib/conf.d/_GV_template.inc
lib/conf.d/bases_structure.xml
lib/conf.d/configuration.yml
lib/conf.d/minifyGroupsConfig.php
locale/de_DE/LC_MESSAGES/phraseanet.mo
locale/de_DE/LC_MESSAGES/phraseanet.po
locale/en_GB/LC_MESSAGES/phraseanet.mo
locale/en_GB/LC_MESSAGES/phraseanet.po
locale/fr_FR/LC_MESSAGES/phraseanet.mo
locale/fr_FR/LC_MESSAGES/phraseanet.po
locale/nl_NL/LC_MESSAGES/phraseanet.mo
locale/nl_NL/LC_MESSAGES/phraseanet.po
locale/phraseanet.pot
templates/web/account/account.html.twig
templates/web/account/base.html.twig
templates/web/admin/databox/databox.html.twig
templates/web/admin/index.html.twig
templates/web/admin/setup.html.twig
templates/web/admin/tree.html.twig
templates/web/client/index.html.twig
templates/web/common/caption.html.twig
templates/web/common/caption_templates/answer.html.twig
templates/web/common/caption_templates/basket_element.html.twig
templates/web/common/caption_templates/internal_publi.html.twig
templates/web/common/caption_templates/lazaret.html.twig
templates/web/common/caption_templates/overview.html.twig
templates/web/common/caption_templates/preview.html.twig
templates/web/common/index_bootstrap.html.twig
templates/web/common/indexfloat.html.twig
templates/web/common/thumbnail.html.twig
templates/web/developers/application_form.html.twig
templates/web/lightbox/IE6/feed.html.twig
templates/web/lightbox/IE6/validate.html.twig
templates/web/lightbox/feed.html.twig
templates/web/lightbox/validate.html.twig
templates/web/prod/actions/Download/prepare.html.twig
templates/web/prod/actions/publish/publish.html.twig
templates/web/prod/index.html.twig
templates/web/prod/preview/caption.html.twig
templates/web/prod/results/answerlist.html.twig
templates/web/thesaurus/accept.html.twig
templates/web/thesaurus/export-text-dialog.html.twig
templates/web/thesaurus/export-text.html.twig
templates/web/thesaurus/export-topics-dialog.html.twig
templates/web/thesaurus/export-topics.html.twig
templates/web/thesaurus/index.html.twig
templates/web/thesaurus/link-field-step1.html.twig
templates/web/thesaurus/link-field-step2.html.twig
templates/web/thesaurus/link-field-step3.html.twig
templates/web/thesaurus/new-term.html.twig
templates/web/thesaurus/properties.html.twig
templates/web/thesaurus/search.html.twig
templates/web/thesaurus/thesaurus.html.twig
tests/Alchemy/Tests/Phrasea/Application/ApiJsonTest.php
tests/Alchemy/Tests/Phrasea/Application/ApiYamlTest.php
tests/Alchemy/Tests/Phrasea/Application/LightboxTest.php
tests/Alchemy/Tests/Phrasea/Application/OAuth2Test.php
tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
tests/Alchemy/Tests/Phrasea/Authentication/PersistentCookie/ManagerTest.php
tests/Alchemy/Tests/Phrasea/Cache/RedisCacheTest.php
tests/Alchemy/Tests/Phrasea/Command/Compile/ConfigurationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/FieldsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/PublicationTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/SubdefsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Admin/UsersTest.php
tests/Alchemy/Tests/Phrasea/Controller/Api/ApiJSONPTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BasketTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/BridgeTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/EditTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/FeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/LanguageTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/MoveCollectionTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PrinterTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/PushTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/RootTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/StoryTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/ToolsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/TooltipTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UploadTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/UsrListsTest.php
tests/Alchemy/Tests/Phrasea/Controller/Prod/WorkZoneTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/ConnectionTestTest.php
tests/Alchemy/Tests/Phrasea/Controller/Utils/PathFileTestTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/FTPServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/LocaleServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/PhraseanetServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/RegistrationServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Core/Provider/TaskManagerServiceProviderTest.php
tests/Alchemy/Tests/Phrasea/Http/XSendFile/NginxModeTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfEditDateTest.php
tests/Alchemy/Tests/Phrasea/Metadata/Tag/TfMimeTypeTest.php
tests/Alchemy/Tests/Phrasea/SearchEngine/SearchEngineAbstractTest.php
tests/classes/Feed/Feed_AggregateTest.php
tests/classes/PhraseanetPHPUnitAbstract.php
tests/db-ref.sqlite
2014-06-17 15:30:41 +02:00
Nicolas Le Goff
534f69b655
Fix missing configuration keys
2014-05-28 13:09:14 +02:00
Nicolas Le Goff
dc71055e3b
Fix PHRAS-79 Add lastname field as default field for registration process
2014-05-22 15:02:43 +02:00
Nicolas Le Goff
d2dc99baf8
PHRAS-58 Add CORS feature
2014-04-13 19:31:13 +02:00
