hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-15 05:53:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,257 Commits 268 Branches 107 Tags
e591125e83cbbf09dd6d2dd73a19cb3ee758e40c
Commit Graph

16257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aynsix
e591125e83 just use feed publisher on feed_entry 2021-12-03 16:20:57 +03:00
aynsix
10ac663f87 fix base_id 2021-12-03 14:59:26 +03:00
aynsix
77cc1f5481 PHRAS-3562 2021-12-03 14:55:40 +03:00
aynsix
5de5b0ae66 fix collection id 2021-12-03 10:32:35 +03:00
aynsix
f51bbca169 add statusbefore and newstatus data 2021-12-02 18:10:35 +03:00
aynsix
dbca0718b5 add some element in message 2021-12-02 16:50:09 +03:00
aynsix
2f93504ac5 PHRAS-3595 2021-12-02 16:35:22 +03:00
aynsix
b0458893fd PHRAS-3597 2021-12-02 16:33:36 +03:00
aynsix
164c9fcd9a PHRAS-3598 2021-12-02 16:31:49 +03:00
aynsix
2af1fe7bbe PHRAS-3599 2021-12-02 16:29:08 +03:00
aynsix
b69b3c350d fix feed_entry right 2021-12-01 17:12:34 +03:00
aynsix
8be9b2134e fix right for webhook type user 2021-12-01 10:51:19 +03:00
aynsix
d940b06d41 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-12-01 09:44:23 +03:00
Nicolas Maillat
b59baf41d2 Merge pull request #3912 from alchemy-fr/PHRAS-3509-substitution-subdef-message-twice 
PHRAS-3509 Merge Prod - tools - document substitution - the generation message for sub-definition is published twice.
 2021-11-30 21:38:40 +01:00
aynsix
17c943f61e Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-11-30 16:33:41 +03:00
aynsix
f82597a45a fix duplicate subdef message 2021-11-30 15:01:59 +03:00
Nicolas Maillat
485bba35f7 Merge pull request #3910 from alchemy-fr/PHRAS-3519_filesystem-atomic-move_faster 
PHRAS-3519 merge filesystem atomic move  faster
 2021-11-29 17:10:28 +01:00
Nicolas Maillat
5a091973ce Merge branch 'master' into PHRAS-3519_filesystem-atomic-move_faster 2021-11-29 16:30:42 +01:00
Nicolas Maillat
d574bf7ccb Merge pull request #3908 from alchemy-fr/PHRAS-3519_filesystem-atomic-move-remove-delay 
PHRAS-3519 merge filesystem-atomic-move : remove delay
 2021-11-29 16:30:34 +01:00
jygaulier
a97a9ce5ad Merge branch 'master' into PHRAS-3519_filesystem-atomic-move-remove-delay 2021-11-29 16:16:28 +01:00
aynsix
60cce33915 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-11-29 13:48:46 +03:00
aynsix
462d0852db test 2021-11-26 16:30:00 +03:00
aynsix
7f4e6a3753 add some data to webhook 2021-11-26 15:56:51 +03:00
Nicolas Maillat
6cae3d2b44 Merge pull request #3911 from alchemy-fr/PHRAS-3564_subdef-service-api 
PHRAS-3564 
PHRAS-3564 

   Mapping from expected name (destination.subdefs/keys) to phr subdef name ("source") : Allows to ask for a subset of phr subdefs (see sample)
   Default will map all phr subdefs.

sample request (json raw body):

