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

198 Commits

Author SHA1 Message Date
Benoît Burnichon
bc9646bc17 Update travis conf. Do not keep elasticsearch local package 2015-03-13 10:30:45 +01:00
Nicolas Le Goff
ae7b830187 Update travis 2015-03-12 17:25:53 +01:00
Benoît Burnichon
e51466fc46 Properly use yaml string with breaklines 2015-03-12 15:08:24 +01:00
Benoît Burnichon
345dfbdc2c Add proper elasticsearch configuration in .travis.yml 2015-03-11 16:49:06 +01:00
Benoît Burnichon
118bb2f03c Some fixup for ES instance 2015-03-11 15:22:20 +01:00
Nicolas Le Goff
5a55732b46 Fix strict mode sql issue 2015-03-06 12:35:18 +01:00
Nicolas Le Goff
9a3e92ed9c Multiple ORMs for all database 2015-02-12 17:58:45 +01:00
Nicolas Le Goff
d249b5a898 Fix travis.yml 2015-02-09 12:47:56 +01:00
Nicolas Le Goff
086669a39e Fix latest merge 2014-12-12 15:16:49 +01:00
Nicolas Le Goff
28eecf6a09 Merge branch '3.8' 
Conflicts:
	.gitignore
	bin/console
	composer.json
	composer.lock
	hudson/fixtures.sql
	lib/Alchemy/Phrasea/Command/Developer/IniReset.php
	lib/Alchemy/Phrasea/Command/Setup/Install.php
	lib/Alchemy/Phrasea/Controller/Api/Oauth2.php
	lib/Alchemy/Phrasea/Controller/Api/V1.php
	lib/Alchemy/Phrasea/Controller/Prod/Export.php
	lib/Alchemy/Phrasea/Controller/Root/Login.php
	lib/Alchemy/Phrasea/Core/Provider/PhraseanetServiceProvider.php
	lib/Alchemy/Phrasea/Core/Version.php
	lib/Alchemy/Phrasea/Helper/DatabaseHelper.php
	lib/Alchemy/Phrasea/Helper/Prod.php
	lib/classes/API/OAuth2/Application.php
	lib/classes/API/V1/Interface.php
	lib/classes/API/V1/adapter.php
	lib/classes/Setup/Upgrade.php
	lib/classes/media/subdef.php
	lib/classes/task/period/RecordMover.php
	templates/web/prod/index.html.twig
	templates/web/setup/step2.html.twig
	tests/Alchemy/Tests/Phrasea/Controller/Admin/RootTest.php
	tests/Alchemy/Tests/Phrasea/Controller/Root/LoginTest.php
	tests/classes/api/v1/api_v1_adapterTest.php
	tests/db-ref.sqlite
	vagrant/vms/phraseanet-php54-nginx/puphpet/config.yaml
	vagrant/vms/phraseanet-php54-nginx/puphpet/files/exec-once/setup
 2014-10-09 19:40:33 +02:00
Nicolas Le Goff
3ce9c6330c Merge pull request #1158 from nlegoff/3.8-improvements 
[3.8.6] Some improvements
 2014-09-10 21:33:30 +02:00
Nicolas Le Goff
01c178f538 Update travis.yml 2014-09-10 19:14:48 +02:00
Nicolas Le Goff
3b2fe8eafa Update .travis.yml 2014-09-10 11:30:42 +02:00
Nicolas Le Goff
2e6c11a9ed Update travis 2014-09-08 22:23:00 +02:00
Nicolas Le Goff
de7988689e Update directory structure & allow to configure paths (tmp, log, cache) 2014-09-05 15:57:00 +02:00
Nicolas Le Goff
a4ecb3d6aa Remove sphinx search engine tests 2014-09-02 18:18:26 +02:00
Nicolas Le Goff
bd52dae1db Update travis.yml 2014-08-20 11:03:37 +02:00
Nicolas Le Goff
46da7be65d Merge branch '3.8' 
Conflicts:
	.travis.yml
	bin/developer
	build-env.sh
	lib/Alchemy/Phrasea/Application.php
	lib/Alchemy/Phrasea/Core/Provider/LocaleServiceProvider.php
	tests/Alchemy/Tests/Phrasea/Command/Setup/XSendFileMappingGeneratorTest.php
	tests/Alchemy/Tests/Phrasea/Controller/SetupTest.php
	tests/Alchemy/Tests/Phrasea/Form/Login/PhraseaRegisterFormTest.php
 2014-08-19 15:30:25 +02:00
