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 |
|
Nicolas Maillat
|
8881bf2248
|
Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok
|
2019-08-30 12:32:41 +02:00 |
|
aynsix
|
645ae0e777
|
fix api: remove temporary file when upload
|
2019-08-28 16:41: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
|
c1e8ad60e8
|
Merge branch 'master' into PHRAS-2666_slow-notifications_4.1
|
2019-08-20 14:48:35 +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 |
|
moctardiouf
|
b9e6425781
|
Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok
|
2019-08-19 14:35:28 +02: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
|
80dcf98e1f
|
fix basket browser windows nok
|
2019-08-19 15:24:04 +04: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 |
|
Harrys Ravalomanana
|
816225036f
|
PHRAS-2282 add loader on results display
|
2019-08-14 16:26:16 +04:00 |
|
Harrys Ravalomanana
|
0d84aa040a
|
PHRAS-2282 #comment fix next page or previous page display for results #time 3h
|
2019-08-14 16:18:15 +04:00 |
|
Harrys Ravalomanana
|
8987e2dba5
|
PHRAS-2688 commit to run ccircle ci test
|
2019-08-13 11:39:57 +04:00 |
|
Harrys Ravalomanana
|
074e1cf9ea
|
PHRAS-2282 commit to run circle ci test
|
2019-08-13 11:35:06 +04:00 |
|
Harrys Ravalomanana
|
947b97ee0b
|
PHRAS-2706
|
2019-08-13 11:06:57 +04:00 |
|
Harrys Ravalomanana
|
772b102632
|
PHRAS-2282 #time 4h
|
2019-08-12 16:40:58 +04:00 |
|
Harrys Ravalomanana
|
e7ec57346a
|
PRHAS-2282 #comment fix JY comments
|
2019-08-08 13:56:44 +04:00 |
|
Harrys Ravalomanana
|
366c486733
|
PHRAS-2282 #comment add new design #time 24h
|
2019-08-07 16:43:53 +04:00 |
|
Nicolas Maillat
|
70ff62badc
|
Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering
|
2019-08-02 15:31:58 +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 |
|
Harrys Ravalomanana
|
f185558de7
|
PHRAS-2688 #comment Port 41 of Prod workzone: Change type of numbering #time 1h
|
2019-08-02 13:48:48 +04: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 |
|
Nicolas Maillat
|
1f2ae415ab
|
Merge branch 'master' into PHRAS-2666_slow-notifications_4.1
|
2019-07-31 16:12:49 +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 |
|
Jean-Yves Gaulier
|
31b940239f
|
PHRAS-2666_slow-notifications_4.1
fix dql
!!! WIP !!!
|
2019-07-25 19:34:32 +02:00 |
|
Jean-Yves Gaulier
|
568268a918
|
PHRAS-2666_slow-notifications_4.1
revert to fix unit test (?)
!!! WIP !!!
|
2019-07-25 18:16:43 +02:00 |
|
Jean-Yves Gaulier
|
3ae0c94863
|
PHRAS-2666_slow-notifications_4.1
fix bad fct arg type "string"
!!! WIP !!!
|
2019-07-25 17:33:21 +02:00 |
|
Jean-Yves Gaulier
|
2fcbd7e6d7
|
PHRAS-2666_slow-notifications_4.1
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
|
2019-07-25 17:23:10 +02:00 |
|
Jean-Yves Gaulier
|
5585893f05
|
PHRAS-2651_event-to-message_4.1
fix for php7.1
!!! WIP !!!
|
2019-07-25 17:23:10 +02:00 |
|
Jean-Yves Gaulier
|
b0c0f65764
|
PHRAS-2666_slow-notifications_4.1
removed join on basket_elements where useless
!!! WIP !!!
|
2019-07-25 17:23:10 +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 |
|