hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-10 19:43:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,049 Commits 268 Branches 107 Tags
e233e5afa6716e060457869b284ea4bea9e72fe2
Commit Graph

56 Commits

Author SHA1 Message Date
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
6c45e8d40a Add improvements to unit tests 2013-12-20 10:51:35 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
1af21b88ef Fix CS 2013-12-03 20:59:47 +01:00
Romain Neutron
680643c0fc Fix unit tests and arrays declaration 2013-12-03 20:06:49 +01:00
Romain Neutron
199134c25a Add cached translation loader 2013-12-03 20:05:21 +01:00
Romain Neutron
a634fb1fb9 Fix translation dumper 2013-12-03 20:05:20 +01:00
Romain Neutron
458aac8dd8 Add JMS translation tools 2013-12-03 20:05:20 +01:00
Romain Neutron
6ab51d55f8 Add missing headers 2013-11-20 19:03:55 +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
2072f9e0e0 Merge branch '3.8' 
Conflicts:
	composer.lock
	lib/Alchemy/Phrasea/Core/Version.php
 2013-11-08 19:04:26 +01:00
Romain Neutron
95b0c24d4b Use semver for Phraseanet version numbers 2013-11-07 17:49:39 +01:00
Romain Neutron
6345fcc83a Add uninstaller for development purposes 2013-10-07 10:08:11 +02:00
Romain Neutron
0a950b0ae6 Add uninstaller for development purposes 2013-10-04 17:29:13 +02:00
Romain Neutron
15e7b3aa1a Bower installer simplification 2013-09-30 14:32:26 +02:00
Romain Neutron
48680fd3c3 Merge branch '3.8' 
Conflicts:
	CHANGELOG.md
	lib/Alchemy/Phrasea/Command/Developer/ComposerInstall.php
	lib/Alchemy/Phrasea/Core/Version.php
	templates/web/setup/wrapper.html.twig
 2013-09-26 12:51:21 +02:00
Romain Neutron
d7076cd441 Allow failure on composer self-update 2013-09-25 11:49:25 +02:00
Romain Neutron
45c5276923 Merge branch '3.8' 2013-09-18 12:09:20 +02:00
Romain Neutron
91dd9ce321 Disable composer interactivity 2013-09-17 16:22:01 +02:00
Romain Neutron
b6a8a90197 Fix CS 2013-09-04 12:14:52 +02:00
Romain Neutron
8b49c6127b Fix Sqlite db regeneration in case of deleted db 2013-08-30 16:38:39 +02:00
Romain Neutron
447cb60327 Fix CS 2013-08-30 13:48:13 +02:00
Nicolas Le Goff
6a8312ca64 Add FtpCredentials entity 2013-08-23 12:09:50 +02:00
Nicolas Le Goff
4b02c44e80 Add missing doc blocks 2013-08-20 15:10:56 +02:00
Nicolas Le Goff
282a474a5e Fix timeout issue 2013-08-19 17:25:46 +02:00
Nicolas Le Goff
dd49b7173c Fix CS 2013-08-19 15:23:25 +02:00
Nicolas Le Goff
ea2d99e8a5 Rename build-asset task to install-asset & add less compilation after bower install 2013-08-19 14:46:16 +02:00
Nicolas Le Goff
e51e5094d8 Rename prefer-dist option to clear-cache 2013-08-19 14:36:06 +02:00
Nicolas Le Goff
fa1174d6e3 Update bower install command 2013-08-19 14:36:05 +02:00
Nicolas Le Goff
ba6e060b44 Remove javascript builder command 2013-08-19 14:35:56 +02:00
Romain Neutron
c093d7d954 Merge pull request #565 from nlegoff/local_npm 
[3.9] Make required npm package available locally
 2013-08-09 08:32:05 -07:00
Nicolas Le Goff
f6e9e227f8 Install npm package locally 2013-08-08 18:23:23 +02:00
Romain Neutron
88f5bfda60 Fix sqlite regenration command 2013-08-08 16:00:36 +02:00
Romain Neutron
899549d45a Fix #1242 : Commands description check, move generate:template command to developer console 2013-07-17 20:14:23 +02:00
Romain Neutron
e8e8dcf7fe Fix typo 2013-07-17 17:32:02 +02:00
Romain Neutron
eb17f5aa87 Fix CS 2013-07-16 19:39:02 +02:00
Romain Neutron
303aadad57 Make developer commands runnable without install 2013-07-16 19:36:18 +02:00
Romain Neutron
056ac28120 Refactor command line utilities 2013-07-16 16:01:17 +02:00
Nicolas Le Goff
577aed3ed8 Add more tests 2013-07-12 20:09:51 +02:00
Nicolas Le Goff
c83f146a20 Simplify builder service 2013-07-12 20:06:32 +02:00
Nicolas Le Goff
648ed30bb9 Make builder service stateless 2013-07-12 20:06:32 +02:00
Nicolas Le Goff
c163f6c4ce Implement bootstrap variable homepage customization through plugin system 2013-07-12 20:06:32 +02:00
Nicolas Le Goff
cb3389ace9 Add recess less compiler 
use recess less compiler
 2013-07-12 20:06:32 +02:00
Nicolas Le Goff
b57732c03e Move javascript builder & less compile command to developer binary 2013-07-12 20:06:32 +02:00
Nicolas Le Goff
5146185517 Add behat help 2013-06-11 20:12:34 +02:00