| 
							
							
								 Benoît Burnichon | 51023c5533 | bump copyright year | 2016-01-05 13:38:14 +01:00 |  | 
			
				
					| 
							
							
								 Thibaud Fabre | f02fdc186f | User registration refactoring | 2015-10-20 09:12:22 +02:00 |  | 
			
				
					| 
							
							
								 Thibaud Fabre | 1915da1eb1 | Fix DI key for user repository | 2015-09-22 20:19:49 +02:00 |  | 
			
				
					| 
							
							
								 Thibaud Fabre | 2aa24186f4 | Add API routes for password resets | 2015-09-22 18:33:06 +02:00 |  | 
			
				
					| 
							
							
								 Benoît Burnichon | f920e8354a | Replace phraseanet.appbox by getApplicationBox() method calls. | 2015-07-02 12:33:19 +02:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 9a3e92ed9c | Multiple ORMs for all database | 2015-02-12 17:58:45 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 949bf06cac | Merge branch '3.8' Conflicts:
	CHANGELOG.md
	bin/console
	bin/developer
	bin/setup
	bower.json
	composer.json
	composer.lock
	features/bootstrap/FeatureContext.php
	features/bootstrap/GuiContext.php
	lib/Alchemy/Phrasea/Authentication/Token/TokenValidator.php
	lib/Alchemy/Phrasea/Command/BuildMissingSubdefs.php
	lib/Alchemy/Phrasea/Command/CreateCollection.php
	lib/Alchemy/Phrasea/Command/Developer/JavascriptBuilder.php
	lib/Alchemy/Phrasea/Controller/Admin/Collection.php
	lib/Alchemy/Phrasea/Controller/Admin/Databoxes.php
	lib/Alchemy/Phrasea/Controller/Admin/TaskManager.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Client/Baskets.php
	lib/Alchemy/Phrasea/Controller/Client/Root.php
	lib/Alchemy/Phrasea/Controller/Prod/Basket.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Prod/Property.php
	lib/Alchemy/Phrasea/Controller/Prod/Records.php
	lib/Alchemy/Phrasea/Controller/Prod/Tools.php
	lib/Alchemy/Phrasea/Controller/Prod/Upload.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Controller/Thesaurus/Thesaurus.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadEndEvent.php
	lib/Alchemy/Phrasea/Core/Event/ApiLoadStartEvent.php
	lib/Alchemy/Phrasea/Core/Provider/TaskManagerServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Exception/XMLParseErrorException.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/User/Edit.php
	lib/Alchemy/Phrasea/SearchEngine/Phrasea/PhraseaEngine.php
	lib/Alchemy/Phrasea/SearchEngine/SearchEngineOptions.php
	lib/Doctrine/Entities/AuthFailure.php
	lib/Doctrine/Entities/Basket.php
	lib/Doctrine/Entities/BasketElement.php
	lib/Doctrine/Entities/LazaretAttribute.php
	lib/Doctrine/Entities/LazaretCheck.php
	lib/Doctrine/Entities/LazaretFile.php
	lib/Doctrine/Entities/LazaretSession.php
	lib/Doctrine/Entities/Session.php
	lib/Doctrine/Entities/SessionModule.php
	lib/Doctrine/Entities/StoryWZ.php
	lib/Doctrine/Entities/UsrList.php
	lib/Doctrine/Entities/UsrListEntry.php
	lib/Doctrine/Entities/UsrListOwner.php
	lib/Doctrine/Entities/ValidationData.php
	lib/Doctrine/Entities/ValidationParticipant.php
	lib/Doctrine/Entities/ValidationSession.php
	lib/Doctrine/Logger/MonologSQLLogger.php
	lib/Doctrine/Repositories/BasketRepository.php
	lib/Doctrine/Repositories/ValidationParticipantRepository.php
	lib/Doctrine/Types/Binary.php
	lib/Doctrine/Types/Blob.php
	lib/Doctrine/Types/Enum.php
	lib/Doctrine/Types/LongBlob.php
	lib/Doctrine/Types/VarBinary.php
	lib/classes/API/OAuth2/Account.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/OAuth2/Application/OfficePlugin.php
	lib/classes/API/OAuth2/AuthCode.php
	lib/classes/API/OAuth2/RefreshToken.php
	lib/classes/API/OAuth2/Token.php
	lib/classes/API/V1/Abstract.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/API/V1/exception/abstract.php
	lib/classes/API/V1/exception/badrequest.php
	lib/classes/API/V1/exception/forbidden.php
	lib/classes/API/V1/exception/internalservererror.php
	lib/classes/API/V1/exception/maintenance.php
	lib/classes/API/V1/exception/methodnotallowed.php
	lib/classes/API/V1/exception/notfound.php
	lib/classes/API/V1/exception/unauthorized.php
	lib/classes/API/V1/result.php
	lib/classes/Exception/Feed/EntryNotFound.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/CollectionInterface.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/Image.php
	lib/classes/Feed/XML/RSS/ImageInterface.php
	lib/classes/User/Adapter.php
	lib/classes/User/Interface.php
	lib/classes/appbox/register.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/deprecated/countries.php
	lib/classes/deprecated/inscript.api.php
	lib/classes/eventsmanager/event/test.php
	lib/classes/ftpclient.php
	lib/classes/http/request.php
	lib/classes/media/subdef.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/patch/320alpha4b.php
	lib/classes/patch/3715alpha1a.php
	lib/classes/patch/379alpha1a.php
	lib/classes/patch/380alpha10a.php
	lib/classes/patch/380alpha11a.php
	lib/classes/patch/380alpha13a.php
	lib/classes/patch/380alpha14a.php
	lib/classes/patch/380alpha15a.php
	lib/classes/patch/380alpha16a.php
	lib/classes/patch/380alpha17a.php
	lib/classes/patch/380alpha18a.php
	lib/classes/patch/380alpha3a.php
	lib/classes/patch/380alpha4a.php
	lib/classes/patch/380alpha6a.php
	lib/classes/patch/380alpha8a.php
	lib/classes/patch/380alpha9a.php
	lib/classes/patch/381alpha1b.php
	lib/classes/patch/381alpha2a.php
	lib/classes/patch/381alpha3a.php
	lib/classes/patch/381alpha4a.php
	lib/classes/patch/383alpha1a.php
	lib/classes/patch/383alpha2a.php
	lib/classes/patch/383alpha3a.php
	lib/classes/patch/383alpha4a.php
	lib/classes/record/adapter.php
	lib/classes/record/preview.php
	lib/classes/recordutils.php
	lib/classes/recordutils/audio.php
	lib/classes/recordutils/document.php
	lib/classes/recordutils/map.php
	lib/classes/recordutils/video.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/apiwebhooks.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
	templates/web/admin/collection/collection.html.twig
	templates/web/common/dialog_export.html.twig
	templates/web/common/menubar.html.twig
	templates/web/prod/actions/Tools/index.html.twig
	templates/web/prod/index.html.twig
	templates/web/prod/upload/upload-flash.html.twig
	templates/web/prod/upload/upload.html.twig
	templates/web/report/report_layout_child.html.twig
	templates/web/setup/step2.html.twig
	templates/web/thesaurus/new-synonym-dialog.html.twig
	templates/web/thesaurus/properties.html.twig
	templates/web/thesaurus/search.html.twig
	tests/Alchemy/Tests/Phrasea/Application/ApiAbstract.php
	tests/Alchemy/Tests/Phrasea/Cache/FactoryTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Admin/AdminCollectionTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Client/RootTest.php | 2015-02-05 18:38:49 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | d82adbf109 | Bump year to 2015 | 2015-01-20 14:08:25 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | e317f86c51 | Fix CS | 2014-03-23 23:07:01 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 8b6cb53a36 | Add token entities | 2014-03-05 15:27:43 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 92a4c35340 | Substitute random string generator by Randomlib | 2014-03-02 21:13:57 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 894c5fe620 | Fix unit tests | 2014-03-01 14:37:56 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 13e661c4b0 | Remove ManipulatorInterface::getRepository method | 2014-02-28 20:02:38 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 8f87e8b1c8 | Add user repository as a service | 2014-02-28 19:58:12 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | c98fe4c23d | Adressed Neutron's comments | 2014-02-26 12:06:34 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 862fe696cb | Remove some circular references | 2014-02-20 20:09:14 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 53ae0ccc24 | Remove User_Adapter Inteface References | 2014-02-19 17:29:25 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | c156f842c7 | Remove User_Adapter | 2014-02-19 17:28:53 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | bdc93f0220 | Remove some circular references | 2014-02-17 12:25:18 +01:00 |  | 
			
				
					| 
							
							
								 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 | 7e0a3c7338 | Use configuration property accessor | 2013-11-18 18:48:27 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 13915dc1a8 | Rename "phraseanet.configuration" service to "configuration" | 2013-11-15 22:08:07 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 9b471fdf76 | Fix CS | 2013-10-31 11:53:30 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 56ea42d2e6 | Fix #1276 : persistent cookies does not authenticate | 2013-07-10 19:44:22 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | c1347618ac | Fix #1240 : Remove authentication>auto-create>enabled parameter | 2013-07-10 14:02:29 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 70cb9ee06b | Fix #1245 : Rename trials-before-failure configuration to trials-before-display | 2013-07-10 12:53:47 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 32c2d6154a | Remove phraseanet services, update configuration | 2013-06-11 14:05:44 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 39b91e3faa | Remove unused variable | 2013-06-01 22:02:24 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 38f38290c8 | Fix CS | 2013-05-29 21:21:02 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | b1d0029c45 | Make native authentication more easily customizable | 2013-05-29 14:23:26 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 24e021d452 | Add AccountCreator to AuthenticationManagerServiceProvider | 2013-05-29 14:23:25 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | d515da0b88 | Make trials before captcha configurable | 2013-05-29 14:23:23 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | cbc3fd981f | Update authentication configuration | 2013-05-29 14:23:22 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 4dd46cd4e8 | Add attempts number configuration to failure manager | 2013-05-29 14:23:22 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 71d0d83cd8 | Address PR comments | 2013-05-29 14:23:21 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 1917082e13 | Enable authentication provider if not *disabled* | 2013-05-29 14:23:12 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | e012a02805 | Add authentication service provider | 2013-05-29 14:23:12 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 76413165ff | Update authentication to service provider | 2013-05-29 14:22:51 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | f6be5001cc | Add Auth Token Validator | 2013-05-29 14:22:50 +02:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 322e63b018 | Add AuthenticationServiceProvider | 2013-05-29 14:22:50 +02:00 |  |