aina-esokia
89b9ea0b2a
change default mod
2018-09-04 17:21:03 +04:00
Nicolas Maillat
4773678417
Merge pull request #2721 from aynsix/PHRAS-2175-task-log-size
...
PHRAS-2175 fix size in task log
2018-09-04 11:46:08 +02:00
Nicolas Maillat
9300823f05
Merge pull request #2726 from aynsix/PHRAS-2205-saving-configuration-file
...
PHRAS-2205 Change the configuration file content update methode : when saving from admin/setup
2018-09-04 11:45:36 +02:00
aina-esokia
288cdbd3e2
update Configuration.php
2018-09-03 15:03:47 +04:00
aina-esokia
354c918a90
admin/setup: change file content instead of recreate config file
2018-09-03 14:58:05 +04:00
aina-esokia
c3790befce
fix size in task log
2018-08-31 18:16:52 +04:00
aina-esokia
c3486f9b8e
allow svg logo and change gabari
2018-08-31 16:10:19 +04:00
aina-esokia
5948032af6
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2011-personalization-log
2018-08-31 15:41:55 +04:00
Nicolas Maillat
ebd6699b2f
Merge pull request #2720 from filipx/PHRAS-2192_detailed_selection_dev
...
PHRAS-2192_detailed_selection_dev
2018-08-30 14:21:35 +02:00
Filip Vilic
e41145ead7
PHRAS-2192_detailed_selection_dev box position fix
2018-08-30 10:20:37 +02:00
aina-esokia
5dba9f64dd
add personalisation logo
2018-08-29 15:11:04 +04:00
Nicolas Maillat
7a71da5d7e
Merge pull request #2713 from filipx/PHRAS-2192_detailed_selection_dev
...
PHRAS-2192 detailed selection info - html added
2018-08-27 17:53:45 +02:00
Filip Vilic
5cd490ce99
PHRAS-2192 detailed selection info - html added
2018-08-16 11:37:50 +02:00
aina-esokia
57a8612e92
add duration and file size
2018-08-09 16:08:15 +04:00
aina-esokia
ddd0695c99
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2175-subdef-building-duration
2018-08-09 15:45:27 +04:00
aina-esokia
4f9e07c030
change field name in user query
2018-08-09 12:08:59 +04:00
aina-esokia
6630fc7d15
change notifier timeout
2018-08-03 14:33:12 +04:00
aina-esokia
1181f7da01
add subdef building duration in task log
2018-07-31 11:21:48 +04:00
Nicolas Maillat
86c82a78d3
Merge pull request #2693 from aynsix/PHRAS-2118-rollback-tmpfiles-just-for-video
...
PHRAS-2118 rollback use just tmp_files storage for video
2018-07-27 16:12:24 +02: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
5aaf0b8782
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2165-keep-mysql-connection-open
2018-07-27 15:25:15 +04:00
jygaulier
e7863122d0
PHRAS-2172_parade-saml-err500_MASTER ( #2695 )
...
fix : the user application was updated (=created) after the check
add : "find()" on user repo (type hinted) to allow code sniff, completion etc.
2018-07-26 16:34:20 +02: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
63828aa813
use just tmp_files storage for video
2018-07-23 18:08:30 +04:00
aina-esokia
4f996f3ccc
masquing some native Api application in user porfil -> Application tab
2018-07-23 11:53:18 +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
2b02d6638e
fix
2018-07-19 18:34:43 +04:00
aina-esokia
61741266b4
update setupController
2018-07-19 17:35:54 +04:00
aina-esokia
ca668938f7
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2155-graphic-installer-elastic-step
2018-07-19 17:32:25 +04:00
nmaillat
98660a4aaf
bump api version to 2.0.0
2018-07-18 23:23:59 +02:00
aina-esokia
50f8580e27
add searchengine step in graphic installer
2018-07-18 18:07:25 +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
e836c99b54
add checkbox authorize adobecc plugin in admin / setup
2018-07-13 12:06:59 +04:00
Nicolas Maillat
1ea18e1597
Merge pull request #2664 from aynsix/PHRAS-1993-API-answer-version
...
PHRAS-1993 API / API answer / the age of token define API version in answer
2018-07-12 17:46:43 +02:00
aina-esokia
0dffe0e020
forbiden guest account to create api app
2018-07-12 15:01:51 +04:00
aina-esokia
4aa3ba106a
merge master
2018-07-11 16:56:40 +04:00
aina-esokia
fb79966f91
update column guest also for deleted guest account
2018-07-11 16:50:23 +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
aina-esokia
8c5457d496
fix api version
2018-07-09 14:51:52 +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
aina-esokia
1699b0a6d1
fix api version in answer
2018-07-06 15:23:54 +04: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
jygaulier
cbed6488c6
PHRAS-2126_Array-to-String-err-idx_4.1 ( #2658 )
...
* PHRAS-2126_Array-to-String-err-idx_4.1
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"
* PHRAS-2126_Array-to-String-err-idx_4.1
fix : bad gps coordinate are ignored by es indexation.
* PHRAS-2126_Array-to-String-err-idx_4.1
fix : gps coordinate can de negative.
2018-07-03 17:32:22 +02:00
aina-esokia
82ce18fa00
api substitute update subview when 'document'
2018-07-03 10:05:27 +04:00
jygaulier
88035173c5
PHRAS-2126_Array-to-String-err-idx_4.1 ( #2656 )
...
fix : es error message during indexation is now dumped (not always a string)
fix : es file "size" is now type "long"
2018-07-02 18:41:40 +02:00
