Commit Graph

3071 Commits

Author SHA1 Message Date
aina-esokia
2eeb1721e9 port to 4.1 PHRAS-1831 2018-11-05 15:02:55 +04:00
aina-esokia
fbf8d80b4a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination 2018-10-23 18:11:34 +04:00
aina-esokia
d2b3d96760 update jeton when set metadatas 2018-10-18 14:30:37 +04:00
aina-esokia
e9beafef85 add max_item and page in api route search and stories 2018-10-11 14:26:36 +04:00
jygaulier
8768cd84f7 PHRAS-2171_mime-truncated_MASTER (#2748)
extend "mime" columns (record, subdef) to 255 to allow long mimes.
try to fix truncated mime.
2018-09-27 16:18:28 +02:00
aina-esokia
c3486f9b8e allow svg logo and change gabari 2018-08-31 16:10:19 +04:00
aina-esokia
5dba9f64dd add personalisation logo 2018-08-29 15:11:04 +04:00
aina-esokia
4f9e07c030 change field name in user query 2018-08-09 12:08:59 +04:00
aina-esokia
e9b6d55335 add logger on mysql timeout and check appbox connection on subdefsjob 2018-07-27 15:34:56 +04:00
aina-esokia
74ff97eba6 modify call of lastInsertId() of connection 2018-07-26 12:24:40 +04:00
aina-esokia
7465b0d56b keep mysql connection alive 2018-07-26 10:30:12 +04:00
aina-esokia
4da75f154d add path field in subview window 2018-07-20 17:53:25 +04:00
aina-esokia
43bc3eb43b Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2122-subview-setup-default-path 2018-07-20 17:44:58 +04:00
aina-esokia
36423a9b39 default path when create a new subviews 2018-07-16 16:29:27 +04:00
aina-esokia
0050908cd3 fix ftp pull task error 2018-07-16 11:27:41 +04:00
aina-esokia
4aa3ba106a merge master 2018-07-11 16:56:40 +04:00
aina-esokia
b0f67b745b guest account patch doctrine migration 2018-07-10 17:11:37 +04:00
aina-esokia
2b2e05150e add token for adobe cc plugin 2018-07-10 12:32:16 +04:00
Nicolas Maillat
c4e4d1dbe9 Revert "PHRAS-2086_AdobeCC-AppToken_4.1" 2018-07-06 18:03:54 +02:00
Jean-Yves Gaulier
15f0a7017a PHRAS-2086_AdobeCC-AppToken_4.1
simplified
2018-07-06 15:55:04 +02:00
Jean-Yves Gaulier
ea9ce1c04a PHRAS-2086_AdobeCC-AppToken_4.1
add an "adobe_cc-plugin" api application
require system:upgrade to go to 4.1.0-alpha.10
must be enabled via "adobe_cc-enabled" in conf
2018-07-05 18:53:12 +02:00
aynsix
01f5380305 remove old tables (#2654) 2018-06-25 18:22:38 +02:00
jygaulier
b9aa04be6b PHRAS-2096_Autoregister-Whitelist_MASTER (#2642)
Add a whitelist to filter autoregistration
2018-06-21 18:35:44 +02:00
aina-esokia
5488d5d47c FIX create subview mediatype dropdown 2018-06-20 17:26:19 +04:00
aynsix
9809e8f176 modify create guest account and filter guest user (#2534) 2018-06-14 19:16:10 +02:00
aina-esokia
3996f842a2 delete data from cache 2018-06-13 17:56:17 +04:00
aina-esokia
923265f71b insert or update in technical_data table 2018-06-13 11:06:24 +04:00
aina-esokia
9180bc88ef generate pdf subdef 2018-06-08 15:49:46 +04:00
aina-esokia
c905ca303f use composite position 2018-05-03 17:25:37 +04:00
mike-esokia
4eaa008aec add technicalInfo in record of detail view 2018-04-18 14:33:39 +04:00
aina-esokia
e8f9e9a883 position technical data to positive negative value 2018-04-12 09:48:09 +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
3c9e875ea9 PHRAS-1911 refactor technical fields list 2018-03-19 15:00:21 +04: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
aynsix
ed29948a33 add filter to hide special account in user list (#2522) 2018-03-15 17:04:29 +01:00
xrousset78800
314473b169 PHRAS-1920 Add alias on deprecated function used on webgallery plugin (#2513) 2018-03-13 12:01:21 +01:00
aina-esokia
9226e5a478 port 1776 databox create to master 2018-03-01 17:41:08 +04:00
KallooaSan
cb4ef28072 PHRAS-1863 PORT PHRAS-60 Add applicative trash (#2492) 2018-02-27 17:02:24 +01:00
aynsix
1ca68fb9a5 update time limit (#2493) 2018-02-27 16:58:13 +01:00
Mike Ng
30f49bdd35 resolve conflict 2018-01-08 15:57:13 +04:00
Nicolas Maillat
27f4cfc4df Merge pull request #2424 from mike-esokia/PHRAS-1782_PORT_PHRAS-1770
PHRAS-1782 porting PHRAS-1770 to 4.1
2018-01-08 12:30:30 +01:00
Mike Ng
c936582d88 porting PHRAS-1770 to 4.1 2018-01-04 14:41:19 +04:00
Xavier Rousset
c7f6b325d8 PHRAS-1766 Add orderable checkbox for each subdef - Remove order option on groups 2017-12-18 18:02:48 +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
Mike Ng
b18dcf1147 implementation backend to get statistics for googlechart 2017-08-16 11:00:09 +04:00
moctardiouf
cf0440dda6 PHRAS-1409_fix-push-list-management-error-500 2017-06-14 11:05:19 +02:00
moctardiouf
e591a4160f PHRAS-1359_remove_back_slash_n (#2098)
removing \n into SQL requests causing memcached content deletion issues.
2017-05-18 11:04:20 +02: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