Nicolas Le Goff
9e2083dfe4 Add init command 2014-08-13 18:21:57 +02:00
Nicolas Le Goff
4fa1f613e4 Fix latest merge 2014-08-13 17:40:40 +02:00
Nicolas Le Goff
aa8a23efaf update travis.yml 2014-08-04 16:20:28 +02:00
Nicolas Le Goff
d29999ed6b update travis.yml 2014-07-30 19:52:39 +02:00
Nicolas Le Goff
b4bb33e037 remove zmq extension installation 2014-07-30 18:25:37 +02:00
Nicolas Le Goff
24b885eb7c Fix tests 2014-07-03 15:07:35 +02:00
Nicolas Le Goff
1f17c086ac Update travis.yml 2014-06-30 12:17:26 +02:00
Nicolas Le Goff
5e2dd0216a Fix latest merge 2014-06-24 14:56:09 +02: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
c623662513 JS_COMPILER is not related to the Travis build but to the build itself 2014-02-20 13:13:43 +01:00
Nicolas Le Goff
0cb75cdf95 Update upgrade 39 2014-02-19 20:31:42 +01:00
Romain Neutron
e574a1c988 Merge branch '3.8' 2014-02-18 19:49:16 +01:00
Romain Neutron
53fff797a4 Add travis build on PHP 5.6 2014-02-17 15:54:08 +01:00
Romain Neutron
3e3a1765fa Use npm packages for build 2014-02-13 19:29:35 +01:00
Nicolas Le Goff
27f1312ef1 Add autobahn as project dependency 2014-02-06 13:08:55 +01:00
Romain Neutron
97d96a6b32 Add elastic-search engine support 2014-01-27 20:12:13 +01:00
Nicolas Le Goff
383ff77449 Merge branch '3.8' 
Conflicts:
	.travis.yml
	lib/Alchemy/Phrasea/Controller/Permalink.php
	lib/classes/API/OAuth2/Adapter.php
	lib/classes/databox.php
 2014-01-27 17:23:03 +01:00
Romain Neutron
12f0b4666b Add travis_retry command use 2014-01-27 13:49:21 +01:00
Romain Neutron
a5d815b667 Merge branch '3.8' 2014-01-06 16:06:38 +01:00
Romain Neutron
3b437c83c4 Fix redis install on travis build 2014-01-06 16:03:53 +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
52200f17fa Fix redis install on travis 2014-01-06 15:17:57 +01:00
Romain Neutron
2faa881d63 Merge pull request #858 from romainneutron/travis 
[3.9] Remove few lines in travis
 2013-12-20 16:38:18 -08:00
Romain Neutron
d147d4e39d Merge branch '3.8' 2013-12-20 16:46:35 +01:00
Romain Neutron
f8a567cd6c Remove few lines in travis 2013-12-20 16:44:57 +01:00
Romain Neutron
d69d9de402 Update Travis 2013-12-20 10:43:57 +01:00
Romain Neutron
89dc1c5129 Add fixtures to sqlite db 2013-12-18 23:34:06 +01:00
Romain Neutron
b98c321c0c Add memcached to travis services 2013-11-21 07:37:53 +01:00
Romain Neutron
058d47c967 Add memcached to travis services 2013-11-20 20:00:52 +01:00
Romain Neutron
2898b317c4 Drop PHP 5.3 support 2013-11-18 13:08:30 +01:00
Romain Neutron
6de169658f Switch back to bower as it is now stable 2013-11-04 19:22:43 +01:00