hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
10,305 Commits 268 Branches 107 Tags
696d7401d4a48cf616981893ca3c3fcd207fcd9c
Commit Graph

167 Commits

Author SHA1 Message Date
Benoît Burnichon
696d7401d4 Remove JS tests 2015-12-02 17:35:42 +01:00
Benoît Burnichon
abbb4b0120 Remove Grunt and install-assets steps 2015-12-02 17:35:42 +01:00
Benoît Burnichon
966efde17a Test with higher version of nodejs 2015-12-02 17:35:42 +01:00
Benoît Burnichon
38a3531306 Update travis environment and bump composer.lock 2015-11-30 15:58:47 +01:00
Benoît Burnichon
be320ea7a2 Bump elasticsearch version to 1.6.0 2015-07-08 12:07:32 +02:00
Benoît Burnichon
627475799f Change travis configuration 2015-06-12 12:25:04 +02:00
Benoît Burnichon
b14f360a6a Travis CLI changed formatting of .travis.yml 2015-06-09 11:09:41 +02:00
Benoît Burnichon
0700a98ee3 Test Travis Hipchat api 2015-06-08 10:09:09 +02:00
Benoît Burnichon
91745c380d Force TCP connection to DB. Issue on Travis VMs. 2015-04-30 16:27:26 +02:00
Benoît Burnichon
6fd2d72eb1 Set composer to use --no-progress --no-interaction options 2015-03-27 10:06:18 +01:00
Benoît Burnichon
0386d5c1e0 Update Travis conf and js testing 2015-03-26 15:35:46 +01:00
Benoît Burnichon
a3f2e39781 Rework travis configuration 2015-03-26 11:18:06 +01:00
Benoît Burnichon
bae6f66f41 Bump php minimum version requirement. 2015-03-23 19:02:09 +01:00
Benoît Burnichon
623c33d51f Remove tests with nightly php as pecl are not compiled. 2015-03-19 16:09:50 +01:00
Benoît Burnichon
d2a2214624 Travis config to check 5.6 compatibility and build against PHP 7 2015-03-19 15:15:59 +01:00
Benoît Burnichon
ed9bdd6683 Travis configuration, remove check certificate for ES 2015-03-17 16:12:47 +01:00
Benoît Burnichon
cdc7f743d5 Remove staticExpects to work with PHPUnit ~4.5 2015-03-17 13:08:27 +01:00
Benoît Burnichon
423dcb1b44 Add version dump of boxes 2015-03-13 16:42:00 +01:00
Benoît Burnichon
9c9777ea7f Update travis 2015-03-13 11:24:53 +01:00
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