hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-09 19:13:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,452 Commits 268 Branches 107 Tags
2df0f9d659d10064c20239b33280a059bee33cc6
Commit Graph

1992 Commits

Author SHA1 Message Date
Romain Neutron
2df0f9d659 Merge branch '3.8' 2014-02-28 00:28:06 +01:00
Romain Neutron
9a2875f46b Fix registration table name 2014-02-27 16:57:31 +01:00
Romain Neutron
c3ec4ab857 Merge pull request #900 from nlegoff/replace_demand 
[3.9] Migrate registration table to doctrine entity && refactor registration API
 2014-02-27 16:08:17 +01:00
Romain Neutron
5856992262 Remove disk IO on media_subdef::get_size 2014-02-27 15:53:44 +01:00
Nicolas Le Goff
ed24b3e6d8 Merge pull request #978 from romainneutron/fix-patches 
[3.9] Fix patches inheritance
 2014-02-26 13:11:56 +01:00
Nicolas Le Goff
03b05783bd Merge pull request #970 from romainneutron/host-configuration-access-restriction 
[3.9] Add access restriction based on host configuration
 2014-02-26 13:11:38 +01:00
Romain Neutron
a0fc4b2360 Fix CS 2014-02-26 12:44:32 +01:00
Nicolas Le Goff
2ec4ffdbcc Refactor && Typo && Use plain objects as function parameters instead of ids 2014-02-26 12:10:54 +01:00
Nicolas Le Goff
c98fe4c23d Adressed Neutron's comments 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
4946e35516 Fix tests, CS && typo 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
52f3baac05 Fix neutron's comment 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Romain Neutron
bff2d22932 Fix patchs inheritance 2014-02-26 10:37:26 +01:00
Romain Neutron
878c96f6d4 Add access restriction 2014-02-25 19:00:53 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Romain Neutron
5e8e8f59d5 Use Zippy to zip 2014-02-24 16:25:59 +01:00
Nicolas Le Goff
4535491e6c Merge pull request #965 from romainneutron/host-configuration 
[3.9] Add configuration per host
 2014-02-24 12:30:26 +01:00
Nicolas Le Goff
06b633a615 Merge pull request #968 from romainneutron/doctrine-connection 
[3.9] Use Doctrine DBAL as connection
 2014-02-24 12:15:03 +01:00
Nicolas Le Goff
58c9e8733d Merge pull request #966 from romainneutron/plugin-disable 
[3.9] Add commands to enable/disable plugins
 2014-02-24 11:41:08 +01:00
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
df56eb4da7 Force plugin configuration in configuration 2014-02-21 16:37:53 +01:00
Romain Neutron
862fe696cb Remove some circular references 2014-02-20 20:09:14 +01:00
Romain Neutron
4c29ea5a7a Merge branch 'replace_users' of https://github.com/nlegoff/Phraseanet into nlegoff-replace_users 
Conflicts:
	lib/classes/ACL.php
	lib/classes/User/Adapter.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/report/add.php
	lib/classes/module/report/edit.php
	lib/classes/module/report/push.php
	lib/classes/module/report/sent.php
	lib/classes/module/report/validate.php
	lib/classes/record/preview.php
 2014-02-20 18:02:27 +01:00
Romain Neutron
e20c915775 Avoid using getPartialReference 2014-02-20 16:14:01 +01:00
Romain Neutron
7ef147c975 Address comments 2014-02-20 16:09:18 +01:00
Romain Neutron
134717343a Fix latest merge 2014-02-20 16:06:51 +01:00
Romain Neutron
12f9575a8b Merge branch '3.8' 
Conflicts:
	lib/Alchemy/Phrasea/Controller/Prod/Lazaret.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/API/V1/adapter.php
	lib/classes/Feed/Adapter.php
	lib/classes/Feed/Collection.php
	lib/classes/Feed/Entry/Adapter.php
	lib/classes/Feed/Entry/Item.php
	lib/classes/Feed/Publisher/Adapter.php
	lib/classes/User/Adapter.php
	lib/classes/base.php
	lib/classes/connection.php
	lib/classes/databox/cgu.php
	lib/classes/eventsmanager/notify/autoregister.php
	lib/classes/eventsmanager/notify/bridgeuploadfail.php
	lib/classes/eventsmanager/notify/order.php
	lib/classes/eventsmanager/notify/orderdeliver.php
	lib/classes/eventsmanager/notify/ordernotdelivered.php
	lib/classes/eventsmanager/notify/push.php
	lib/classes/eventsmanager/notify/register.php
	lib/classes/eventsmanager/notify/validate.php
	lib/classes/eventsmanager/notify/validationdone.php
	lib/classes/eventsmanager/notify/validationreminder.php
	lib/classes/module/console/taskState.php
	lib/classes/module/console/taskrun.php
	lib/classes/record/adapter.php
	lib/classes/registry.php
	lib/classes/set/order.php
	lib/classes/task/abstract.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/ftp.php
	lib/classes/task/period/ftpPull.php
	templates/web/prod/upload/lazaret.html.twig
 2014-02-20 16:05:23 +01:00
Nicolas Le Goff
ace5efce78 Fix CS 2014-02-20 15:31:13 +01:00
Romain Neutron
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Romain Neutron
2af21c064c Avoid errors by explicitely namespacing root exception 2014-02-20 11:28:31 +01:00
Romain Neutron
4153fa900a Move FTP setting upgrade to Users upgrade 2014-02-20 11:17:41 +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
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +01:00
Nicolas Le Goff
efd69c6de8 CS fixer 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
7c0d1e3d8d Fix user migration 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
2973513519 Fix user migration 2014-02-19 17:29:26 +01:00
Andrey
ada3ec96c3 Add Doctrine schema pre-upgrades 
Conflicts:
	lib/classes/appbox.php
 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
c10c78f740 Fix unit tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
3b0fe2eb75 Fix CS 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
b341495c88 Fix tests 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
4cc82af980 Fix settings 2014-02-19 17:29:26 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
41645e00dc Convert to User entity for usr.lastModel field 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
7b9106d298 Update patches 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
9bf5a29b44 Delete User_Adapter 2014-02-19 17:29:25 +01:00