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
9,528 Commits 268 Branches 107 Tags
3d16c624b44b4fa117becf5280cedd0d8f70b124
Commit Graph

731 Commits

Author SHA1 Message Date
Nicolas Le Goff
d9239a0b77 Set unique index per instance 2014-12-29 19:51:35 +01:00
Mathieu Darse
f83d8109c7 Rename thesaurus service 2014-12-17 22:54:51 +01:00
Mathieu Darse
65d4334dd1 Thesaurus term inference command 2014-12-15 12:25:18 +01:00
Nicolas Le Goff
589169299c Fix merge 3.8 2014-12-09 14:01:00 +01:00
Nicolas Le Goff
9f38823f27 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Command/Setup/H264MappingGenerator.php
	lib/Alchemy/Phrasea/Controller/AbstractDelivery.php
	lib/Alchemy/Phrasea/Controller/Prod/DoDownload.php
	lib/Alchemy/Phrasea/Controller/Prod/Edit.php
	lib/Alchemy/Phrasea/Controller/Prod/Story.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Report/Activity.php
	lib/Alchemy/Phrasea/Controller/Report/Root.php
	lib/Alchemy/Phrasea/Controller/Root/Account.php
	lib/Alchemy/Phrasea/Core/PhraseaEvents.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/API/V1/adapter.php
	lib/classes/User/Adapter.php
	lib/classes/databox.php
	lib/classes/media/subdef.php
	lib/classes/module/report.php
	lib/classes/module/report/activity.php
	lib/classes/module/report/connexion.php
	lib/classes/module/report/download.php
	lib/classes/module/report/nav.php
	lib/classes/module/report/question.php
	lib/classes/module/report/sqlaction.php
	lib/classes/module/report/sqlconnexion.php
	lib/classes/module/report/sqldownload.php
	lib/classes/module/report/sqlfilter.php
	lib/classes/task/abstract.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/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/classes/report/activityTest.php
	tests/classes/report/editTest.php
 2014-12-09 13:59:29 +01:00
Nicolas Le Goff
7d44a356e3 CUS-120 #fix editon date for records 2014-11-18 17:47:33 +01:00
Nicolas Le Goff
0b763c459e PHRAS-342 #fix remove usr list when user is deleted 2014-11-17 11:46:28 +01:00
Mathieu Darse
3ec520ed11 New query parser between Hoa compiler and search engine 2014-11-06 18:37:53 +01:00
Mathieu Darse
3266d8d9ac WIP on PP grammar 2014-10-22 11:15:56 +02:00
Mathieu Darse
5b24664001 Merge branch 'master' into elastic-indexer 
Conflicts:
	bin/console
 2014-10-15 12:18:44 +02:00
Damien Alexandre
3438295ca3 Remove serializer from dependencies and fix index time display 2014-10-14 16:27:41 +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
Damien Alexandre
5f7edb5be9 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-10-06 18:24:58 +02:00
Damien Alexandre
f91dd7346d Inject application locales and set the appropriate mapping 2014-09-23 12:18:36 +02:00
Damien Alexandre
e31b138e2f Set back the logger on Elasticsearch client, not pleased with the format 2014-09-22 11:34:14 +02:00
Mathieu Darse
bc22dfcd6d WIP Thesaurus terms linking 2014-09-22 10:17:53 +02:00
Mathieu Darse
285826eb87 Use DI for indexer & share bulk operation 2014-09-10 17:34:15 +02:00
Mathieu Darse
de8e9e3bfc Refactor search engine provider 2014-09-10 16:45:22 +02:00
Nicolas Le Goff
f047878f36 bump to version 3.8.6-alpha3a 2014-09-10 11:29:08 +02:00
Nicolas Le Goff
2c6ba6b99f Add static file mode to deliver thumbnails 2014-09-10 11:23:29 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
ec4d2c364f Add webhook event && fix tests 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
7c62038b7d Fix unit tests 2014-09-09 21:21:38 +02:00
Romain Neutron
d2e532cec8 Bump to versio 3.9.0-alpha.17 2014-09-09 21:21:38 +02:00
Romain Neutron
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Damien Alexandre
775ce804e0 Refactor RecordIndexer for speed optims, fix lot's of stuffs 2014-09-09 16:48:02 +02:00
Damien Alexandre
ab07cb8e17 Merge branch 'master' into elastic-indexer 
Conflicts:
	.gitignore
 2014-09-08 11:39:02 +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
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
Nicolas Le Goff
ce6bc3d5e1 Fix minor issues 2014-08-29 18:07:48 +02:00
Mathieu Darse
d187bfe80d WIP Indexer 2014-08-26 16:42:48 +02:00
Nicolas Le Goff
6485b64e68 Fix latest merge 2014-08-20 15:13:41 +02:00
Nicolas Le Goff
bc88d0f474 Add crossdomain file generator command 2014-08-19 16:35:57 +02:00
Nicolas Le Goff
cbd0bb0558 Fix install 2014-08-19 15:00:36 +02:00
Nicolas Le Goff
9e2083dfe4 Add init command 2014-08-13 18:21:57 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +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
4d7a58bcf4 Add tests 2014-07-30 16:47:50 +02:00
Nicolas Le Goff
09ff2673c5 Accept default header 2014-07-30 16:47:49 +02:00
Nicolas Le Goff
746a0c660b Add content negotiation event subscriber 2014-07-30 16:47:49 +02:00
Nicolas Le Goff
45e53518ed Add content negociation provider 2014-07-30 16:47:49 +02:00
Nicolas Le Goff
e17493aa0b Add extended response format for API 2014-07-30 16:47:49 +02:00
Nicolas Le Goff
a0d0b8f03c Merge pull request #1124 from nlegoff/fix-198 
[3.8.6][PHRAS-198] add possibility to disable taskmanager per instance
 2014-07-28 15:22:39 +02:00
Nicolas Le Goff
f850a4cd6c Bump to version 3.8.6-alpha1 2014-07-28 12:03:37 +02:00
Nicolas Le Goff
e0c749d69a Merge pull request #1098 from nlegoff/some-385 
[3.8.6] Fix some minor bugs
 2014-07-25 18:11:13 +02:00
Nicolas Le Goff
66fa05f4ee Fix CS 2014-07-17 15:17:04 +02:00
Nicolas Le Goff
fcdc10c554 Fix latest merge 2014-07-17 15:11:26 +02:00
Nicolas Le Goff
3565d1c795 Merge branch '3.8' into fix-latest-merge 
Conflicts:
	CHANGELOG.md
	bower.json
	composer.json
	composer.lock
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Media/Subdef/Image.php
	lib/conf.d/_GV_template.inc
	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
	templates/web/prod/Story/Reorder.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Download/prepare.html.twig
	templates/web/prod/templates/push.html.twig
 2014-07-11 17:19:39 +02:00
Nicolas Le Goff
b4141f92a7 Bump to version 3.8.6-alpha.0 2014-07-09 18:21:22 +02:00
Nicolas Le Goff
b59dc79421 Prepare version 3.8.5 2014-07-09 18:17:25 +02:00