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

209 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
Romain Neutron
5a5da77662 Use Doctrine DBAL instead of custom connection 2014-02-22 23:55:12 +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
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
Romain Neutron
2af21c064c Avoid errors by explicitely namespacing root exception 2014-02-20 11:28:31 +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
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
ed4ae71819 Fix test suite 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
678f741660 Use Short Array notation 2014-02-19 17:28:54 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Romain Neutron
3945be00d4 Fix CS 2014-01-30 19:56:05 +01:00
Romain Neutron
e840df0b36 Decouple caption and its serialization 2014-01-27 20:12:13 +01:00
Romain Neutron
91cf9705ab Add subdef substituer 2014-01-14 15:05:44 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
d7b4e61c10 Make search engine a real service 2014-01-07 16:45:58 +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
0858586ceb Add subdef generator service 2013-12-26 17:00:16 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
e9e9d149a1 Locale simplification 2013-12-03 20:05:20 +01:00
Romain Neutron
2ba164701d Use symfony translator 2013-12-03 20:02:40 +01:00
Romain Neutron
051d9f4035 Remove license comments 2013-11-20 16:49:29 +01:00
Romain Neutron
7e0a3c7338 Use configuration property accessor 2013-11-18 18:48:27 +01:00
Romain Neutron
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
13915dc1a8 Rename "phraseanet.configuration" service to "configuration" 2013-11-15 22:08:07 +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
Nicolas Le Goff
1fdf30c6af Use ACL service provider to get user's ACL 2013-11-05 12:21:42 +01:00
Romain Neutron
9b471fdf76 Fix CS 2013-10-31 11:53:30 +01:00
Romain Neutron
58c402ac2b Update unit tests and legacy 2013-10-29 18:46:34 +01:00
Romain Neutron
08ce909730 Move doctrine repositories to Phrasea namespace 2013-10-29 17:30:11 +01:00
Romain Neutron
baecfdceb3 Move entities to Phrasea namespace 2013-10-29 16:56:49 +01:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
8dfe16c2bd Fix realtime search engine indexation 2013-09-17 16:02:43 +02:00
Andrey
289c0294b2 Rebased, fixed minor bugs 2013-09-05 13:44:04 +02:00
Andrey
84300f3c92 Replaced remaining occurrences of Feed_ classes, updated tests 2013-09-05 13:44:04 +02:00
Romain Neutron
4c90f168a7 Remove unused use statements 2013-09-04 14:25:01 +02:00
Romain Neutron
7c9fbd48e1 Remove tests in loops 2013-09-04 14:20:35 +02:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Nicolas Le Goff
6a2fb618d3 Move substituion logger from class method to controllers 2013-09-02 12:12:36 +02:00
Andrey
4dd60362c5 More fixes for the PR 2013-08-27 11:58:49 +02:00
Andrey
9b85b105d8 Fixed PR comments 2013-08-27 11:58:48 +02:00
Nicolas Le Goff
47bb3331dd Move substituion logger from class method to controllers 2013-08-08 16:25:15 +02:00
Romain Neutron
f51f392bc6 Fix #1351 : Substitution files are considered valid for download 2013-07-17 19:53:33 +02:00
Romain Neutron
ce34bca408 Add second logging channel 2013-07-01 14:38:17 +02:00