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

18 Commits

Author SHA1 Message Date
jygaulier
07f4462672 PHRAS-3520_stamper-enhance (#4385) 
* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.

* fix test

* WIP DO NOT MERGE
add: stamp subdefs of class "preview"
apply watermark on stamped subdef (cache to be fixed)
fix: admin/collection settings (new ux, clean xml)

* conf.export_stamp_choice now supports 'manage_collection' and 'manage_databox' (and bc true) to restrict right to remove stamp.

* fix test

* fix compatibility with download-async ; add registry/actions/stamp-subdefs=false to conf
 2023-11-22 12:30:55 +01:00
jygaulier
fbd6658f94 PHRAS-3499_stamper-in-download-worker 
- for download by email, stamp is done by the worker (not by the prod controller)
- add "no-stamp" checkbox on download dlg (port from PHRAS-424)
- todo : add "no-stamp" to download-by-email dlg.
- todo ? apply stamp for download-by-ftp
 2021-08-09 20:12:11 +02:00
jygaulier
e5d55326a3 PHRAS-3489_order-from-parade-late-deadline 
fix : align createtime and deadtime by using the same method (store in mysql converted to utc)
 2021-07-22 17:41:16 +02:00
aynsix
51b10b6bec add php modification 2020-04-02 14:56:27 +03:00
aynsix
e74fb4b877 change zip archive creation directory (#2650) 2018-06-20 11:24:07 +02:00
Thibaud Fabre
97f2e66698 Merge 4.0 branch 2016-12-05 17:04:54 +01:00
Thibaud Fabre
b5bbb1851f Merge branch 4.0 2016-12-05 15:26:48 +01:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Thibaud Fabre
13c71fd38d PHRAS-1275 Fix temporary order archive name 2016-10-25 13:58:55 +02:00
Thibaud Fabre
199b5b1c46 Inject base order controller dependencies 2016-10-25 13:55:34 +02:00
Thibaud Fabre
2ad49979e4 Remove debug line 2016-05-23 17:59:02 +02:00
Thibaud Fabre
cf684cdeca Fix archive download via API 2016-05-23 17:54:40 +02:00
Benoît Burnichon
2547ef14fa Add Archive download to Api v2 orders 2016-05-20 13:16:41 +02:00
Thibaud Fabre
14e1e412bb Fix access control condition 2016-05-18 16:28:27 +02:00
Thibaud Fabre
c4843b6aad Allow access to all orders via API to admins 2016-05-18 15:35:56 +02:00
Thibaud Fabre
1a65e8269e Change default notification method for order creation via API 2016-05-12 14:48:03 +02:00
Thibaud Fabre
579293c636 PHRAS-1091 Pass view instead of order to transformer 2016-04-26 15:38:38 +02:00
Benoît Burnichon
1e18b3e69f This is a combination of 33 commits. 
- Squashed Pull request #1730
- Squashed Pull request #1741
- Squashed Pull request #1742
- Squash merge branch 4.0
- Squashed Pull request #1744
- Squashed Pull request #1746
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed merge branch 4.0
- Squashed Pull request #1758
- Avoid using imagine/imagine alias as it is causing install issues
- Squashed merge branch 4.0
- Squashed Pull request #1763
- Squashed merge branch 4.0
- Squash of 6 commits
- Squashed merge branch 4.0
- This is a combination of 2 commits.
- Squashed Pull request #1775
- Squashed Pull request #1777
- Squashed Pull request #1779
- Squashed Pull request #1780
- Squashed Pull request #1782
- Adds a Pull request template
- Squased Pull request #1783
- Squash Pull request #1786
- Squashed Pull request #1796
- Squashed merge branch 4.0
- Squash Pull request #1791
- Squashed merge branch 4.0
- Squashed Pull request #1808
- Squashed Pull request #1811
- Squashed Pull request #1809
 2016-04-20 16:22:14 +02:00