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
7,325 Commits 268 Branches 107 Tags
12f9575a8b93a5f86dd89c42a22ff33c82fbe2c8
Commit Graph

45 Commits

Author SHA1 Message Date
Romain Neutron
e233e5afa6 Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/classes/Exception/Feed/ItemNotFound.php
	lib/classes/Exception/Feed/PublisherNotFound.php
	lib/classes/Feed/Abstract.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Aggregate.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/CollectionInterface.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Collection.php
	lib/classes/Feed/Entry/Interface.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Entry/ItemInterface.php
	lib/classes/Feed/Interface.php
	lib/classes/Feed/Link.php
	lib/classes/Feed/LinkInterface.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/Feed/Publisher/Interface.php
	lib/classes/Feed/Token.php
	lib/classes/Feed/TokenAggregate.php
	lib/classes/Feed/XML/Abstract.php
	lib/classes/Feed/XML/Atom.php
	lib/classes/Feed/XML/Cooliris.php
	lib/classes/Feed/XML/Interface.php
	lib/classes/Feed/XML/RSS.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/http/request.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/schedulerState.php
	lib/classes/module/console/schedulerStop.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/tasklist.php
	lib/classes/module/console/taskrun.php
	lib/classes/registry.php
	lib/classes/registryInterface.php
	lib/classes/set/order.php
	lib/classes/system/url.php
	lib/classes/task/Scheduler.php
	lib/classes/task/appboxAbstract.php
	lib/classes/task/databoxAbstract.php
	lib/classes/task/manager.php
	lib/classes/task/period/RecordMover.php
	lib/classes/task/period/apibridge.php
	lib/classes/task/period/archive.php
	lib/classes/task/period/cindexer.php
	lib/classes/task/period/emptyColl.php
	lib/classes/task/period/ftp.php
	lib/classes/task/period/ftpPull.php
	lib/classes/task/period/subdef.php
	lib/classes/task/period/test.php
	lib/classes/task/period/writemeta.php
	lib/conf.d/PhraseaFixture/AbstractWZ.php
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasket.php
	lib/conf.d/PhraseaFixture/Basket/LoadOneBasketEnv.php
	lib/conf.d/PhraseaFixture/Lazaret/LoadOneFile.php
	lib/conf.d/PhraseaFixture/Story/LoadOneStory.php
	lib/conf.d/PhraseaFixture/UsrLists/ListAbstract.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrList.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListEntry.php
	lib/conf.d/PhraseaFixture/UsrLists/UsrListOwner.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadOneParticipant.php
	lib/conf.d/PhraseaFixture/ValidationParticipant/LoadParticipantWithSession.php
	lib/conf.d/PhraseaFixture/ValidationSession/LoadOneValidationSession.php
 2014-01-06 15:38:14 +01:00
Romain Neutron
d519c13e56 Bump copyright year 2014-01-06 15:28:12 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
420df7febd Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databox.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/SearchEngineServiceProvider.php
	lib/Alchemy/Phrasea/Model/Entities/AuthFailure.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretAttribute.php
	lib/Alchemy/Phrasea/Model/Entities/LazaretCheck.php
	lib/Alchemy/Phrasea/Model/Entities/SessionModule.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationData.php
	lib/Alchemy/Phrasea/Model/Repositories/BasketRepository.php
	lib/conf.d/Doctrine/Entities.Session.dcm.yml
	lib/conf.d/Doctrine/Entities.StoryWZ.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrList.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListEntry.dcm.yml
	lib/conf.d/Doctrine/Entities.UsrListOwner.dcm.yml
	lib/conf.d/Doctrine/Entities.ValidationSession.dcm.yml
	lib/conf.d/PhraseaFixture/Basket/LoadFiveBaskets.php
	tests/Alchemy/Tests/Phrasea/SearchEngine/SphinxSearchEngineTest.php
 2013-12-03 21:19:20 +01:00
