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
13,814 Commits 268 Branches 107 Tags
d62767ad39642712b944ea647bc5201eadf2cff9
Commit Graph

1835 Commits

Author SHA1 Message Date
Nicolas Maillat
4821145206 Merge pull request #2524 from KallooaSan/PHRAS-1911-add_route_return_list_documentary_fields 
PHRAS-1911-add route return list documentary fields
 2018-03-20 10:19:56 +01:00
Sandeep
5de988299d PHRAS-1911-add route return list documentary fields 2018-03-16 15:01:20 +04:00
aina-esokia
a61eacf182 double extension port 1205 to master 2018-03-16 12:24:12 +04:00
Nicolas Maillat
1f78adf645 Merge pull request #2500 from aynsix/PHRAS-1832-port-1776-to-master 
PHRAS-1832 port 1776 to master - databox create
 2018-03-06 15:11:20 +01:00
Nicolas Maillat
249a4126b4 Merge pull request #2490 from KallooaSan/PHRAS-1856_PORT-PHRAS-1347 
PHRAS-1856_PORT-PHRAS-1347
 2018-03-05 11:31:27 +01:00
aina-esokia
b1c7e87799 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1832-port-1776-to-master 2018-03-01 17:41:45 +04:00
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04:00
KallooaSan
00be9e51b0 PHRAS-1895_PORT_PHRAS-1401_include_json_format_return_record (#2494) 
* PHRAS-1895_PORT_PHRAS-1401 include json format return record

* PHRAS-1895_rollback deleted action ref PHRAS-1688
 2018-02-28 17:31:45 +01:00
Sandeep
77352e59ef PHRAS-1856_PORT-PHRAS-1347 2018-02-26 11:30:55 +04:00
Toky Herizo
6c853cf98c udpate facebook SDK to 5.6 2018-02-12 11:24:14 +04:00
nmaillat
b564ef350b PHRAS-1798 name and version fix test last 2018-01-17 18:32:44 +01:00
nmaillat
575bf525b5 PHRAS-1798 fix test ter 2018-01-17 17:39:50 +01:00
nmaillat
9cf6f5a060 PHRAS-1798 fix test bis, change maximum-phraseanet-version 2018-01-17 10:02:39 +01:00
nmaillat
81feec6bea PHRAS-1798 fix test change maximum-phraseanet-version 2018-01-16 21:37:35 +01:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Nicolas Maillat
684596106d Merge pull request #2393 from xrousset78800/PHRAS-1719/add-subset-presets-on-4-1 
PHRAS-1719 Add presets selection on subdef admin page | Port to 4.1 PHRAS-1317
 2018-01-08 12:18:14 +01:00
Nicolas Maillat
7b4dcec274 Merge pull request #2383 from mike-esokia/PHRAS-1736_PORT-165_and_1593 
PHRAS-1736 port PHRAS-165 and PHRAS-1593
 2018-01-08 12:12:20 +01:00
Xavier Rousset
3a6f2eb365 Fix travis tests 2017-12-14 11:59:42 +01:00
Xavier Rousset
1683191d19 PHRAS-1719 Add presets selection on subdef admin page 2017-12-13 01:58:36 +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
a79b72fbaf Port PHRAS-1593 2017-11-24 16:22:31 +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
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
22542f8df8 Update test assertions 2016-11-25 15:12:15 +01:00
Jean-Yves Gaulier
e42bb376f8 PHRAS-508_acl-cache 
- fix ref on pdo stmt
 2016-10-27 18:32:39 +02:00
Jean-Yves Gaulier
fe7f3762dd PHRAS-508_acl-cache 
- fix for tests
 2016-10-27 15:07:31 +02:00
Jean-Yves Gaulier
45eea29710 PHRAS-508_acl-cache 
- fix unit tests
 2016-10-26 19:14:11 +02:00
Jean-Yves Gaulier
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
299b24d4fb Update class for mapping type constants 2016-10-19 13:31:17 +02:00
Thibaud Fabre
f915a8dc9a Update databox test assertions with new response URL 2016-10-19 07:24:14 +02:00
Thibaud Fabre
f2b956b015 Merge pull request #1968 from jygaulier/PHRAS-946_delete-record-api 
PHRAS-946_delete-record-api
 2016-09-29 17:41:24 +02:00
Jean-Yves Gaulier
485b9edf96 PHRAS-946_delete-record-api 
- fix tests
 2016-09-29 16:42:26 +02:00
Jean-Yves Gaulier
7e7668cd1b PHRAS-946_delete-record-api 
- fix tests
 2016-09-29 16:29:07 +02:00
Thibaud Fabre
08a8970147 Merge pull request #1944 from jygaulier/PHRAS-842_search-logged-as-es_4.0 
PHRAS-842_search-logged-as-es_4.0
 2016-09-29 14:10:21 +02:00
Thibaud Fabre
bd7e0987bc Clear log repository on user deletion 2016-09-29 10:22:05 +02:00
Thibaud Fabre
b98d8a38b2 Fix webhook repository test 2016-09-28 21:35:48 +02:00
Jean-Yves Gaulier
827e4fe255 PHRAS-842_search-logged-as-es_4.0 
- fix : query is logged in a "user" form, before parsing
 2016-09-22 15:16:36 +02:00
Thibaud Fabre
faf9b98b11 Fix include resolution 
Incorrect use of += operator on arrays caused the story includes to
always be unset
 2016-06-30 11:57:02 +02:00
Thibaud Fabre
edaf603552 Merge pull request #1859 from bburnichon/improvement/search-v4 
Backport of #1831 into 4.0
 2016-05-19 16:42:17 +02:00
Benoît Burnichon
32b5ed5fb2 Default notification.deliverer should be no-op, not throw exception. 2016-05-19 14:40:36 +02:00
Benoît Burnichon
a92653ec56 Remove useless variable 2016-05-19 14:40:10 +02:00
Benoît Burnichon
c14e48437d Refactor tests to use $this->getApplication(). 
Move LoginTest specific use case into LoginTest class
 2016-05-19 14:39:05 +02:00
Benoît Burnichon
f0e2ff2bd1 Backport PHP7 issue fix in Youtube Bridge 2016-05-19 14:08:48 +02:00
Benoît Burnichon
5bcb253be3 Remove client dependency in test, use $this->request instead 2016-05-19 13:50:08 +02:00
Benoît Burnichon
148568080f Bump fractal version to development one. 2016-05-19 13:50:08 +02:00
Benoît Burnichon
f87fc35f6a Caption Service tweak 2016-05-19 13:44:01 +02:00
Jean-Yves Gaulier
378cc45a87 PHRAS-1101_THMB-TRAIN-IN-PREVIEW 
backport from master
#time 30m
 2016-05-12 17:16:47 +02:00