hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,019 Commits 268 Branches 107 Tags
bfe5da79d29cfb647536a05d45bbc6dceca62fac
Commit Graph

44 Commits

Author SHA1 Message Date
Romain Neutron
bfe5da79d2 Merge branch '3.8' 
Conflicts:
	lib/classes/User/Adapter.php
	lib/conf.d/bases_structure.xml
 2013-12-20 09:53:09 +01:00
Romain Neutron
273612875f Merge pull request #852 from romainneutron/doctrine 
[3.9] Move Doctrine proxies
 2013-12-19 01:23:47 -08:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
792a8eff62 Move Doctrine proxies 2013-12-18 18:40:11 +01:00
Romain Neutron
1e3b3a1b60 Fix latest merges 2013-12-09 19:19:53 +01:00
Romain Neutron
04a6bb1486 Fix latest merge, add missing repository method 2013-12-04 12:48:33 +01:00
Romain Neutron
766773da01 Fix CS 2013-12-03 21:20:19 +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
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Nicolas Le Goff
af94345f6c Update User entity 2013-11-28 18:00:05 +01:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
3cec6617bf Update doctrine proxies 2013-11-20 12:34:33 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
d40b1d4fb1 Fix CS 2013-11-18 13:07:40 +01:00
Romain Neutron
fda56a74c9 Merge pull request #774 from romainneutron/basket-manipulator 
[3.9] Add basket converter
 2013-11-14 08:51:35 -08:00
Romain Neutron
a5c7695ace Fix some sql compositions 2013-11-13 17:54:17 +01:00
Romain Neutron
3548421160 Add basket converter 2013-11-13 17:52:12 +01:00
Romain Neutron
cab32f870c Merge pull request #765 from nlegoff/reset_sys_admin_right 
[3.9] Add ACL manipulator && Refactor reset sys admin rights
 2013-11-11 01:45:55 -08:00
Nicolas Le Goff
4cef82083c Add ACL Manipulator 2013-11-08 17:51:14 +01:00
Romain Neutron
675520c623 Merge pull request #739 from nlegoff/user_manip 
[3.9] User notifications are set with user manipulator
 2013-11-05 09:05:45 -08:00
Nicolas Le Goff
5c9427ae3b Add user notification throught user manipulator 2013-11-05 15:36:39 +01:00
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Nicolas Le Goff
21eec6dbbe Add ACL Service 2013-11-05 12:21:42 +01:00
Romain Neutron
f9e597658d Merge pull request #745 from romainneutron/master-CS 
[3.9] Fix CS
 2013-10-31 09:27:46 -07:00
Romain Neutron
ab3fa1f465 Add Task proxy 2013-10-31 14:25:59 +01:00
Romain Neutron
13dd86c67f Fix CS 2013-10-31 14:22:41 +01:00
Romain Neutron
9ee3e7c9f7 Move converters to model namespace 2013-10-30 13:06:14 +01:00
Romain Neutron
5d2dd07caa Fix latest rebase 2013-10-29 18:56:01 +01:00
Romain Neutron
053de5df8b Address PR comments 2013-10-29 18:46:36 +01:00
Romain Neutron
280281f872 Update task manipulator, inject notifier 2013-10-29 18:46:35 +01:00
Romain Neutron
073a07fe7b add empty collection create method 2013-10-29 18:42:47 +01:00
Romain Neutron
fafc7c334c Use Job Id instead of classname in DB 2013-10-29 18:42:46 +01:00
Romain Neutron
0827ba514c Add task manipulator 2013-10-29 18:41:43 +01:00
Romain Neutron
19d45863b9 Move doctrine logger to Phrasea namespace 2013-10-29 17:35:34 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
910850396c Move doctrine types to Phrasea namespace 2013-10-29 17:05:20 +01:00
Romain Neutron
18251456e4 Move doctrine proxies to Phrasea namespace 2013-10-29 17:00:32 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Nicolas Le Goff
b45bc31135 Adress comments 2013-10-28 15:53:00 +01:00
Nicolas Le Goff
9737a758d6 Remove user adapter interface 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
297f23dc06 Addressed romainneutron comments 2013-10-28 12:57:05 +01:00
Nicolas Le Goff
1f03451bfc Add user manager & user manipulator 2013-10-28 12:57:04 +01:00