hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,644 Commits 268 Branches 107 Tags
6fb6f047f482a25bb555ddfc1d1218bb5aa1738c
Commit Graph

2288 Commits

Author SHA1 Message Date
Aina Sitraka
6fb6f047f4 PHRAS-3669 A story can refer record-id's from another dbox (#4014) 
* fix creation story

* update version js

* fix

* fix delete story

* add alert if multiple databox

* fix create story

* block create story from different databox

* disable checkbox on multiple databox
 2022-05-12 15:47:11 +02:00
jygaulier
f967588251 PHRAS-3667_refresh-one-basket WIP (#4012) 
* PHRAS-3667_refresh-one-basket
- new "wip" icon
- deploying a basket refreshes icons
todo:
- refreh also when closing ?
- refresh on notification about "share ok" ?
- refresh after real-time op (e.g. share a simple basket ==> wip) ?

* PHRAS-3667 : try to move wz/basket menus (failed)

* PHRAS-3667_refresh-one-basket
- fix : stories deployed looks empty
 2022-05-11 11:24:45 +02:00
Aina Sitraka
f004015f64 PHRAS-3662 Share Basket fix GUI - icons color and behavior (#4007) 
* fix some display icon

* update translation

* fix icon size

* fix context color, set order

* remove search background

* change color share, refresh workzone

* fix icon active

* remove ccs from js file

* remove css in js file

* fix
 2022-04-28 12:11:55 +02:00
Aina Sitraka
cf8234670a PHRAS-3662 Prod - shared basket - fix icon in detailed view and action bar (#4006) 
PHRAS-3662
* fix icon shared basket

* fix icon

* fix string and icon

* fix icon for right on share

* fix double icon in detailed view

Co-authored-by: jygaulier <gaulier@alchemy.fr>
 2022-04-15 12:20:59 +02:00
jygaulier
fbccec009e PHRAS-3602_shared-baskets-step1 WIP DO NOT MERGE (#3929) 
* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : migrate validations code to baskets code (wip)
WIP [skip ci]

* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : migrate validations to baskets
WIP [skip ci]

* PHRAS-3602 : fake commit to run tests

* PHRAS-3602 : migrate validations to baskets
fix typo

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests

* PHRAS-3602 : migrate validations to baskets
fixed (some) tests. need to remove method():return_type signature because of old phpunit which does not mock it

* PHRAS-3602 : migrate validations to baskets
fix

* PHRAS-3602 : migrate validations to baskets
fix err 500 when a "vote" (feedback) is deployed in wz

* PHRAS-3602 : migrate validations to baskets
fix missing votes for element+participant
fix update vote dates on basket

* PHRAS-3602 : ux
bump production-client to 34
WIP [skip ci]

* PHRAS-3602 : rebase (bump production-client to 37)
WIP [skip ci]

* PHRAS-3602 : refacto css/twig/templates/... ; replace many png's by fonts
WIP [skip ci]

* PHRAS-3602 : fix icon / css
WIP

* PHRAS-3602 : better icon align ; back button color
fix : save button after adding a user
WIP [skip ci]

* PHRAS-3602 : restore sharebasket controller
todo : implement modification right ; owner is participant ?
WIP [skip ci]

* PHRAS-3602 : set "canModifiy" ; cleanup
WIP [skip ci]

* PHRAS-3602 : respect "can_modify" on shared basket
WIP [skip ci]

* PHRAS-3602 : fix badge icon bg ; fix button css
WIP [skip ci]

* PHRAS-3602 : fix css & cleanup
WIP [skip ci]

* PHRAS-3602 : fix 500 on preview/feedback tab
WIP [skip ci]

* PHRAS-3602 : fix allow to display dlg without selection

* PHRAS-3602 : bump version to 4.1.6-rc1 ; prodclient=38
WIP [skip ci]

* PHRAS-3602 : factorize baskets menu (wip)
WIP [skip ci]

* PHRAS-3602 : modify already shared or feedback basket (general menu)
4th icon on badges (vote != modify)
quitshare option (todo back)
allow fa-icons in toolbar

WIP [skip ci]

* PHRAS-3602 : add share end-date (todo:db write)
add 4th general toggle button
fix badge selection bug
fix css badges zone (form position)
WIP [skip ci]

* PHRAS-3602 : big refacto to use "sharebasket" vocab.
fusion "feedback/sharebasket" removed "feedback"
adaptative ux: 1 "can_agree" ==> feedback display
bump production-client to v50
todo: save shr/fbk end-dates
todo: rename "pushXXX" to pushAndShare ?
WIP [skip ci]

* PHRAS-3602 : share / feedback expiration dates are saved in db
date pickers with delta menu
better adaptive ux
todo: move select general togglers
WIP [skip ci]

* PHRAS-3602 : revert validation* tables (remove "dead" rename)
drop all foreign keys from validation*
WIP [skip ci]

* PHRAS-3602 : restore deleted fields in validation, regenerate proxies
WIP [skip ci]

* PHRAS-3602 : fix initiator_id
WIP [skip ci]

* fix initiator_id-bis

* PHRAS-3602 : css for input-text with glued button
dynamic load of users-lists (left zone) = less duplicated code
fix : users-lists  works after refresh
WIP [skip ci]

* PHRAS-3602 : fix users-lists manager (orange) : go flex !

* PHRAS-3602 : empty dist to ease rebase
WIP [skip ci]

* PHRAS-3602 : rebase
WIP [skip ci]

* PHRAS-3602 : new ux for "owner"
feedback mode is an independent toggle
fix "missing mandatory parameter"
WIP [skip ci]

* PHRAS-3602 : fix css of owner badge
WIP [skip ci]

* PHRAS-3602 : fix handling of feedback initiator
WIP [skip ci]

* PHRAS-3602 : better wss to follow "skins"
full roboto
removed useless class "with-button"
WIP [skip ci]

* PHRAS-3602 : fix "a token require a validation"
temporary fix 500 due to send email to (null) vote-initiator for simple share
todo: send a specific email for simple share
WIP [skip ci]

* PHRAS-3602 : different emails depending if user can vote or not
WIP [skip ci]

* PHRAS-3602 : expired shared baskets removed from wz
WIP [skip ci]

* PHRAS-3602 : fix logic error on last sql
WIP [skip ci]

* PHRAS-3602 : fix missing shared baskets on wz
WIP [skip ci]

* PHRAS-3602 : fix blinking of wz/basket detail
now only the title:hover displays detail
WIP [skip ci]

* PHRAS-3602 : rebase
WIP [skip ci]

* PHRAS-3602 : update basket proxy
WIP [skip ci]

* PHRAS-3602 : fix forever "unread" basket
WIP [skip ci]

* PHRAS-3602 : fix display of unread basket ; sync "eye" icon with css change
WIP [skip ci]

* PHRAS-3602 : "quitshare" action works
WIP [skip ci]

* PHRAS-3602 : missing dist files
WIP [skip ci]

* PHRAS-3602 : cleanup & run ci

* PHRAS-3602 : disable failing unit test ; remove blue on onread basket

* PHRAS-3602 : separate "vote" & "share" emails templates & u-tests

* PHRAS-3602 : add 2 icons "stack" to icomoon set
WIP [skip ci]

* PHRAS-3602 : fix test

* PHRAS-3602 : fix test ; add test for simple share email notification

* PHRAS-3602 : changed proxy

* PHRAS-3602 : colored basket icons
WIP [skip ci]

* PHRAS-3602 : circle basket icons
WIP [skip ci]

* PHRAS-3602 : fix wz filters, add "share" filter.
todo: fix fr writing (new string)
WIP [skip ci]

* PHRAS-3602 : fix "share" dichotomy : use "shared" for wz filter
WIP [skip ci]

* PHRAS-3602 : fix PHRAS-3624 ; PHRAS-3623 ; now adding/removing a user from user list is immediate (no more save button)
WIP [skip ci]

* PHRAS-3602 : fix PHRAS-3647 ; shared basket are listed in api (for list and related record)

* PHRAS-3602 : fix due to failing test

* PHRAS-3602 : fix: can load a 1000 users list
todo : move slow code to worker

* PHRAS-3602 : fix due to failing test

* PHRAS-3468 : (fixed in 3602) fix basket content still visible when baskets are hidden (wz-filter)

* PHRAS-3602 : add "wip" baskets with notification & lock
todo : move slow code from message to worker

* PHRAS-3602 : fix tests due to accidental rename

* PHRAS-3602 : fix : menu closes when mouse out : bump to 4.1.6-rc3
todo : fast move to another basket makes the menu appear on top ?

* add shareBasket worker

* fix test

* PHRAS-3602 : fix : rights buttons on badges now works for users added from search (did work only from loading list)

* PHRAS-3590

Co-authored-by: aynsix <asr@esokia-webagency.com>
Co-authored-by: Nicolas Maillat <maillat@alchemy.fr>
 2022-04-07 17:07:43 +02:00
Aina Sitraka
ab1ef68af2 PHRAS-3223 Admin - user details - display AuthFailure and Authprovider info (#4002) 
PHRAS-3223
* add auth failure tab

* auth provider list

* api oauth code list

* fix limit

* delete modificaiton date

* add mail locked only filter

* add badge on api list
 2022-04-06 10:45:49 +02:00
aynsix
4bb577cf42 fix search filter and export 2022-03-16 18:41:58 +03:00
Nicolas Maillat
bdcbd7c0e0 Revert " "PHRAS-3215 : Revert add ThumbnailOrientation facet ; add strings"" 2022-03-08 11:49:36 +01:00
Nicolas Maillat
ccd460be27 Revert "PHRAS-3215 : add ThumbnailOrientation facet ; add strings" 2022-02-25 23:10:23 +01:00
Nicolas Maillat
a11d11b5b5 Merge branch 'master' into PHRAS-3215_orientation-facet-of-thumbnail 2022-02-25 17:43:57 +01:00
jygaulier
406a0ce953 PHRAS-3602 : add ThumbnailOrientation facet ; add strings 2022-02-25 10:11:49 +01:00
aynsix
e882021019 PHRAS-3642 api return subdefs 2022-02-24 16:07:54 +03:00
aynsix
dd337e0ecb merge master into branch 2022-02-15 12:17:49 +03:00
aynsix
652934f948 merge master into branch 2022-02-14 18:15:55 +03:00
Nicolas Maillat
7c23576b45 Merge branch 'master' into PHRAS-3631-read-all-notifications 2022-02-14 16:06:57 +01:00
aynsix
6d3510b8f2 title as pdf name 2022-02-11 12:15:31 +03:00
aynsix
10ef15964f mark all notification as read 2022-02-10 17:23:01 +03:00
aynsix
f22eed2783 add option filename when download check 2022-02-08 16:14:26 +03:00
aynsix
518d2d94ff use the guzzle 6 version 2022-02-07 17:29:30 +03:00
aynsix
f7fbec3cf7 some improvement 2022-02-04 16:16:20 +03:00
aynsix
b52fdddb2b select subdef to download 2022-01-31 19:56:55 +03:00
Nicolas Maillat
4423eceb9a Merge branch 'master' into PHRAS-3595-publication-notification 2022-01-31 16:45:34 +01:00
aynsix
94a9a37569 subdef mapping 2022-01-31 17:07:34 +03:00
aynsix
0c5b9f1d42 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3633-customable-title-message 2022-01-28 17:54:51 +03:00
aynsix
8f915f322e add some options 2022-01-27 19:12:34 +03:00
aynsix
f9aaec1e49 PHRAS-3633 add tittle and message on print 2022-01-25 16:24:51 +03:00
aynsix
c4c6cb25c3 fix path when creating subdef 2022-01-06 17:56:53 +03:00
aynsix
1798dfdff8 PHRAS-3595 can notify email on update 2021-12-10 11:35:29 +03:00
Nicolas Maillat
e39d4769cf Merge branch 'master' into PHRAS-3555-description-record-edit-webhook 2021-12-07 14:50:45 +01:00
aynsix
cb206c79bf PHRAS-3555 add description in record.edit webhook 2021-12-07 15:24:58 +03:00
Nicolas Maillat
ad922e660b Merge branch 'master' into PHRAS-3598-webhook-emit-improvement 2021-12-07 10:02:02 +01:00
aynsix
a14e15972b PHRAS-3598 taking account webhook active 2021-12-06 18:00:27 +03:00
jygaulier
e247c8b576 Merge branch 'master' into PHRAS-3582_missing-apiv3-data 2021-12-06 10:16:27 +01:00
Nicolas Maillat
8a32f16884 Merge branch 'master' into PHRAS-3584_story-cover-link 2021-12-03 16:11:22 +01:00
jygaulier
9fd6c50377 PHRAS-3582 
WIP
fix missing data on apiv3 stories (not implemented includes)
todo : check apiv1 "metadataS" (aka dublin core) output.
 2021-12-01 20:35:27 +01:00
jygaulier
038bdf20bd PHRAS-3584 
return "cover_record_id" into api/v1/stories/{{sbid}}/{{rid}}
 2021-12-01 12:17:10 +01:00
jygaulier
ac78153f46 Merge branch 'PHRAS-3584_story-cover-link' of github.com:alchemy-fr/Phraseanet into PHRAS-3584_story-cover-link 2021-11-30 17:06:15 +01:00
jygaulier
37e42d049c PHRAS-3584 
fix api/v1/.../setcover ("Sub definition substituer locator was not set")
original ticket #PHRAS-3592
 2021-11-30 17:04:13 +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
jygaulier
623d087a44 Merge branch 'master' into PHRAS-3584_story-cover-link 2021-11-26 12:08:35 +01: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
jygaulier
12cb9b582b PHRAS-3584 
add databox.record.cover_record_id
add get/set coverRecordId() to record adapter
include cover_record_id to api results (V1 & V3)
 2021-11-25 11:52:11 +01: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
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
aynsix
074920353a PHRAS-3555 add more webhook events 2021-11-16 17:15:49 +03:00