hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,163 Commits 268 Branches 107 Tags
PHRAS-4146-abort-app-install-if-not-empty
Commit Graph

105 Commits

Author SHA1 Message Date
Aina Sitraka
749e08486c PHRAS-4135: Prod - Thesaurus Search - add content operator for search in editing and workzonethesaurus search add content operator (#4589) 
* thesaurus search add content operator

* fix and generate translation

* taken account operator when searching in field

save last thesaurus operator choice in session

---------

Co-authored-by: Nicolas Maillat <maillat@alchemy.fr>
 2025-03-06 10:40:58 +01:00
Aina Sitraka
b6a5f90fd3 PHRAS-3857 Check CSRF token on Prod and Admin forms (#4361) 
* csrf token form

* add csrf token

* add csrf

* add csrf

* add csrf

* test

* test

* test

* add form token in report

* csrf token upload

* lazaret csrf form

* upload test

* lazaret test

* add csrf token

* fix test

* fix set cover publication

---------

Co-authored-by: jygaulier <gaulier@alchemy.fr>
 2023-10-03 16:28:33 +02:00
jygaulier
2b232a1264 [skip ci] 
PHRAS-3381_tx-as-classification-plan_MASTER
WIP
 2021-03-15 10:05:32 +01:00
aina esokia
e23b9dd294 PHRAS-3277 create event recordsWitemeta 2020-11-20 17:10:58 +03:00
aina esokia
18a87be497 PHRAS-3227 fix import file 2020-10-07 15:29:28 +03:00
aynsix
dad3bc4577 fix /thesaurus/populate return 2020-07-03 17:23:15 +03:00
aynsix
df22b24b19 add populate controller in thesaurus 2020-06-23 11:06:51 +03:00
aina-esokia
60c126c7b9 escape when rendered 2019-03-29 17:20:04 +04:00
aina-esokia
019498b5c4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2276-port-template-escape 2019-03-29 17:09:37 +04:00
aina-esokia
d413c86912 port to 4.1 search thesaurus term to all language 2018-11-26 10:48:57 +04:00
aina-esokia
6fe39113c0 fix escaping in thesaurus 2018-11-22 15:10:38 +04:00
Mike Ng
191a59c827 add search to candidate tab 
refactor search_term function in backend
 2017-08-15 12:54:16 +04:00
Thibaud Fabre
9ff43945ba Fix merge errors 2016-12-06 14:04:38 +01:00
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
120f311e5c PHRAS-830_CANDIDATES-CACHED 
fix : Loading cterms was not possible if the already loaded list was empty (missing html tag). Not a cache problem.
 2016-11-08 16:57:24 +01: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
Jean-Yves Gaulier
19342cf45c PHRAS-1190_prod-search-thesaurus 
- removed comment
- test is ok (no more timeout) but without changes from first commit (???)
 2016-07-19 13:46:27 +02:00
Jean-Yves Gaulier
0dac4a4573 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 12:00:47 +02:00
Jean-Yves Gaulier
5ae1b8355d PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-19 11:37:46 +02:00
Jean-Yves Gaulier
69914dee31 PHRAS-1190_prod-search-thesaurus 
- wip : changes removed to see if tests timeout again
 2016-07-18 16:42:52 +02:00
Jean-Yves Gaulier
1abe2463e8 PHRAS-1190_prod-search-thesaurus 
- fix : prod / thesaurus search is ok (language doesn't care)
#time 2h
 2016-07-18 15:32:27 +02:00
Jean-Yves Gaulier
69cc533ff6 PHRAS-726_delete-candidate 
- change : thesaurus pool notifications is 10s
- fix : thesaurus / delete term is ok

#time 1h
 2016-06-28 19:10:23 +02:00
Jean-Yves Gaulier
9c32183747 PHRAS-726_delete-candidate 
- remove : prod / replace candidate is removed from menu
- fix : thesaurus / delete candidate is ok

#time 1h
 2016-06-28 16:54:32 +02:00
Jean-Yves Gaulier
ef108d543e PHRAS-726_delete-candidate 
- change : prod / delete candidate does not update records metadata
- change : prod / replace candidate is disabled
- fix : prod / delete candidate is ok

#time 2h
 2016-06-28 15:12:31 +02:00
Benoît Burnichon
51023c5533 bump copyright year 2016-01-05 13:38:14 +01:00
Jean-Yves Gaulier
830728f644 #PHRAS-797 time 10m 
fix: app thesaurus, search is ok in ie11
 2015-11-03 19:07:19 +01:00
Mathieu Darse
760ca11c60 Fix event dispatch 2015-09-08 15:12:40 +02:00
Jean-Yves Gaulier
04e6240414 PHRAS-556 #time 5h 
- fix: creation of presets
- fix: usage of presets
- fix: deletion of presets
- new: routes for presets
 2015-06-30 18:13:42 +02:00
Benoît Burnichon
aeee8d8f62 Refactor ThesaurusXmlHttpController 2015-06-23 13:24:00 +02:00
Benoît Burnichon
988cac21d8 Split XmlHttp into Controller/Provider 2015-06-23 12:57:03 +02:00
Benoît Burnichon
c94762a2c4 Refactor ThesaurusController 2015-06-23 12:08:24 +02:00
Benoît Burnichon
c806c11549 Split Thesaurus into provider/controller 2015-06-23 11:28:03 +02:00
Benoît Burnichon
1342756b84 Rename Controller to ControllerProvider 2015-03-27 12:55:43 +01:00
Benoît Burnichon
51a3ff25b5 Change string to array parameter to prevent SQL injections 2015-03-12 15:08:24 +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
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
Jean-Yves Gaulier
2d5390abde removed "showmodaldialog(...)" from javascript (removed from chrome) 2015-01-07 17:59:18 +01:00
Nicolas Le Goff
f57e3ca338 Fix missing variable declaration 2014-12-30 20:04:34 +01:00
Damien Alexandre
91bbb5a1bd Fix thesaurus ACL getter, ping @nlegoff 2014-09-08 16:28:27 +02:00
Nicolas Le Goff
fc2f49d012 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Xmlhttp.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/module/report/activity.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/record/adapter.php
	lib/classes/task/period/subdef.php
	templates/web/prod/thesaurus.js.twig
	tests/Alchemy/Tests/Phrasea/Setup/InstallerTest.php
	tests/classes/PhraseanetPHPUnitAbstract.php
	tests/classes/connectionTest.php
 2014-09-02 19:09:38 +02:00
Jean-Yves Gaulier
415ec0d7a0 speedup hit compute (green digits in prod/thesaurus) 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6e9c6d9480 clean 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
31401364f0 speedup occurences calc 2014-09-02 13:44:36 +02:00
Jean-Yves Gaulier
6fbe66829c phras-36 #time 4h 
first proto, wip do not merge
 2014-09-02 13:44:36 +02:00
Nicolas Le Goff
d2ff7b8c26 PHRAS-114 #fix Add candidate in thesaurus 2014-08-26 17:23:32 +02:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
1970439edb Fix latest merge 2014-06-24 16:40:12 +02:00