hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,978 Commits 268 Branches 107 Tags
db306792a627fe64300ebe2024faf8e2bc8c61f9
Commit Graph

18 Commits

Author SHA1 Message Date
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
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
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