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,425 Commits 268 Branches 107 Tags
2ec4ffdbcc6e9f7708082f80133db05695de8938
Commit Graph

2460 Commits

Author SHA1 Message Date
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
b32e4c6158 Rename RegistrationManager to RegistrationManipulator 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
a2fe4f2cfc Merge pull request #976 from nlegoff/fix-live-info 
[3.9] Fix task live informations
 2014-02-26 02:11:20 +01:00
Nicolas Le Goff
3348347072 Fix task live informations 2014-02-25 18:53:17 +01:00
Romain Neutron
3e1e115292 Merge pull request #973 from nlegoff/fix-tests-debian 
[3.9] Fix tests using GPAC on debian system
 2014-02-25 18:24:28 +01:00
Romain Neutron
d27792a942 Merge pull request #972 from nlegoff/upgrade-fix 
[3.9] Fix table detection
 2014-02-25 16:35:03 +01:00
Nicolas Le Goff
2028871f34 Fix Cs 2014-02-25 16:33:43 +01:00
Nicolas Le Goff
4a242a120e Fix tests using GPAC on debian system 2014-02-25 16:02:32 +01:00
Nicolas Le Goff
c100f0bfe4 Fix table detection 2014-02-25 15:38:01 +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
a6bfcd95f4 Fix host configuration 2014-02-22 15:34:19 +01:00
Romain Neutron
de13d874a3 Fix configuration usage 2014-02-22 10:39:07 +01:00
Romain Neutron
501b313b25 Bump to version 3.9.0-alpha.12 2014-02-21 16:41:11 +01:00
Romain Neutron
fb693836d5 Add enable/disable plugins commands 2014-02-21 16:41:11 +01:00
Romain Neutron
53cb47d0b7 Update bin/console to bin/setup 2014-02-21 16:37:54 +01:00
Romain Neutron
df56eb4da7 Force plugin configuration in configuration 2014-02-21 16:37:53 +01:00
Romain Neutron
c4efe6d548 Add host configuration 2014-02-21 14:36:38 +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
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
5f355218a8 Login is not longer modified when user is deleted 2014-02-20 15:06:25 +01:00
Nicolas Le Goff
058a4f1c3e Use manipulator.user to delete users 2014-02-20 15:06:25 +01:00
Romain Neutron
25073721c8 Fix unit tests 2014-02-20 13:08:56 +01:00
Romain Neutron
4153fa900a Move FTP setting upgrade to Users upgrade 2014-02-20 11:17:41 +01:00
Nicolas Le Goff
0cb75cdf95 Update upgrade 39 2014-02-19 20:31:42 +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
ffc0efdb57 Fix doctrine migrations 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
bd110bb8e7 Fix rebase master 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
7ac2358edd Fix latest master rebase 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
ab9362dd60 Fix neutron comment's 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
5635553f71 Fix neutron's comments 2014-02-19 17:29:26 +01:00