Code

PHRAS-3520_stamper-enhance#4385

Code

Merged

nmaillat merged 14 commits intomasteralchemy-fr/Phraseanet:masterfrom PHRAS-3520_stamper-enhancealchemy-fr/Phraseanet:PHRAS-3520_stamper-enhanceCopy head branch name to clipboardNov 22, 2023

+705-830

Commits

Commits on Oct 4, 2023

• WIP DO NOT MERGE

  Show description for ea8f95a
  jygaulier

  committed
  ea8f95a

Commits on Oct 16, 2023

• Merge branch 'master' into PHRAS-3520_stamper-enhance

  jygaulier

  authored
  35a6991

Commits on Oct 23, 2023

• WIP DO NOT MERGE

  Show description for c0fcd60
  jygaulier

  committed
  c0fcd60

• Merge branch 'master' into PHRAS-3520_stamper-enhance

  jygaulier

  authored
  8f4732b

• Merge branch 'PHRAS-3520_stamper-enhance' of github.com:alchemy-fr/Phraseanet into PHRAS-3520_stamper-enhance

  jygaulier

  committed
  e26e5de

Commits on Oct 25, 2023

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

  jygaulier

  committed
  7a33a2d

• fix test

  jygaulier

  committed
  d3a46f2

Commits on Nov 15, 2023

• WIP DO NOT MERGE

  Show description for e5c08eb
  jygaulier

  committed
  e5c08eb

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

  jygaulier

  committed
  fd7d09c

• fix test

  jygaulier

  committed
  ac1267f

Commits on Nov 16, 2023

• fix compatibility with download-async ; add registry/actions/stamp-subdefs=false to conf

  jygaulier

  committed
  aabe43c

• fix conflicts after pull

  jygaulier

  committed
  8d6bba9

Commits on Nov 20, 2023

• Merge branch 'master' into PHRAS-3520_stamper-enhance

  jygaulier

  authored
  08fd9db

Commits on Nov 22, 2023

• Merge branch 'master' into PHRAS-3520_stamper-enhance

  nmaillat

  authored
  812d06d