hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 23:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
8,757 Commits 268 Branches 107 Tags
ed3ffb59a68bfbc9f95d0285d1f54703c6e7716f
Commit Graph

3188 Commits

Author SHA1 Message Date
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
Mathieu Darse
bcff55962c Merge pull request #32 from nlegoff/pr-facets 
Add dynamic facets query & take care of ACL for business fields
 2015-03-10 12:03:34 +01:00
Mathieu Darse
3599b05950 Some tidying / cleanup 2015-03-10 12:02:24 +01:00
Mathieu Darse
d5137bcd11 Merge pull request #36 from nlegoff/fix-use 
Fix use statement
 2015-03-10 11:57:44 +01:00
Mathieu Darse
5d3f8b3123 Merge pull request #35 from nlegoff/poplate-by-database 
Add possibilty to explicitely set database to populate
 2015-03-10 11:55:10 +01:00
Mathieu Darse
e889d19b7d Filter databoxes earlier (in Indexer) and databox id error handling 2015-03-10 11:52:30 +01:00
Mathieu Darse
ac42daa062 Fill candidate terms while indexing 2015-03-05 14:49:26 +01:00
Nicolas Le Goff
17681fdb32 Merge pull request #1263 from bburnichon/feature/fix-build 
Properly Retrieve LazaretFile repo. Update LazaretTests
 2015-03-04 20:10:24 +01:00
Benoît Burnichon
c7fb23d28c Properly Retrieve LazaretFile repo. Update LazaretTests 2015-03-04 19:33:20 +01:00
Benoît Burnichon
1d6d0ab82f DatabaseHelper does not try to connect twice. 2015-03-04 18:50:47 +01:00
Mathieu Darse
fadf0abd90 Remove QueryContext fields prefixing (only used on term nodes) 2015-03-03 19:02:32 +01:00
Mathieu Darse
32293a9b84 Strict option on concept finding command 2015-03-03 18:58:31 +01:00
Benoît Burnichon
bfabecc1ad Fix phraseanet install (generate ORM proxies) 2015-03-03 18:56:10 +01:00
Mathieu Darse
c917c7f952 Thesaurus matching while indexing records 
- Add a new hydrator to ask query thesaurus on the fly
- Add a filtering system on thesaurus
- And a databox filter friend
 2015-03-03 18:50:34 +01:00
Nicolas Le Goff
6ddff1923e Fix use stmt 2015-02-27 16:24:19 +01:00
Nicolas Le Goff
4daf40029a Add possibilty to explicitely set database to populate 2015-02-27 16:23:26 +01:00
Nicolas Le Goff
709af5bba0 Optim 2015-02-27 16:09:10 +01:00
Nicolas Le Goff
2924d8f29f Fix mount database 2015-02-27 16:08:53 +01:00
Nicolas Le Goff
95211d8875 Remove unused stuff 2015-02-27 16:08:40 +01:00
Mathieu Darse
e420ad2997 Fix thesaurus indexing crash when XML contains spaces 2015-02-26 19:10:55 +01:00
Mathieu Darse
6bf03de2ca Refactor metadata indexing 
- Caption fields are multi-valued by default
- Simpler query
- Technical data (EXIF) is always single-valued
- Error handling
 2015-02-26 17:09:16 +01:00
Mathieu Darse
339605167c Ability to only populate thesaurus or records index 2015-02-26 13:54:00 +01:00
Mathieu Darse
387c00cee9 Use QueryException for non existing fields 2015-02-26 13:53:35 +01:00
Nicolas Le Goff
4f66588600 Add dynamic facets query 2015-02-26 12:28:22 +01:00
Mathieu Darse
db766f2865 Handle non existing fields in query 2015-02-25 16:43:25 +01:00
Mathieu Darse
a96cc7ee26 Add query parsing timings 2015-02-25 16:12:58 +01:00
Mathieu Darse
a84602f896 Move concept injection into query parser 2015-02-25 16:12:58 +01:00
Mathieu Darse
efef09e435 We don't always want to explicitly restrict caption fields 2015-02-25 16:12:39 +01:00
Mathieu Darse
2ac931c66f Better context dump 2015-02-25 12:22:53 +01:00
Mathieu Darse
dcb8da99aa TermNode is not a TextNode 2015-02-25 12:22:52 +01:00
Mathieu Darse
dfc386cce1 Clean query visitor text merging 2015-02-25 12:22:52 +01:00
Mathieu Darse
fe7e63b3d7 QuotedTextNode don't inherit anymore from TextNode 
- Quoted text do not hit the thesaurus anymore
- getTextNodes() was misleading, renamed to getTermNodes()
 2015-02-25 12:22:52 +01:00
Mathieu Darse
8c1848afae Expression context support in thesaurus lookup 2015-02-25 12:22:13 +01:00
Mathieu Darse
e5bda79cf8 Bracket syntax does a thesaurus search only 2015-02-25 12:19:00 +01:00
Mathieu Darse
4d1ce3e8dc Fix visitor issue with term expressions 2015-02-25 12:19:00 +01:00
Mathieu Darse
712850ac67 Update grammar and AST for bracket notation 2015-02-25 12:19:00 +01:00
Nicolas Le Goff
4376ccb230 Fix record preview 2015-02-24 15:28:14 +01:00
Nicolas Le Goff
cb96964078 Fix subdef generation 2015-02-24 15:27:31 +01:00
Nicolas Le Goff
6d580ac5fd Fix bitfield key 2015-02-24 15:27:04 +01:00
Nicolas Le Goff
12e4010943 Fix bad token for write metadata 2015-02-24 15:26:18 +01:00
Nicolas Le Goff
7299928840 Load service provider if app is setup 2015-02-24 15:25:43 +01:00
Nicolas Le Goff
aac3c5de5c Merge pull request #1258 from kwemi/design-update-v1 
980px layout
 2015-02-24 11:53:42 +01:00
Olivier Mayer
e028b4c7d5 980px layout 2015-02-24 18:18:31 +09:00
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
Mathieu Darse
29c5308556 Merge pull request #29 from nlegoff/pr-preview 
Fix record preview in production
 2015-02-23 18:19:40 +01:00
Mathieu Darse
19775d5908 Merge pull request #30 from nlegoff/pr-indexation-thesaurus 
Fix indexation thesaurus
 2015-02-23 18:19:10 +01:00
Mathieu Darse
1679595ed8 Merge pull request #33 from nlegoff/pr-fix-merge 
Fix sql field name
 2015-02-23 18:12:36 +01:00
Nicolas Le Goff
c99f2e7746 Fix sql field name 
Signed-off-by: Mathieu Darse <mdarse@jolicode.com>
 2015-02-23 17:50:26 +01:00
Nicolas Le Goff
62390b81d4 Fix indexation thesaurus 2015-02-20 17:27:55 +01:00
Nicolas Le Goff
add59cb2f7 Set default sort to relevance if sort option is not provided 2015-02-20 17:27:00 +01:00