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

47 Commits

Author SHA1 Message Date
Nicolas Le Goff
75fac19e73 Migrate demand table to doctrine entity && refactor registration API 2014-02-26 12:06:34 +01:00
Nicolas Le Goff
ed4ae71819 Fix test suite 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
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
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
56b373ee6e Use short array declaration 2013-11-18 13:57:33 +01:00
Romain Neutron
dbd06e9091 Remove dead code 2013-09-04 12:14:50 +02:00
Romain Neutron
11a55bbd43 Add labels to databoxes 2013-06-13 09:45:43 +02:00
Romain Neutron
c084f20f85 Labelize collections 2013-06-01 01:29:07 +02:00
Romain Neutron
4414892b91 Fix CS lib/classes 2013-01-29 16:39:02 +01:00
Romain Neutron
842ad40985 Bump copyright year 2013-01-21 23:28:58 +01:00
Romain Neutron
527b68e0f5 Merge with 3.7 2012-11-07 16:16:13 +01:00
Romain Neutron
da6f7a00c0 Fix simplexml calls 2012-11-06 15:06:11 +01:00
Romain Neutron
49dcfeba9f Cleanup 2012-10-30 11:39:58 +01:00
Romain Neutron
f0fed8bb7e Merge with 3.7 2012-10-30 11:27:50 +01:00
Romain Neutron
b8ae0eece5 Fix #971 : Removing a story must remove its presence in all workzones 2012-10-29 14:19:34 +01:00
Romain Neutron
0565bce475 Remove user variable assignment 2012-10-04 15:44:49 +02:00
Romain Neutron
1700565862 Cleanup namepaces, variables uses 2012-10-04 15:44:49 +02:00
Romain Neutron
6f30b71f8e Update deprecated classes 2012-10-04 15:43:12 +02:00
Romain Neutron
e28184167e Fix CS 2012-06-19 10:40:14 +02:00
Romain Neutron
4afa21d419 Fix CS 2012-05-23 00:01:29 +02:00
Romain Neutron
7d9eb63246 Remove unused package annotation 2012-04-26 02:09:59 +02:00
Romain Neutron
70519a471a Update copyright year 2012-04-26 02:06:29 +02:00
Romain Neutron
33b10d6746 Add curly braces 2012-04-26 01:55:12 +02:00
Romain Neutron
ade22295ad Fix CS 2012-04-26 00:55:53 +02:00
Romain Neutron
da054b4275 Merge with master 2012-03-12 17:06:57 +01:00
Romain Neutron
c034c0fcf1 Remove unused getargs file 2012-03-12 16:55:50 +01:00
Romain Neutron
d79c13f8c2 Refactor random::TYPE_* Constants 2012-03-09 15:12:23 +01:00
Romain Neutron
a574dd14a8 Refactor Appbox 2012-02-21 16:07:34 +01:00
Romain Neutron
8479d59e9d Fix wrong coll name 2012-02-16 16:29:02 +01:00
Romain Neutron
9ad8af5d22 Fix removing document visual alert 2012-02-09 16:04:09 +01:00
Romain Neutron
b3b53372c0 Push cleanup 2012-02-02 15:25:22 +01:00
Romain Neutron
06b8df26b1 Fix coding standards 2012-01-26 12:32:37 +01:00
Romain Neutron
c1bfe45931 Proper record removal 2012-01-18 19:53:14 +01:00
Romain Neutron
af860e2fa6 Merge with master 2012-01-16 20:19:20 +01:00
Romain Neutron
1cdaa8d726 Fix Bug in push search : only last search parameters is taken 2012-01-13 12:41:05 +01:00
Romain Neutron
a709129824 Merge with master 2012-01-05 14:56:13 +01:00
Romain Neutron
49ca2cbdd9 Fix #160 : push username filter 2012-01-05 12:39:12 +01:00
Romain Neutron
9a10f70859 Fix #159 : push search filters 2012-01-05 12:37:26 +01:00
Romain Neutron
32a7b2bfe8 Fix basket_adapter 2011-12-27 20:36:42 +01:00
Romain Neutron
5b0f93de05 Basket refactor 2011-12-27 19:16:55 +01:00
Romain Neutron
1617d3e561 Fix events loader 2011-12-27 15:46:23 +01:00
Romain Neutron
9d965538b4 Refactor basket_adapter 2011-12-27 14:07:09 +01:00
Romain Neutron
4c5b7eb658 V 3.5 RC 1 2011-12-05 00:23:28 +01:00