```
{
    "databoxId": 2,
    "source": {
        "url":"https://file-examples-com.github.io/uploads/2017/10/file_example_JPG_2500kB.jpg"
    },
    "destination": {
        "subdefs": {
            "thumbnail":  {
                "source": "thumbnail"
            },
            "preview": {
                "source": "preview"
            },
            "over": {
                "source": "preview_mobile"
            }
        },
        "url":"http://172.32.0.1:8082/api/v3/subdefs_service_callback/?oauth_token=xxxxxxx",
        "payload": {
            "text":"this is some text",
            "int":555
        },
        "filename":"asset_555_"
    }
}
```
output to subdefgenerator.txt :
```
2021-11-25T18:21:01 [818] : /var/alchemy/Phraseanet/lib/Alchemy/Phrasea/Controller/Api/V3/V3SubdefsServiceController.php (52); into callbackAction_POST with
 - file: "/tmp/php2x7G0P"
 - filesize: 74357
 - saved to: "/var/alchemy/Phraseanet/logs/asset_555_preview.jpg"
 - payload: array (
  'text' => 'this is some text',
  'int' => '555',
  'file_info' => 
  array (
    'filename' => 'asset_555_preview.jpg',
    'extension' => 'jpg',
    'name' => 'preview',
    'class' => 'preview',
    'filesize' => '74357',
    'build_duration' => '1.4797649383545',
  ),
)

2021-11-25T18:21:03 [749] : /var/alchemy/Phraseanet/lib/Alchemy/Phrasea/Controller/Api/V3/V3SubdefsServiceController.php (52); into callbackAction_POST with
 - file: "/tmp/phpDubmqE"
 - filesize: 10836
 - saved to: "/var/alchemy/Phraseanet/logs/asset_555_thumbnail.jpg"
 - payload: array (
  'text' => 'this is some text',
  'int' => '555',
  'file_info' => 
  array (
    'filename' => 'asset_555_thumbnail.jpg',
    'extension' => 'jpg',
    'name' => 'thumbnail',
    'class' => 'thumbnail',
    'filesize' => '10836',
    'build_duration' => '1.2976748943329',
  ),
)

2021-11-25T18:21:04 [741] : /var/alchemy/Phraseanet/lib/Alchemy/Phrasea/Controller/Api/V3/V3SubdefsServiceController.php (52); into callbackAction_POST with
 - file: "/tmp/phpReo3ZV"
 - filesize: 17495
 - saved to: "/var/alchemy/Phraseanet/logs/asset_555_over.jpg"
 - payload: array (
  'text' => 'this is some text',
  'int' => '555',
  'file_info' => 
  array (
    'filename' => 'asset_555_over.jpg',
    'extension' => 'jpg',
    'name' => 'preview_mobile',
    'class' => 'preview',
    'filesize' => '17495',
    'build_duration' => '1.0901601314545',
  ),
)
```
 2021-11-26 09:43:12 +01:00
aynsix
ddeed3b5fc update doctrine table schema before applying patch 2021-11-26 10:32:41 +03:00
jygaulier
fba12a64aa PHRAS-3564 
fix: wmark is applied
better internal callback
 2021-11-25 19:23:30 +01:00
jygaulier
a6f1d40517 PHRAS-3564 
WIP fix
 2021-11-25 17:24:15 +01:00
aynsix
4307903266 test 2021-11-25 17:44:56 +03:00
aynsix
cd8f6313f1 add restriction on specifq collection right 2021-11-25 17:23:53 +03:00
jygaulier
8f68f470e1 PHRAS-3519_filesystem-atomic-move : faster 
faster return of fs->exists() if file exists
 2021-11-25 14:51:29 +01:00
aynsix
9d0a01a58c Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3555-more-webhook 2021-11-25 16:40:40 +03:00
jygaulier
0fceee0471 PHRAS-3519_filesystem-atomic-move : remove delay 
remove delay to subdef->isStillAccessible() calling fs->exists().
because it's called by getsubdef(), any missing subdef will slow down phr by 10s. on every getsubdef() call.
 2021-11-24 18:40:01 +01:00
aynsix
fd60ffc38a test 2021-11-24 11:39:19 +03:00
aynsix
c770af86b2 test 2021-11-24 11:29:58 +03:00
aynsix
b0c136492a test 2021-11-24 11:20:08 +03:00
aynsix
ab5cf44278 test 2021-11-24 11:10:45 +03:00
aynsix
4092a054d9 test 2021-11-24 10:48:24 +03:00
aynsix
aa1b6bc830 add unit test 2021-11-23 18:24:52 +03:00
Nicolas Maillat
b2aa77d826 Merge pull request #3903 from jygaulier/PHRAS-3580_watermarked-subdefs 
PHRAS-3580 merge watermarked subdefs
 2021-11-22 17:52:13 +01: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
9c9bc02a5f Merge pull request #3906 from alchemy-fr/PHRAS-3564_subdef-service-api_v2 
PHRAS-3564 merge subdef service api_v2
 2021-11-19 16:47:30 +01:00
Nicolas Maillat
e1f0c14107 Merge branch 'master' into PHRAS-3564_subdef-service-api_v2 2021-11-19 16:10:44 +01:00