hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-19 07:53:14 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,662 Commits 268 Branches 107 Tags
27433c769fbb5281b17247da99d8ac01c68ffa93
Commit Graph

8121 Commits

Author SHA1 Message Date
Nicolas Maillat
e709896e58 PHRAS-1890 change audio codec for videopreview 2020-06-07 21:05:25 +02:00
aynsix
1a0670fa33 change default nbr process to 1, and remove unused code 2020-06-05 18:10:28 +03:00
Nicolas Maillat
bde15c74a6 Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master 2020-06-05 14:26:21 +02:00
Nicolas Maillat
23a58748e2 Merge branch 'master' into PHRAS-3107-tools-rebuildsubdef-issue 2020-06-05 12:35:01 +02:00
jygaulier
ce09e3226e Merge branch 'master' into PHRAS-3092_api-setmetadats-v3_master 2020-06-04 21:54:12 +02:00
jygaulier
0b099878f5 OK to test 2020-06-04 20:54:21 +02:00
jygaulier
cdadb3acc4 WIP 
refacto common code
 2020-06-04 14:08:08 +02:00
aynsix
7ea8e95549 remove unused webhook subdef_count 2020-06-04 12:02:52 +03:00
Nicolas Maillat
d43ab78dfc Merge branch 'master' into PHRAS-3107-tools-rebuildsubdef-issue 2020-06-04 10:40:31 +02:00
aynsix
da2ce2471a webhook privacy 2020-06-04 10:50:26 +03:00
jygaulier
9272f3642f WIP 
refacto : explode v3 controller, fix warnings
 2020-06-03 20:32:10 +02:00
aynsix
952388aba1 add espace 2020-06-03 17:55:39 +03:00
aynsix
1057cb0493 fix issuee whe trying to rebuild subdef from tool 2020-06-03 17:52:21 +03:00
jygaulier
aeb7b4e60b WIP 
fix ; add errors catch
todo :
- status-bits
- apply changes to record
- json output
 2020-06-03 12:48:13 +02:00
aynsix
a007b8dbb3 fix xml content 2020-06-03 10:33:22 +03:00
aynsix
3a8b99bf67 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet 2020-06-03 10:31:26 +03:00
Nicolas Maillat
19d0d1901b PHRAS-3120 fix storage file path for subview 
fix for audiovideowav and audiovideomp3
 2020-06-03 01:49:46 +02:00
jygaulier
b67c37c340 WIP 2020-06-02 20:26:30 +02:00
Nicolas Maillat
b1511db777 Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet 2020-05-29 15:49:46 +02:00
Nicolas Maillat
bd7635b781 Merge branch 'master' into PHRAS-3091-search-on-contains-operator 2020-05-29 12:17:44 +02:00
Nicolas Maillat
3ea40f113c Merge branch 'master' into PHRAS-3088-mysql-gone-away 2020-05-29 11:55:29 +02:00
aynsix
92502d8caa search user on like %...% 2020-05-29 11:25:37 +03:00
nmaillat
bdd0032ed5 PHRAS-3009 #comment add audio preview in dublincore model 2020-05-29 01:35:30 +02:00
Nicolas Maillat
501811db37 Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose 2020-05-29 00:46:01 +02:00
aynsix
24261483d7 catch exception on the worker 2020-05-28 20:29:15 +03:00
aynsix
50f016ebb5 fix mysql server gone away and dead lock on table 2020-05-27 19:55:45 +03:00
Nicolas Maillat
2f1b90ad00 Merge branch 'master' into PHRAS-3081-sqllite-db-to-appbox 2020-05-27 14:51:42 +02:00
aynsix
71cc21bb43 custom link section 2020-05-27 11:27:18 +03:00
Nicolas Maillat
7696dfb610 Merge branch 'master' into PHRAS-1890_Add-GS1-databases-model-to-Phraseanet 2020-05-27 10:25:11 +02:00
aynsix
1f1a2e9aa1 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3034-geoloc-video-timeout-patch 2020-05-27 09:55:13 +03:00
aynsix
ba4d3677aa reverse column in admin 2020-05-27 09:48:48 +03:00
aynsix
0aa4864b9a fix 2020-05-26 20:10:42 +03:00
aynsix
7e88bb236e delete unused config class 2020-05-26 19:38:27 +03:00
aynsix
d25da3ee0c remove sqllite db , add finished colomn 2020-05-26 19:35:33 +03:00
Nicolas Maillat
c3883d6b6b Merge branch 'master' into PHRAS-2393-archive-task-improvement 2020-05-25 18:53:58 +02:00
Harrys Ravalomanana
c9e448d8fa PHRAS-3082 Add string translation 2020-05-25 11:51:11 +04:00
aynsix
a0521c59fc port to 4.1 archive task improvement 2020-05-22 12:24:19 +03:00
Nicolas Maillat
9e17f22683 Merge branch 'master' into PHRAS-3034-geoloc-video-timeout-patch 2020-05-21 01:05:43 +02:00
Harrys Ravalomanana
fdfb4122d5 PHRAS-3073 #comment add basket preference + display doc type #comment 3h 2020-05-20 19:20:59 +04:00
aynsix
7a3f74d256 fix conf timeout and patch geoloc binaries video editor 2020-05-20 17:06:29 +03:00
Nicolas Maillat
24cde66ea0 Merge branch 'master' into PHRAS-3057-worker-in-core-4-1 2020-05-20 01:10:41 +02:00
Nicolas Maillat
6615fe6722 Update TwigServiceProvider.php 2020-05-19 23:26:29 +02:00
Nicolas Maillat
50d70ffda3 Bigger icon for url link 2020-05-19 23:23:22 +02:00
Nicolas Maillat
824c6bac61 Update TwigServiceProvider.php 2020-05-19 23:10:01 +02:00
jygaulier
5ff6f3365b better regex, not 100% url strict but ok enough 2020-05-19 18:20:35 +02:00
aynsix
77311ed7f6 fix refresh working tab 2020-05-19 17:45:16 +03:00
aynsix
8e7537e0ae fix pull assets mode 2020-05-19 17:41:38 +03:00
aynsix
b2bb0c612e fix api upload/enqueue 2020-05-19 15:42:02 +03:00
aynsix
bfb2b7723a refresh working info 2020-05-18 17:38:04 +03:00
Nicolas Maillat
8ff6e5f16d Merge branch 'master' into PHRAS-3049_more_setup_in_docker-compose 2020-05-18 14:20:53 +02:00