aynsix
|
20076df3f8
|
port to 4.1 date with time on phraseanet
|
2019-08-15 15:23:03 +04: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 |
|
jygaulier
|
7b3a1f0c90
|
Merge pull request #3102 from xrousset78800/PHRAS-2496/update-master-provisioning
PHRAS-2496 | Update provisioning workflow, check if a box name is defined.
|
2019-07-22 14:39:03 +02:00 |
|
Harrys Ravalomanana
|
5bc66e8f23
|
PHRAS-2671 #comment Fix behaviour of display tooltip #time 4h
|
2019-07-19 12:04:19 +04:00 |
|
aynsix
|
e06a281dd0
|
add index on table notifications
|
2019-07-18 12:17:44 +04:00 |
|
Xavier Rousset
|
8c0f939339
|
Update provisioning workflow, check if a box name is defined. A playbook for box usage is created
|
2019-07-17 20:39:47 +02:00 |
|
Nicolas Maillat
|
49f6ff58ee
|
Update index.html.twig
|
2019-07-16 18:10:25 +02:00 |
|
Harrys Ravalomanana
|
c2f55eb8ba
|
PHRAS-2668 #comment fix twig error #time 1h
|
2019-07-16 15:12:26 +04:00 |
|
Harrys Ravalomanana
|
1ba27e55c7
|
PHRAS-2665 #time 3h
|
2019-07-16 14:07:41 +04:00 |
|
Harrys Ravalomanana
|
4671f5948c
|
merge branch
|
2019-07-15 18:32:54 +04:00 |
|
Harrys Ravalomanana
|
b590ae1c8a
|
PHRAS-2665
|
2019-07-15 18:30:37 +04:00 |
|
Nicolas Maillat
|
c4ea7e3160
|
Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
|
2019-07-15 16:10:49 +02:00 |
|
Nicolas Maillat
|
5e2f8da2bb
|
Merge pull request #3097 from HRavalomanana/PHRAS-2621-Define_cover_subdef_for_audio_type
PRHAS-2621 #comment merge update embed-bundle and configuration.yml
|
2019-07-15 15:40:41 +02:00 |
|
Harrys Ravalomanana
|
d02f8f5a01
|
PHRAS-2665 #comment Fix video tool ratio #time 8h
|
2019-07-12 18:06:01 +04:00 |
|
Harrys Ravalomanana
|
e38dd3c645
|
PRHAS-2621 #comment update embed-bundle and configuration.yml
|
2019-07-11 17:49:59 +04:00 |
|
Nicolas Maillat
|
1868d4368f
|
Merge pull request #3096 from aynsix/PHRAS-2660-api-stories-enhancement
PHRAS-2660 #comment merge api stories routes enhancement
|
2019-07-11 12:34:07 +02:00 |
|
aina-esokia
|
cd3995382c
|
take account all record type for story cover
|
2019-07-11 11:31:41 +04:00 |
|
aina-esokia
|
fe48e8a305
|
api stories add cover source
|
2019-07-10 14:26:34 +04:00 |
|
Nicolas Maillat
|
e1af9a1989
|
Merge pull request #3095 from HRavalomanana/PHRAS-2656-Prod-Editing-fix-tab-key-accessibility
PHRAS-2656 #comment merge update Phraseanet production client version in package.json and yarn.lock
|
2019-07-10 09:35:54 +02:00 |
|
Harrys Ravalomanana
|
29cac8af1f
|
PHRAS-2656 update package.json for the fix
|
2019-07-09 16:04:04 +04:00 |
|
Nicolas Maillat
|
0218816bf6
|
Merge pull request #3094 from HRavalomanana/PHRAS-2544-upgrade-phraseanet-production-client
PHRAS-2544 #comment upgrade phraseanet-production-client to 0.34.52-d
|
2019-07-05 16:11:33 +02:00 |
|
Nicolas Maillat
|
c47348c3b2
|
Merge branch 'master' into PHRAS-2544-upgrade-phraseanet-production-client
|
2019-07-05 15:42:27 +02:00 |
|
Nicolas Maillat
|
8949f53254
|
Merge pull request #3090 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors
PHRAS-2544 #comment merge update fix on grey and white theme
|
2019-07-05 15:41:54 +02:00 |
|
Harrys Ravalomanana
|
dbf653badf
|
PHRAS-2455 #comment upgrade phraseanet-production-client to 0.34.52-d
|
2019-07-05 17:18:12 +04:00 |
|
Nicolas Maillat
|
6147cd62f8
|
Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors
|
2019-07-05 15:15:14 +02:00 |
|
jygaulier
|
4a55ad2dd4
|
Merge pull request #3093 from aynsix/PHRAS-2654-field-no-source
PHRAS-2654 : Port to 4.1 Fields "Phraseanet::no-source" are pushed to exiftool
|
2019-07-05 11:03:10 +02:00 |
|
aina-esokia
|
a11e230ded
|
port fix field no-source not pushed to writer
|
2019-07-05 12:16:12 +04:00 |
|
Harrys Ravalomanana
|
273bfa563d
|
Merge of master branch
|
2019-07-03 15:37:42 +04:00 |
|
Harrys Ravalomanana
|
4902620347
|
PHRAS-2544 #comment save skin preference #time 1h
|
2019-07-03 15:33:23 +04:00 |
|