Commit Graph

1859 Commits

Author SHA1 Message Date
Jean-Yves Gaulier
1653c2494c PHRAS-2605_fix-unittest-bootstrap_4.1
remove debug
2019-05-28 15:16:28 +02:00
Jean-Yves Gaulier
0cbc5a8ef4 PHRAS-2605_fix-unittest-bootstrap_4.1
remove debug
2019-05-28 15:06:06 +02:00
Jean-Yves Gaulier
dca1387a17 PHRAS-2605_fix-unittest-bootstrap_4.1
fix conf
2019-05-28 14:59:34 +02:00
Jean-Yves Gaulier
c68ad4fd8f PHRAS-2605_fix-unittest-bootstrap_4.1
fix default lng
add missing cmd
2019-05-28 14:49:49 +02:00
aina-esokia
47d974a466 PHRAS-2497 #comment port to 4.1 Search issue when query mix data from Public and Private field
#time 2h
2019-04-23 12:10:25 +04:00
aynsix
5cdf473c7f PHRAS-1972: Account Page, Allow a Phraseanet User to delete his account and associated datas (#2918)
* allow user to delete account

* generate translation and add checkbox in the windows confirmation

* change text an configuration key

* update delete account fonctionality

* rename variable

* write in explicite condition

* merge yarn.lock

* regenerate translation
2019-04-08 14:25:17 +02:00
aina-esokia
eaf8cf076a port to 4.1 search mix type 2019-03-22 12:04:42 +04:00
aina-esokia
d2bdd2ed4a port 4.1: migrate field type text to string 2019-01-11 14:45:33 +04:00
Filip Vilic
734d16a7e5 PHRAS-2327_report_refacto_41 root test fix 2018-12-12 11:03:31 +01:00
Filip Vilic
3fe4247953 PHRAS-2327_report_refacto_41 remove old tests 2018-12-11 14:15:48 +01:00
Jean-Yves Gaulier
8a26b72293 PHRAS-2189_report-v2_MASTER
disable some tests
2018-11-14 18:06:29 +01:00
Jean-Yves Gaulier
6ad5dec136 PHRAS-2161_coll-id-in-log-docs_MASTER
disable tests

todo : fix log2es plugin.

wip
2018-11-14 15:46:16 +01:00
Xavier Rousset
a8ebe5fc43 Update access page design 2018-10-19 19:10:39 +02:00
aina-esokia
aabcdccdf1 update subdefsTest 2018-07-20 18:07:59 +04:00
aina-esokia
4da75f154d add path field in subview window 2018-07-20 17:53:25 +04:00
aina-esokia
860d6c9028 update ApiTestCase 2018-07-06 16:01:23 +04:00
Nicolas Maillat
41f95f3ca9 Merge branch 'master' into PHRAS-1798_update_version_name 2018-06-26 13:13:19 +00:00
aina-esokia
9984da98c0 update subdefTest 2018-06-08 16:12:24 +04:00
aina-esokia
9180bc88ef generate pdf subdef 2018-06-08 15:49:46 +04:00
aina-esokia
d86fd39380 port to 4.1 api route me/collections 2018-05-10 10:58:14 +04:00
Nicolas Maillat
e4ca34fd24 Merge pull request #2563 from KallooaSan/PHRAS-1911-fix-route
PHRAS-1911 : fix route me/structures
2018-05-08 21:23:43 +02:00
Sandeep
7f8251d4e2 PHRAS-1819: add quarantine rule based on media type 2018-05-07 14:31:12 +04:00
aina-esokia
c905ca303f use composite position 2018-05-03 17:25:37 +04:00
Sandeep
c75d94a321 PHRAS-1911 : fix route me/structures 2018-05-02 12:21:18 +04:00
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