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

632 Commits

Author SHA1 Message Date
Nicolas Le Goff
4376ccb230 Fix record preview 2015-02-24 15:28:14 +01:00
Nicolas Le Goff
50165bd894 Fix record preview in production 2015-02-20 17:25:50 +01:00
Nicolas Le Goff
111755fa9b Refactor status display 2015-02-19 15:14:23 +01:00
Mathieu Darse
a0dad0e96e WIP on reindexing events handling 2015-02-04 19:53:35 +01:00
Mathieu Darse
c6b509a32c Centralize record event dispatches inside record adapter (but not structure ones) 2015-02-03 11:19:23 +01:00
Mathieu Darse
e287ba1a42 Merge record and structure events inside new namespace 2015-01-27 18:59:27 +01:00
Mathieu Darse
bc61536a41 Story record emits proper record events 2015-01-27 16:49:23 +01:00
Mathieu Darse
a1d6fc03b6 Move RECORD_* events in a new RecordEvents class 2015-01-27 16:17:48 +01:00
Mathieu Darse
85c410278a Remaining record events OK 2015-01-27 14:58:05 +01:00
Mathieu Darse
a64b8286e6 Record/story metadata and collection change events OK 2015-01-26 20:06:09 +01:00
Mathieu Darse
47d00db5ab Story create/delete events OK 2015-01-26 19:05:03 +01:00
Mathieu Darse
b0959a9a31 Record create/delete events OK 2015-01-26 17:41:05 +01:00
Nicolas Le Goff
a01bf29c5b Add elasticsearch reindex events 2015-01-26 16:04:23 +01:00
Nicolas Le Goff
e9c6d1a56e Fix mess in prod (record & feed) templates 2014-12-04 11:48:11 +01: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
f196155049 Fix PHRAS-322, add result debug informations (aggregations) 2014-10-14 18:51:02 +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
Nicolas Le Goff
10a83bc6c4 Fix latest merge 2014-10-13 12:58:20 +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
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
Nicolas Le Goff
69260ac7c7 Remove guest access check for export controller 2014-09-25 12:43:02 +02:00
Nicolas Le Goff
2ad315cfb2 Set User_Query object as a service 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
c4bf6c3c67 Convert custom events to symfony events 2014-09-09 21:21:38 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Mathieu Darse
1fbddfec3e PoC query parser 
With Jison PHP port
 2014-08-25 10:25:37 +02:00
Nicolas Le Goff
81763db182 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Helper/Record/Helper.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/caption/record.php
	lib/classes/registry.php
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	tests/Alchemy/Tests/Phrasea/Application/OverviewTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Api/ApiTestCase.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/RSSFeedTest.php
 2014-08-19 12:17:18 +02:00
Nicolas Le Goff
8a55a2c1ed Fix latest merge 2014-08-19 11:49:35 +02:00
Nicolas Le Goff
779c29dd16 Allow to rotate thumbnails on all type of records 2014-08-19 11:45:19 +02:00
Nicolas Le Goff
2328bc772d Fix PDF generation for print 2014-08-19 11:43:16 +02:00
Nicolas Le Goff
33d6a34f26 Fix PHRAS-146 Order of a basket generates an error when the content comes from two different collections 2014-08-19 11:41:11 +02:00
Nicolas Le Goff
2d0a2bc353 Merge pull request #1100 from nlegoff/fix-146 
[READY][3.8.6][PHRAS-146] Order of a basket generates an error when the content come...
 2014-08-18 10:50:36 +02:00
Nicolas Le Goff
ab80bd454b Merge pull request #1107 from nlegoff/fix-phras-111 
[READY][3.8.6][PHRAS-111] Allow rotation for image subdef
 2014-08-18 10:50:09 +02:00
Nicolas Le Goff
095371fa05 Merge pull request #1110 from nlegoff/fix-phras-153 
[READY][3.8.6][PHRAS-153] Fix printing PDF generation
 2014-08-18 10:48:49 +02:00
Nicolas Le Goff
fe6bdb21b2 Allow to rotate thumbnails on all type of records 2014-08-13 18:23:40 +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
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
c8c10f2776 PHRAS-205 #fix validation reorder 2014-07-23 19:02:42 +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
1c446e4998 PHRAS-184 #fix highlight issue in detailled view 2014-07-07 15:30:33 +02:00
Nicolas Le Goff
a91a1c8f0c PHRAS-182 #fix validation authentication 2014-07-07 14:58:00 +02:00
Nicolas Le Goff
d454a17adb PHRAS-95 PHRAS-173 #fix usage of pdf or video thumbnail as display image for stories 2014-07-07 14:53:39 +02:00
Nicolas Le Goff
caeb383661 PHRAS-47 #comment add option to force usage of authenticated push 2014-06-25 13:58:52 +02:00
Nicolas Le Goff
5e2dd0216a Fix latest merge 2014-06-24 14:56:09 +02:00