hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,382 Commits 268 Branches 107 Tags
df56eb4da7f5480c4e35b10c7528973a362dafa3
Commit Graph

481 Commits

Author SHA1 Message Date
Romain Neutron
df56eb4da7 Force plugin configuration in configuration 2014-02-21 16:37:53 +01:00
Nicolas Le Goff
0cb75cdf95 Update upgrade 39 2014-02-19 20:31:42 +01:00
Nicolas Le Goff
eaa1feb765 Address PR comments 2014-02-19 17:29:27 +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
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
53ae0ccc24 Remove User_Adapter Inteface References 2014-02-19 17:29:25 +01:00
Nicolas Le Goff
c156f842c7 Remove User_Adapter 2014-02-19 17:28:53 +01:00
Nicolas Le Goff
2aba3e8d8d Merge pull request #957 from romainneutron/doctrine-namespace 
[3.9] Add a namespace to Phraseanet doctrine entities
 2014-02-19 11:37:09 +01:00
Romain Neutron
2de870c3f9 Add a namespace to Phraseanet doctrine entities 2014-02-18 19:32:08 +01:00
Nicolas Le Goff
f2e0b74998 Merge pull request #954 from romainneutron/task-manager 
[3.9] Updates to task manager
 2014-02-17 16:20:05 +01:00
Romain Neutron
adaaf5b58a Use valid logger service 2014-02-17 12:30:04 +01:00
Romain Neutron
bdc93f0220 Remove some circular references 2014-02-17 12:25:18 +01:00
Romain Neutron
ffab51235a Address PR comments 2014-02-15 12:05:05 +01:00
Romain Neutron
c0b152d73a Add authorization strategy for WAMP topics 2014-02-15 11:38:51 +01:00
Romain Neutron
8385493ae1 Bump to version 3.9.0-alpha.11 2014-02-15 11:38:51 +01:00
Romain Neutron
0fe18a2494 Add Websocket server 2014-02-15 11:38:51 +01:00
Romain Neutron
f181135cde Add task manager broadcaster subscriber 2014-02-15 11:38:51 +01:00
Romain Neutron
787e86aacf Fix latest merge 2014-02-14 11:59:15 +01:00
Romain Neutron
903f63cd32 Merge branch '3.8' 2014-02-14 11:43:55 +01:00
Romain Neutron
9aa4e7abd8 Fix #1680 : Add support for custom extension to mime-type mapping 2014-02-13 16:22:41 +01:00
Romain Neutron
b819de9a54 Rename xliff files to xlf 2014-02-12 19:58:51 +01:00
Nicolas Le Goff
bd1e4516bd Merge branch '3.8' 
Conflicts:
	config/configuration.sample.yml
	lib/Alchemy/Phrasea/Core/Version.php
	lib/classes/module/console/schedulerStart.php
	lib/classes/module/console/taskrun.php
	lib/conf.d/configuration.yml
	templates/mobile/common/index.html.twig
 2014-02-03 19:02:22 +01:00
Nicolas Le Goff
372b70bc8f Merge pull request #907 from romainneutron/logs-configuration 
[3.8] Logs configuration
 2014-02-03 09:20:27 -08:00
Romain Neutron
7e7350a0a7 Bump to version 3.8.3-alpha.5 2014-01-31 15:09:05 +01:00
Nicolas Le Goff
30078730ab Merge branch '3.8' 
Conflicts:
	bin/console
	composer.lock
 2014-01-31 14:59:53 +01:00
Romain Neutron
3945be00d4 Fix CS 2014-01-30 19:56:05 +01:00
Romain Neutron
6b81b2b39e Add plugin:list command 2014-01-29 18:17:34 +01:00
Romain Neutron
97d96a6b32 Add elastic-search engine support 2014-01-27 20:12:13 +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
Nicolas Le Goff
e91993bfd7 Bump 3.8.3alpha.4 version 2014-01-14 13:02:25 +01:00
Romain Neutron
2da822f65d Fix copyright year 2014-01-14 12:05:34 +01:00
Romain Neutron
d7f7e1c92c Fix CS 2014-01-14 12:04:38 +01:00
Romain Neutron
d5f93e52fb Session management is now part of Phraseanet configuration 2014-01-13 17:44:47 +01:00
Romain Neutron
354232f61a Bump copyright year 2014-01-06 15:40:56 +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
Nicolas Le Goff
302b1c775c Merge pull request #860 from romainneutron/subdef-service 
[3.9] Add subdef generator service
 2013-12-26 08:02:05 -08:00
Romain Neutron
0858586ceb Add subdef generator service 2013-12-26 17:00:16 +01:00
Nicolas Le Goff
f95254c773 Merge branch '3.8' 2013-12-26 16:40:48 +01:00
Romain Neutron
1910da4e97 Fix #1640 : Only add search engine subscriber when the app is setup 2013-12-23 11:23:01 +01:00
Romain Neutron
64456a8964 Remove phraseanet registry 2013-12-20 16:44:22 +01:00
Romain Neutron
c3df531f59 Move main "languages" and "servername" to top level, "task-manager" and "binaries" to main configuration 2013-12-20 11:43:41 +01:00
Romain Neutron
792a8eff62 Move Doctrine proxies 2013-12-18 18:40:11 +01:00
Nicolas Le Goff
2662ead699 Fix #1607 Reoder collections is not working 
Conflicts:
	lib/classes/collection.php
 2013-12-16 13:27:19 +01:00
Nicolas Le Goff
d58d74d5fc Fix #1613 Can not launch lightbox 2013-12-06 17:53:23 +01:00
Romain Neutron
1ba41c4421 Fix latest merge 2013-12-04 08:20:58 +01:00