| 
							
							
								 Benoît Burnichon | f920e8354a | Replace phraseanet.appbox by getApplicationBox() method calls. | 2015-07-02 12:33:19 +02:00 |  | 
			
				
					| 
							
							
								 Benoît Burnichon | 5f714b20ef | Proper renaming of migrations to comply with doctrine migration convention | 2015-03-26 09:57:18 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 9a3e92ed9c | Multiple ORMs for all database | 2015-02-12 17:58:45 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | ea248e0e31 | Fix Feeds Migration | 2014-03-14 11:37:12 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | e20c915775 | Avoid using getPartialReference | 2014-02-20 16:14:01 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | ba464ad497 | Fix CS | 2014-02-19 17:29:27 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 7fb44d2b43 | Fix merge | 2014-02-19 17:29:27 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | f2b2efe54c | Fix load partial references | 2014-02-19 17:29:27 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 65e6b44671 | Enhance User migration | 2014-02-19 17:29:27 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 2973513519 | Fix user migration | 2014-02-19 17:29:26 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 26bd977d5f | Delete references to usr.usr_id field in entities Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Push.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/conf.d/migrations.yml
Conflicts:
	lib/Alchemy/Phrasea/ACL/BasketACL.php
	lib/Alchemy/Phrasea/Authentication/Authenticator.php
	lib/Alchemy/Phrasea/Controller/Prod/Order.php
	lib/Alchemy/Phrasea/Controller/Prod/UsrLists.php
	lib/Alchemy/Phrasea/Controller/Root/RSSFeeds.php
	lib/Alchemy/Phrasea/Controller/Root/Session.php
	lib/Alchemy/Phrasea/Model/Entities/Basket.php
	lib/Alchemy/Phrasea/Model/Entities/BasketElement.php
	lib/Alchemy/Phrasea/Model/Entities/Feed.php
	lib/Alchemy/Phrasea/Model/Entities/FeedEntry.php
	lib/Alchemy/Phrasea/Model/Entities/FtpExport.php
	lib/Alchemy/Phrasea/Model/Entities/Session.php
	lib/Alchemy/Phrasea/Model/Entities/StoryWZ.php
	lib/Alchemy/Phrasea/Model/Entities/UsrList.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListEntry.php
	lib/Alchemy/Phrasea/Model/Entities/UsrListOwner.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationParticipant.php
	lib/Alchemy/Phrasea/Model/Entities/ValidationSession.php
	lib/Alchemy/Phrasea/Model/Repositories/StoryWZRepository.php
	lib/classes/API/V1/adapter.php
	templates/mobile/lightbox/sc_note.html.twig
	templates/web/admin/connected-users.html.twig
	templates/web/admin/publications/fiche.html.twig
	templates/web/lightbox/IE6/agreement_box.html.twig
	templates/web/lightbox/agreement_box.html.twig
	templates/web/lightbox/basket_content_report.html.twig
	templates/web/lightbox/sc_note.html.twig
	templates/web/prod/WorkZone/Browser/Basket.html.twig
	templates/web/prod/WorkZone/Browser/Results.html.twig
	templates/web/prod/WorkZone/Macros.html.twig
	templates/web/prod/actions/Feedback/List-Share.html.twig
	templates/web/prod/actions/Feedback/ListsMacros.html.twig
	templates/web/prod/orders/order_box.html.twig
	templates/web/prod/orders/order_item.html.twig
	templates/web/prod/upload/lazaret.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Root/SessionTest.php | 2014-02-19 17:29:25 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 354232f61a | Bump copyright year | 2014-01-06 15:40:56 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 6ab51d55f8 | Add missing headers | 2013-11-20 19:03:55 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 5b955b2a22 | Fix neutron's comments | 2013-11-18 16:22:28 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 98fee5038b | Use short array syntax | 2013-11-18 14:40:20 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | d8ea06b521 | Fix migration | 2013-11-18 14:36:45 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 6d2530295c | Patch CS consistency | 2013-11-18 14:35:39 +01:00 |  | 
			
				
					| 
							
							
								 Nicolas Le Goff | 99d4895f57 | Add DoctrineMigration Patch | 2013-11-18 14:35:38 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 56b373ee6e | Use short array declaration | 2013-11-18 13:57:33 +01:00 |  | 
			
				
					| 
							
							
								 Romain Neutron | 2072f9e0e0 | Merge branch '3.8' Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php | 2013-11-08 19:04:26 +01:00 |  |