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,071 Commits 268 Branches 107 Tags
2369394c8c1526596d83c30a8c591c0b9736692e
Commit Graph

253 Commits

Author SHA1 Message Date
Moctar
2369394c8c PHRAS-1805 PHRAS-1268 fix composer dependencies 2018-01-12 17:57:31 +01:00
jygaulier
8117d1ebc0 PHRAS-1751_GOOGLE-AUTH_master (#2384) 
* PHRAS-1751_GOOGLE-AUTH_master
replace lib "alchemy/google-plus-api-client" by "google/apiclient"
had to downgrade facebook/php-sdk from 4 (does not exists ?) to 3 (abandoned anyway) to allow composer update.
see PHRAS-1752

* PHRAS-1751_GOOGLE-AUTH_master
revert composer.lock, only remove & update new google-sdk (composer full update make tests boot to fail. to see later)

* PHRAS-1751_GOOGLE-AUTH_master
fix unit test
 2017-11-30 10:45:56 +01:00
Mike Ng
805d2c1fd1 update embed-bundle and alchemy-embed-medias libraries 2017-08-07 11:49:25 +04:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061) 
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
 2017-02-06 18:26:56 +01:00
Thibaud Fabre
c8ed4a22f4 Merge 4.0 into master 2016-12-06 14:45:57 +01:00
Thibaud Fabre
a4544e235a Update worker bundle version 2016-12-06 12:14:24 +01:00
moctardiouf
64fe1bdf78 update facebook sdk dependency version 2016-12-05 18:07:30 +01:00
Thibaud Fabre
fa301fd0dd Fix composer file 2016-12-05 17:51:13 +01:00
Thibaud Fabre
23c939f13c Merge master 2016-12-05 17:48:19 +01:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Thibaud Fabre
c7082ee04c Bump worker bundle 2016-12-05 12:40:52 +01:00
moctardiouf
505013dadb Adding fractal alchemy-fr fork to composer.json 2016-12-02 17:29:34 +01:00
Thibaud Fabre
dd480b0db0 Start integration of worker bundle 2016-10-10 11:19:43 +02:00
Thibaud Fabre
997a6bcc31 Update dependencies with PHP 5.5.x to fix build issues 2016-09-29 08:52:38 +02:00
Thibaud Fabre
891db517e4 Fix PHPUnit version requirement for PHP 5.5.9 2016-09-28 20:03:33 +02:00
Thibaud Fabre
4da8a25e26 Fix Ansible roles to provision fully functional Vagrant VM 2016-09-21 16:49:15 +02:00
Florian BLOUET
1412f98071 add pym.js iframe communication lib for embed bundle 
- bump embed-bundle
- bump phraseanet-production-client
 2016-06-17 10:41:26 +02:00
Jean-Yves Gaulier
b49a5ceda5 PHRAS-1168_Backport-PHRAS-1094-to-4.0 
(update php-es lib)
#time 30m
 2016-06-16 17:57:04 +02:00
Jean-Yves Gaulier
95043b5e7a PHRAS-1160_Backport-PHRAS_1159 
#time 20m
 2016-06-15 15:32:20 +02:00
Jean-Yves Gaulier
d9ee0bef5d PHRAS-1159_Subdef-Task-Doctrine-Cache-err 
#time 4h
fix : Error "wrong number of arguments" using a secondary encoding instance (subdef task) is fixed
 2016-06-15 15:07:05 +02:00
Thibaud Fabre
1917b3dba3 Merge branch 4.0 into master 2016-05-25 17:21:08 +02:00
Benoît Burnichon
72573db3f8 Bump fractal with fix on null resource 2016-05-19 13:53:40 +02:00
Benoît Burnichon
148568080f Bump fractal version to development one. 2016-05-19 13:50:08 +02:00
Thibaud Fabre
d924a8aad5 Fix JSON schema decode error 2016-05-17 23:17:10 +02:00
Benoît Burnichon
1682535dfb Bump fractal with fix on null resource 2016-05-16 19:36:04 +02:00
Benoît Burnichon
df0aee31a0 Bump fractal version to development one. 2016-05-16 18:26:17 +02:00
Benoît Burnichon
2932963ecb Use composer update instead of install with PHP7 2016-05-11 15:54:31 +02:00
Jean-Yves Gaulier
95b52c038b PHRAS-1094_ES-LIB-UPGRADE 
#time 1d
change : upgrade the php-es lib to 2.x
 2016-04-27 20:06:36 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00
Benoît Burnichon
bae28329ab Add doctrine/cache to required dependencies 2016-04-13 13:41:00 +02:00
Benoît Burnichon
cc3d5cc249 Bump Sorien WebProfiler to handle multiple connections 2016-03-25 13:18:52 +01:00
Benoît Burnichon
03b821acb7 Merge branch '4.0' 2016-03-16 17:21:57 +01:00
Benoît Burnichon
73e55b43eb Avoid using imagine/imagine alias as it is causing install issues 2016-03-16 15:34:31 +01:00
Benoît Burnichon
210920c31f Fix missing requirement to intl extension 
Found usage of Transliterator which is part of the intl extension
 2016-03-15 16:57:07 +01:00
Benoît Burnichon
643b7d2501 Require new cocur/slugify library to replace buggy implementation 2016-03-15 16:42:55 +01:00
Benoît Burnichon
bd2f70295c Bump rest-bundle to stable version 2016-03-10 13:26:49 +01:00
Jean-Yves Gaulier
b6cc58a68e PHRAS-987 1h 
PNG-Subdefs (port from 3.8)
 2016-03-08 12:09:35 +01:00
Benoît Burnichon
d9d6944878 Bump rest-bundle to stable version 2016-03-04 15:39:35 +01:00
Benoît Burnichon
0a151ec247 Merge branch '4.0' 2016-03-01 18:59:04 +01:00
Benoît Burnichon
e3807a8244 Bump dependencies 2016-03-01 16:51:11 +01:00
Benoît Burnichon
060c4fe407 Try not to update when PHP 5.* is used 2016-02-29 17:32:26 +01:00
Benoît Burnichon
3306b1fa1a Change phpunit/phpunit version 2016-02-29 17:31:38 +01:00
Benoît Burnichon
5975178749 Merge branch '4.0' 
Also updated dependencies
 2016-02-28 23:31:16 +01:00
Florian BLOUET
a2b4eb784a PHRAS-1011 - fix PDFjs compatibility issue - bump Embed Bundle 2016-02-25 18:17:29 +01:00
Jean-Yves Gaulier
28a7a653d3 #PHRAS-987 1h 
PNG-Subdefs (port from 3.8)
 2016-02-17 16:55:47 +01:00
Benoît Burnichon
8750459aab Bump master as 4.1 branch 2016-02-09 16:51:35 +01:00
Benoît Burnichon
5d24b53ad4 Add flysystem dependencies 2016-01-26 14:25:09 +01:00
Benoît Burnichon
686d6d3dca Bump webmozart/json, justinrainbow/json-schema and willdurand/negotiation 
PHRAS-909
 2016-01-15 16:15:47 +01:00
Benoît Burnichon
4a8c0751e3 Bump embed-bundle to stable 2016-01-15 13:57:20 +01:00