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

8304 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathieu Darse
37445b3151 Add hoa compiler 2014-10-22 11:15:05 +02:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Mathieu Darse
85102bfce7 Merge remote-tracking branch 'upstream/master' 2014-10-15 12:14:08 +02:00
Damien Alexandre
e88a219cb6 Increase the number of aggr for debug 2014-10-14 19:33:16 +02:00
Damien Alexandre
f196155049 Fix PHRAS-322, add result debug informations (aggregations) 2014-10-14 18:51:02 +02:00
Damien Alexandre
3438295ca3 Remove serializer from dependencies and fix index time display 2014-10-14 16:27:41 +02:00
Damien Alexandre
437f90fd66 Rewrite the way we handle base_id, can now works with more than 1 2014-10-14 14:54:50 +02:00
Damien Alexandre
52843f6ff1 Fix multi base search with fixed filters 2014-10-14 11:26:07 +02:00
Nicolas Le Goff
5e895c66d6 Fix upload 2014-10-13 20:14:49 +02:00
Damien Alexandre
2f890bcf49 Oups, debug code 2014-10-13 19:17:53 +02:00
Damien Alexandre
403c83b462 Fix indexing single record on post upload 2014-10-13 19:17:20 +02:00
Damien Alexandre
eb7914816d WIP on singleRecord indexer and fix error on path 2014-10-13 19:05:09 +02:00
Damien Alexandre
56b5053ebb Optimize the fetch record path method 2014-10-13 17:46:25 +02:00
Damien Alexandre
7c76bc3450 Use the isAggregable new getter 2014-10-13 17:32:18 +02:00
Damien Alexandre
f018723713 Set the correct number format and improve paths finding 2014-10-13 17:11:37 +02:00
Damien Alexandre
52978e6239 More path to query 2014-10-13 17:07:32 +02:00
Nicolas Le Goff
c7a79f2067 Merge pull request #1177 from nlegoff/fix-merge 
[3.9] Fix latest merge
 2014-10-13 14:16:20 +02:00
Damien Alexandre
da036f5b21 Remove mongodb from the services in the VM 
You will have to remove manualy /var/lib/mongodb/journal/*
to save space on the VM.
 2014-10-13 13:26:02 +02:00
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +02:00
Damien Alexandre
814279a83e Avoid error maxClauseCount in ES when the field is too large 2014-10-13 12:00:34 +02:00
Damien Alexandre
da505504c9 Fix record indexer metadata fetching, was messed up with doctrine 2014-10-13 11:53:10 +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
Nicolas Le Goff
130591e372 Merge pull request #1173 from nlegoff/api-version 
[3.8.6] Update API version
 2014-10-09 16:58:28 +02:00
Nicolas Le Goff
ec3a215587 Merge pull request #1176 from nlegoff/fix-262 
[3.8.6] PHRAS-262 #fix remove postlog feature for guest access
 2014-10-09 16:50:43 +02:00
Nicolas Le Goff
26617ba5cc PHRAS-262 #fix remove postlog feature for guest access 2014-10-08 20:18:49 +02:00
Nicolas Le Goff
c29b971f64 Merge pull request #1174 from jygaulier/PHRAS-306 
fix PHRAS-306 #time 6h
 2014-10-08 18:48:05 +02:00
Nicolas Le Goff
03e2fd3fd6 Merge pull request #1175 from nlegoff/php-exiftool-update 
[3.8.6] Update dependencies
 2014-10-08 18:46:37 +02:00
Nicolas Le Goff
c708ade187 Update cpsr.json 2014-10-08 18:43:33 +02:00
Mathieu Darse
25983d9529 Fix Vagrant 2014-10-08 12:09:49 +02:00
Damien Alexandre
d693e1fe4a Add record_type story or record and fix the filter 2014-10-07 18:06:09 +02:00
Damien Alexandre
3e5e802bf9 Only sort on score by default 2014-10-07 17:03:45 +02:00
Damien Alexandre
73b85e3953 PHRAS-233 Set record flag status, fix base id filters 2014-10-07 15:57:09 +02:00
Damien Alexandre
12a22b105e Restore the true filters on status and all 2014-10-07 12:46:59 +02:00
Damien Alexandre
b15fade0fe Fix the UniqueCollection fetcher 2014-10-07 11:05:14 +02:00
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Damien Alexandre
2c9bd86d2a Merge remote-tracking branch 'upstream/master' 2014-10-06 18:23:23 +02:00
Damien Alexandre
e8ac0df198 Merge branch 'master' of github.com:mdarse/Phraseanet 2014-10-06 18:22:56 +02:00
Damien Alexandre
4d43fe7c2d Add databox_id search for term indexing and add context criteria 2014-10-06 18:07:23 +02:00
Damien Alexandre
a246231e09 Add score of the terms search as boost for the record search 2014-10-06 17:30:46 +02:00
Damien Alexandre
f495045125 Make the search works without paths too 2014-10-06 16:24:48 +02:00
Damien Alexandre
fe2e694216 Add stopwatch listener to monitor populate time 2014-10-06 15:49:33 +02:00
Damien Alexandre
48928b60c2 PHRAS-302 Add concept path to records 2014-10-06 13:56:51 +02:00
Damien Alexandre
b7bcfb599b Fix namespace issue on \DomXpath 2014-10-06 10:27:01 +02:00
Jean-Yves Gaulier
90e611de81 fix PHRAS-306 #time 6h 
NB: can be set now, but will work only when PHPExiftool will be patched with the "copy" method (PR done).
 2014-10-01 19:52:17 +02:00
Nicolas Le Goff
68fc8f660e Update API version 2014-10-01 12:37:30 +02:00
Nicolas Le Goff
6087ee3fb4 Merge pull request #1172 from nlegoff/fix-patch 
[3.8] Fix patch migration && advanced search issues
 2014-10-01 11:45:05 +02:00
Nicolas Le Goff
f27512305b Merge pull request #1171 from nlegoff/api-oauth-creds 
[3.8] Fix sql to get created client apps
 2014-09-30 17:13:43 +02:00
Nicolas Le Goff
a81e6ef98d Fix advanced search sort 2014-09-30 17:12:13 +02:00
Nicolas Le Goff
4318b0e0b5 Fix patch migration 2014-09-30 16:58:35 +02:00
Nicolas Le Goff
a6c411f404 Fix sql to get created client apps 2014-09-30 16:15:45 +02:00