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

38 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
Aina Sitraka
2c819817f1 fix order create basket (#4401) 2023-10-30 15:41:23 +01:00
Aina Sitraka
b6a5f90fd3 PHRAS-3857 Check CSRF token on Prod and Admin forms (#4361) 
* csrf token form

* add csrf token

* add csrf

* add csrf

* add csrf

* test

* test

* test

* add form token in report

* csrf token upload

* lazaret csrf form

* upload test

* lazaret test

* add csrf token

* fix test

* fix set cover publication

---------

Co-authored-by: jygaulier <gaulier@alchemy.fr>
 2023-10-03 16:28:33 +02:00
Aina Sitraka
6ac72ec6c1 PHRAS-3848 prod - order manager - cancel an order (#4320) 
* cancel order

* bump version

* some fix
 2023-05-25 11:59:56 +02:00
Aina Sitraka
a892887dd2 PHRAS-3783 Prod - Order manager - add Download Expiration date (#4191) 
* add download expiration date

* add expiration info in mail

* add calendar on order-manager validation

* add a default config on patch if not exist

* fix

* add predifined expireon date

* expiration override

* fix order manager deny and sen in the same time

* patch for todo column

* bump version

record acl admin

fix pusher and date on order

* some improvement

* some fix
 2022-12-20 12:42:59 +01:00
Aina Sitraka
ccfcf24a3d PHRAS-1545 fix order manager view (#4061) 
* remove button on mail deny

display only order element that the order manager has right

fix string not translated

* do not send deny email

* update
 2022-06-21 10:23:30 +02: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
74e2724686 order webhook 2019-09-20 18:06:13 +04:00
aynsix
e74fb4b877 change zip archive creation directory (#2650) 2018-06-20 11:24:07 +02:00
Mike Ng
197612de7b implementation back-end for refactoring of orders 
refactoring layout order-box and order-item
 2017-08-17 14:42:10 +04: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
0c75189a64 PHRAS-508_acl-cache 
- refactor : acl strings changed to ACL class constants
 - code cleanup
 - wip but try to merge for bc break test
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
642da0fca5 PHRAS-508_acl-cache 
- wip
 2016-10-26 16:13:47 +02:00
Jean-Yves Gaulier
6a2285f66d 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
8a4bb74e21 ArrayCollection forAll mapping closure has index as first parameter 2016-05-20 15:20:40 +02:00
Thibaud Fabre
73a1f06aaa Merge pull request #1867 from bburnichon/feature/api_order_archive 
Add order download URL in API response
 2016-05-20 14:24:56 +02:00
Benoît Burnichon
2547ef14fa Add Archive download to Api v2 orders 2016-05-20 13:16:41 +02:00
Thibaud Fabre
1ba098fb2c Fix page offsets 2016-05-20 11:54:52 +02:00
Thibaud Fabre
3381d18b22 PHRAS-1107 Fix order pagination in repository 2016-05-19 19:00:47 +02:00
Florian BLOUET
a9754b04e7 PHRAS-1107 - fix frontend issues for orders pagination (button style and per-page parameter) 2016-05-19 17:38:59 +02:00
Benoît Burnichon
06eae4a4d2 Error in Assertion in OrderElement add 2016-05-19 13:44:01 +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
276b060c58 Add order validation notifier interface and mailer implementation 2016-04-28 16:41:26 +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
Benoît Burnichon
25745732b6 Fix OrderElement accept/deny todo count 2016-03-22 16:16:09 +01:00
Benoît Burnichon
79119fe10a some PHPCS fixing 2016-03-22 16:15:43 +01:00
Benoît Burnichon
83b8baa327 Reduce duplication for OrderController 2016-03-22 16:15:38 +01:00
Benoît Burnichon
a547a04aa6 Move Order controllers to same namespace 2016-03-22 16:14:08 +01:00