Romain Neutron
7904a33e07 Fix CS 2013-12-03 21:01:43 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
e4c43b8622 Use TranslationServiceProvider, fix use of form_div_layout 2013-12-03 20:02:39 +01:00
Romain Neutron
1472f96e93 Fix #736 : Re-inject phraseanet rights after collection creation in case of PhraseaEngine 2013-11-28 16:16:18 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +01:00
Romain Neutron
97988de0da Remove locale on request finish, not on kernel terminate 2013-11-04 13:29:16 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Nicolas Le Goff
7a1595744f Fix tests 2013-10-29 17:02:14 +01:00
Nicolas Le Goff
7b256eae61 Fix setting cookie 2013-10-28 18:41:41 +01:00
Nicolas Le Goff
496b5145a7 Sets cookie in PhraseaLocaleSuscriber 2013-10-28 14:16:21 +01:00
Romain Neutron
eb590780ca Fix CS 2013-09-30 18:26:32 +02:00
Romain Neutron
bc617d101a Fix #1368 : Disable call to configuration when application is not installed 2013-07-23 20:58:42 +02:00
Romain Neutron
bef147eabc Ensure configuration is set up before trying to look for special conf 2013-07-17 21:56:55 +02:00
Romain Neutron
0ab927ec97 Fix #1243 Phraseanet enabled languages is now configurable 2013-07-17 21:22:01 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Romain Neutron
56ea42d2e6 Fix #1276 : persistent cookies does not authenticate 2013-07-10 19:44:22 +02:00
Nicolas Le Goff
8e31a692cb Enhance XSendFileMapping to handle apache 
Update xsendfile
 2013-07-02 17:33:12 +02:00
Romain Neutron
1f2fa673e1 Lazy load subscribers 2013-07-01 14:03:59 +02:00
Romain Neutron
2e88aa1ea1 Add cookies disabler 2013-06-28 23:24:19 +02:00
Romain Neutron
0800d9bb96 Fix CS 2013-06-28 22:31:33 +02:00
Romain Neutron
6fe74d6d00 Fix unit tests 2013-06-28 12:34:03 +02:00
Romain Neutron
c0f2a67dd4 Remove composer custom repositories 2013-06-28 12:34:03 +02:00
Romain Neutron
e155089cac Tweaks and fixes 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
4e39265f5e Rename subscriber 2013-06-28 00:16:34 +02:00
Nicolas Le Goff
01a36ee9f7 Use power of symfony binary file response 
Add commands

Fix typo

Remove extra line
 2013-06-28 00:16:34 +02:00
Romain Neutron
ae89305575 Add better maintenance handling 2013-06-19 19:22:44 +02:00
Romain Neutron
42db38d055 Add error pages, fix error handling and PHP conf 2013-06-17 17:01:35 +02:00
Romain Neutron
8174645214 Add Context to phraseanet authentication events 2013-05-29 14:23:23 +02:00
Romain Neutron
70b4912427 Add missing headers 2013-05-29 14:23:21 +02:00
Romain Neutron
d674462f5d Update post authenticate event 2013-05-29 14:23:14 +02:00
Romain Neutron
3da56eb0c5 Add authentication events 2013-05-29 14:22:52 +02:00
Romain Neutron
0bf9c09faf Revert BC break, fix unit tests 2013-05-14 12:36:15 +02:00
Romain Neutron
d4c9cdf5c0 Move locale detection from provider to subscriber 2013-05-13 17:15:19 +02:00
Romain Neutron
c172ba7bbc Merge branch '3.7' 2013-03-28 14:37:57 +01:00
Romain Neutron
35c64c6a32 Fix #1128 : Add API timers logs 2013-03-25 19:55:33 +01:00
Romain Neutron
53206af159 Fix CS lib/Alchemy 2013-01-29 16:38:00 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
133595635c [SearchEngine] Finalize search engine refactor 2013-01-17 11:43:36 +01:00