Nicolas Maillat
990378d9b0
Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration
2019-09-06 15:03:21 +02:00
Nicolas Maillat
c2b5d0cc5f
Merge pull request #3158 from aynsix/PHRAS-2724-port-PHRAS-2723
...
PHRAS-2724 : #comment Merge of PORT To 4.1 - None information (name, last name etc...) is keep from the Push or a FeedBack user creation form
2019-09-06 14:59:39 +02:00
Nicolas Maillat
5e3a9c7bee
Merge branch 'master' into PHRAS-2724-port-PHRAS-2723
2019-09-06 13:04:03 +02:00
Nicolas Maillat
d241ff2fb3
Merge pull request #3156 from jygaulier/PHRAS-2726_setstatus-api_4.1
...
PHRASE-2726 #comment Fusion of Setstatus-api in 4.1, after this merge and this update, the PR # 3161, currently in a failed state, should proceed correctly. This merge order is not the best ways but this is more quicker.
2019-09-05 17:07:03 +02:00
aynsix
fe087a9dc5
fix user creation from push and feedback window
2019-09-04 12:09:53 +04:00
Jean-Yves Gaulier
53272de3f5
PHRAS-2726_setstatus-api_4.1 : port of PHRAS-2716
...
setstatus api did change unspecified bits due to string offset error
2019-09-03 18:07:36 +02:00
Nicolas Maillat
aea8fc8dc7
Merge pull request #3153 from aynsix/PHRAS-2715-embed-bundle-new-version
...
PHRAS-2715 #comment Merge of bump version of Embed-bundle in 4.1, border issue on firefox
2019-09-02 17:57:17 +02:00
Nicolas Maillat
9911a5168e
Merge branch 'master' into PHRAS-2715-embed-bundle-new-version
2019-09-02 17:41:27 +02:00
jygaulier
cb502916e3
Merge pull request #3149 from tomamplius/master
...
Update databox.php
2019-09-02 16:10:42 +02:00
jygaulier
8d699d984d
Merge branch 'master' into master
2019-09-02 15:57:25 +02:00
aynsix
b64f677c47
embed-bundle on version 2.0.7
2019-09-02 17:30:34 +04:00
jygaulier
63bfc61180
Merge pull request #3141 from aynsix/PHRAS-2704-pdftotext-binary
...
PHRAS-2704 : PORT To 4.1 - Phraseanet Binaries in configuration not used in some alchemy-fr libraries
2019-08-24 09:09:18 +02:00
jygaulier
8a8aea6bab
Merge pull request #3142 from aynsix/PHRAS-2709-port-date-from-iptc
...
PHRAS-2709 : port to 4.1 Dates seems not extracted from iptc
2019-08-24 09:08:36 +02:00
jygaulier
321e81a0e1
Merge pull request #3143 from aynsix/PHRAS-2707-port-date-with-times
...
PHRAS-2707 : Port to 4.1 - ES - date format timestamp unix, stocker/rechercher les dates phraseanet avec heure minutes secondes
2019-08-24 09:07:44 +02:00
jygaulier
8d45e6a860
Merge pull request #3144 from aynsix/PHRAS-2710-port-indexer-crashes-on-nul-character
...
PHRAS-2710 : Port to 4.1 - ES indexer crashes if field contains NUL character
2019-08-24 09:05:29 +02:00
xrousset78800
a66c6e5862
Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration
2019-08-20 14:47:36 +02:00
tomamplius
7b6d322d21
Update databox.php
2019-08-20 11:29:35 +02:00
aynsix
f3e6d2db6c
Merge branch 'master' into PHRAS-2709-port-date-from-iptc
2019-08-19 16:47:07 +04:00
aynsix
abe749b058
Merge branch 'master' into PHRAS-2707-port-date-with-times
2019-08-19 16:46:43 +04:00
aynsix
a19fad86ce
Merge branch 'master' into PHRAS-2710-port-indexer-crashes-on-nul-character
2019-08-19 16:46:15 +04:00
aynsix
7729d96544
Merge branch 'master' into PHRAS-2704-pdftotext-binary
2019-08-19 16:35:20 +04:00
moctardiouf
139ed1da81
Merge pull request #3145 from aynsix/fix-circleci-unable-to-run-job-runner
...
PHRAS-2711 : fix circleci unable to run the job runner
2019-08-19 14:34:21 +02:00
aynsix
640cfc969f
fix circleci unable to run the job runner
2019-08-16 14:57:48 +04:00
aynsix
bd53e98b0d
port to 4.1 fix ES index NUL
2019-08-15 16:09:35 +04:00
aynsix
20076df3f8
port to 4.1 date with time on phraseanet
2019-08-15 15:23:03 +04:00
aynsix
eb938ee9ea
formate date from metadata to Y/m/d H:i:s
2019-08-15 11:15:26 +04:00
aynsix
d0bbea71b9
use configuration pdftotext binary
2019-08-14 18:24:22 +04:00
Xavier Rousset
80b4c9a6a6
PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller
2019-08-14 15:49:25 +02:00
Nicolas Maillat
6b01a5df23
Merge pull request #3130 from alchemy-fr/PHRDPL-75_fix-docker-build
...
PHRDPL-75 #comment merge composer-install : update checksum
2019-08-02 13:00:48 +02:00
Alexandre BRACH
3663ace661
PHRDPL-75 #comment update .circleci
2019-08-02 12:32:09 +02:00
Alexandre BRACH
e679f78ed7
PHRDPL-75 #comment composer-install : update checksum
2019-08-02 11:15:49 +02:00
Nicolas Maillat
08d10605b3
Merge pull request #3108 from HRavalomanana/PHRAS-2671_change_behaviour_of_display_audio
...
PHRAS-2671 #comment merge Fix behaviour of preview display in audio file case
2019-08-01 22:38:30 +02:00
Nicolas Maillat
7a137c17ba
Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio
2019-08-01 22:13:51 +02:00
jygaulier
9335bb2517
restore mailcatcher
2019-07-29 13:39:06 +02:00
jygaulier
2180332414
fix mailcatcher version
...
current version of mailcatcher wants ruby 2, downgrade to a version ok with ruby 1.9
2019-07-29 13:37:53 +02:00
Nicolas Maillat
9709f6f8f4
Merge pull request #3098 from HRavalomanana/PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
...
PHRAS-2665 #comment merge Fix video tool ratio
2019-07-24 14:56:24 +02:00
Nicolas Maillat
6e52fbe0bc
Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
2019-07-24 14:39:51 +02:00
jygaulier
714918f148
Restore xdebug provisioning
...
restore roles xdebug & nginx
2019-07-23 16:58:50 +02:00
Harrys Ravalomanana
86484c6580
PHRAS-2665
2019-07-23 11:29:00 +04:00
Harrys Ravalomanana
954e04477d
PHRAS-2665 #comment fix code review #time 1h
2019-07-23 11:27:11 +04:00
Nicolas Maillat
d82a981370
Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio
2019-07-22 20:58:40 +02:00
Nicolas Maillat
a44ea3dfff
Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
2019-07-22 20:52:48 +02:00
jygaulier
c26942a3a5
Merge pull request #3104 from aynsix/PHRAS-2663-index-on-notification-table
...
PHRAS-2663 : Add mysql index on table notification applicationbox
2019-07-22 19:11:01 +02:00
Nicolas Maillat
8eeb190dcd
Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio
2019-07-22 18:34:33 +02:00
jygaulier
27230b3a3e
Merge branch 'master' into PHRAS-2663-index-on-notification-table
2019-07-22 17:25:17 +02:00
jygaulier
3664b5c5a8
Merge pull request #3101 from HRavalomanana/PHRAS-2668_fix_twig_error
...
PHRAS-2668 fix twig error
2019-07-22 17:15:28 +02:00
jygaulier
b68d9136ae
Merge branch 'master' into PHRAS-2668_fix_twig_error
2019-07-22 17:07:41 +02:00
Nicolas Maillat
1bc208469f
Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
2019-07-22 15:21:08 +02:00
Nicolas Maillat
54a967a5da
Merge branch 'master' into PHRAS-2663-index-on-notification-table
2019-07-22 15:20:38 +02:00
Nicolas Maillat
e1e8305eb0
Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio
2019-07-22 15:15:27 +02:00
