hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 23:43:12 +00:00
Code Issues Packages Projects Releases Wiki Activity
17,146 Commits 268 Branches 107 Tags
PHRAS-4131-set-order-add-loader
Commit Graph

8800 Commits

Author SHA1 Message Date
aynsix
4092a054d9 test 2021-11-24 10:48:24 +03:00
aynsix
aa1b6bc830 add unit test 2021-11-23 18:24:52 +03:00
aynsix
f23721809a filter on record status bit 2021-11-22 14:23:12 +03:00
aynsix
213dcd8597 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-11-22 09:43:52 +03:00
jygaulier
944e612c15 PHRAS-3580 
remove duplicate use
 2021-11-19 20:09:13 +01:00
jygaulier
9aae35ac83 Merge branch 'PHRAS-3580_watermarked-subdefs' of github.com:jygaulier/Phraseanet into PHRAS-3580_watermarked-subdefs 2021-11-19 19:57:03 +01:00
jygaulier
f4a6969f98 PHRAS-3580 
arial.ttf was moved in resources
 2021-11-19 19:13:21 +01:00
jygaulier
e487553d9c PHRAS-3580 WIP 
new "watermark text" setting to subdef
 2021-11-19 19:13:21 +01:00
jygaulier
8d49800c73 PHRAS-3580 WIP 
simple wmak is applied (cross ; no text)
[ci skip]
 2021-11-19 19:13:20 +01:00
jygaulier
027e26e63e PHRAS-3580 WIP 
add wmak checkbox
[ci skip]
 2021-11-19 19:10:01 +01:00
jygaulier
fee4d299c3 Merge branch 'master' into PHRAS-3580_watermarked-subdefs 2021-11-19 18:54:48 +01:00
Nicolas Maillat
e1f0c14107 Merge branch 'master' into PHRAS-3564_subdef-service-api_v2 2021-11-19 16:10:44 +01:00
aynsix
6ed0ea2b31 patch for older event 2021-11-19 16:29:54 +03:00
aynsix
7551273b1d add api-subdef_service config to enable/disable this endpoint 2021-11-19 10:43:40 +03:00
aynsix
8724eca9ae test 2021-11-18 14:53:03 +03:00
aynsix
bf8edf2d15 test 2021-11-18 14:39:35 +03:00
aynsix
c3bd1c498d test 2021-11-18 11:14:22 +03:00
aynsix
62f751d886 add user.created webhook, merge user type 2021-11-17 17:55:10 +03:00
Arthur de Moulins
8bbdfe07ee PHRAS-3564 fail fast, turn off ssl verification 2021-11-17 15:16:24 +01:00
jygaulier
ac3aa6e1ba PHRAS-3564 
fix video work location
subdefs posted
result set with sent/failed & durations
add test callback route
 2021-11-17 15:16:24 +01:00
jygaulier
10127a21b1 PHRAS-3564 WIP 
wip
 2021-11-17 15:16:24 +01:00
jygaulier
0553f6152c PHRAS-3564 WIP 
create subdefs (on tmp) from file passed as upload or reference
route /api/v3/subdefs_service/{{base_id}}
subdef setttings comes from base_id
todo : pass settings in json ; remove base_id from route
todo : return files by upload
 2021-11-17 15:16:24 +01:00
jygaulier
36ce3905d1 Merge branch 'master' into PHRAS-3583_sort-on-dates 2021-11-16 21:56:50 +01:00
jygaulier
ce3a28b5cd PHRAS-3583 
define a custom "sort" analyzer (whole value, lowercase, no diacritics)
fix sort by type (string/date/number)
fix sort on business fields (use "private_caption.field")
sort string fields on ".sort" sub-value (in place of ".raw")
add option for docker/es to activate scripting on search (disabled for now)
 2021-11-16 20:52:54 +01:00
aynsix
419d74b120 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-11-16 17:42:34 +03:00
aynsix
074920353a PHRAS-3555 add more webhook events 2021-11-16 17:15:49 +03:00
jygaulier
a43b94684e PHRAS-3583 
add missing "raw" mapping values to date & numbers
 2021-11-15 18:55:03 +01:00
jygaulier
494f9a0e39 PHRAS-3580 
arial.ttf was moved in resources
 2021-11-15 17:10:27 +01:00
jygaulier
a56a56c272 PHRAS-3580 WIP 
new "watermark text" setting to subdef
 2021-11-15 17:10:27 +01:00
jygaulier
951fd22cec PHRAS-3580 WIP 
simple wmak is applied (cross ; no text)
[ci skip]
 2021-11-15 17:10:27 +01:00
jygaulier
d5a2e8fafd PHRAS-3580 WIP 
add wmak checkbox
[ci skip]
 2021-11-15 17:10:27 +01:00
Nicolas Maillat
6d63c28059 Merge branch 'master' into PHRAS-3519_filesystem-atomic-move 2021-11-15 14:18:14 +01:00
Nicolas Maillat
41726407d0 Merge branch 'master' into PHRAS-3519_filesystem-atomic-move 2021-11-15 09:31:38 +01:00
Nicolas Maillat
f09071d99f Merge branch 'master' into PHRAS-3413-webhook-emit-timeout 2021-11-12 18:38:11 +01:00
aynsix
b203417340 PHRAS-3581 search buton redirect on home when expire session 2021-11-09 17:41:14 +03:00
aynsix
c12cefa028 PHRAS-3468 remove logs trace 2021-11-09 10:51:49 +03:00
aynsix
a186068b07 PHRAS-3413 add timeout when emit webhook 2021-11-08 16:51:11 +03:00
Nicolas Maillat
9f997c6a63 Merge branch 'master' into PHRAS-3519_filesystem-atomic-move 2021-11-08 13:48:59 +01:00
Nicolas Maillat
040c29c704 Merge branch 'master' into PHRAS-3166-webhook-tables-maintains-value 2021-11-03 13:03:46 +01:00
Nicolas Maillat
5ed9210ead Merge branch 'master' into PHRAS-3519_filesystem-atomic-move 2021-11-03 13:01:52 +01:00
jygaulier
b8ad17b7f7 Update Step31.php 
fix typo
 2021-11-02 14:26:23 +01:00
Nicolas Maillat
d51270de79 Merge branch 'master' into PHRAS-3565-fix-geoname-confirm-modal 2021-10-22 19:06:03 +02:00
aynsix
45d48f2b9e remove space 2021-10-22 14:28:58 +03:00
aynsix
84b555dc2b PHRAS-3567 fix worker log 2021-10-22 11:48:49 +03:00
aynsix
f44e3493f2 add version in css file 
change jsFileVersion to assetFileVersion
 2021-10-21 12:04:38 +03:00
aynsix
a2dcbe3b0c PHRAS-3565 fix geoname confirm modal 2021-10-20 14:55:03 +03:00
aynsix
8d524a8512 enable webhook by proxy 2021-10-19 11:21:14 +03:00
aynsix
eb9e87c1f4 fix webhook 2021-10-18 16:53:49 +03:00
jygaulier
d1d5873463 Merge branch 'master' into PHRAS-3519_filesystem-atomic-move 2021-10-18 11:10:51 +02:00
Nicolas Maillat
b0abd5d54f Merge branch 'master' into PHRAS-3544_invalidate-stamp 2021-10-15 16:36:44 +02:00