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

16644 Commits

This Branch
This Branch
All Branches
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
2b6cc0f43a fix print feedback report (#4015) 2022-05-09 16:11:55 +02:00
jygaulier
3de735cfb2 PHRAS-3673_ci-fails-phr-install (#4016) 
* PHRAS-3673 : (after ssh tryout) change localhost to 127.0.0.1

* PHRAS-3673 : change localhost to 127.0.0.1 in test install
 2022-05-09 14:50:04 +02:00
Nicolas Maillat
908f39d811 PHRAS-3602 Share Basket localization (#4011) 
PHRAS-3602 Share Basket  localization (#4011)
 2022-05-03 11:47:53 +02:00
Aina Sitraka
bbf5ef0d75 PROD - PRINT - PDF - Generated pdf cant be printed even if no password is defined (#4008) 
* fix password

* owner pass

* fix
 2022-04-28 17:22:05 +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
d256ff982b fix "Can't resolve '../../userslists/index'" 
commented not finished user lists access from toolbar.
to finish : commit missing file, tests
 2022-04-11 18:26:25 +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
e763201aaa PHRAS-3660 Migration patch for 4.1.6-rc2 (#4005) 
* patch 4.1.6-rc2

* changelog change

* change
4.1.6-rc2 		2022-04-07 15:39:32 +02:00
Nicolas Maillat
37bdeb9363 PHRAS-3223 merge translation 2022-04-06 19:51:36 +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
Nicolas Maillat
110e00a00d PHRAS-3416 phraseanet localization (#4003) 
PHRAS-3656 translation for filter and operator
 2022-04-01 16:23:00 +02:00
Nicolas Maillat
bbe4303345 PHRAS-3555 merge localisation (#4001) 
* Translated using Weblate (German)

Currently translated at 99.0% (2824 of 2851 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/de/

* Translated using Weblate (English)

Currently translated at 99.0% (2824 of 2851 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/

* Translated using Weblate (French)

Currently translated at 98.9% (2820 of 2851 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/

Co-authored-by: Hosted Weblate <hosted@weblate.org>
Co-authored-by: Jennifer Piva <jguerin@alchemy.fr>
 2022-03-31 18:53:03 +02:00
Nicolas Maillat
2c20ddf73b PHRAS-3644 fix traefik and 4.1.6-rc2 changelog draft (#4000) 
* 4.1.6-rc2 changelog

* 4.1.6-rc2 changelog

* PHRAS-3485 fix traefik under Phrasea

* fixe typo
 2022-03-31 17:57:08 +02:00
Aina Sitraka
c6a4922023 PHRAS-3650 keep channel connection (#3988) 
* keep channel connection

* fix test

* fix test

Co-authored-by: Nicolas Maillat <maillat@alchemy.fr>
 2022-03-31 16:47:52 +02:00
Nicolas Maillat
590d1338de Merge pull request #3994 from alchemy-fr/PHRAS-3656-user-list-date-filter 
PHRAS-3656 merge Admin - users list - adding search option to user 's creation, update and last connection date
 2022-03-31 15:57:03 +02:00
aynsix
9dfa07593b api information 2022-03-31 16:12:50 +03:00
aynsix
aa004dd9fd filter model only 2022-03-30 19:56:33 +03:00
aynsix
b86a2f1708 fix 2022-03-28 14:00:18 +03:00
aynsix
e8ddf51074 add display model filter 2022-03-28 13:00:16 +03:00
aynsix
171ec6e218 add translation 2022-03-25 18:18:32 +03:00
aynsix
7462e9f612 fix filter button 2022-03-25 18:15:39 +03:00
aynsix
9c2fbad5b8 PHRAS-3655 add confirmation when delete user 2022-03-25 16:48:36 +03:00
aynsix
15edbb0d20 date filter on admin user list 2022-03-24 12:25:32 +03:00
Nicolas Maillat
33c71a5f10 Merge pull request #3993 from alchemy-fr/PHRAS-3653-message-persistent 
PHRAS-3653 merge Worker queue message : publish messages as persitent into rabbitmq queues
 2022-03-18 15:41:25 +01:00
aynsix
3989ff0903 add rabbitmq volumes 2022-03-18 15:57:18 +03:00
aynsix
7d8f5267a4 make rabbit message persistent 2022-03-18 15:55:55 +03:00
Nicolas Maillat
917b5efa38 Merge pull request #3991 from alchemy-fr/PHRAS-3416_Phraseanet_localization_weblate 
PHRAS-3416 merge phraseanet localization weblate
 2022-03-18 11:32:12 +01:00
Nicolas Maillat
63eb51f688 Merge branch 'master' into PHRAS-3416_Phraseanet_localization_weblate 2022-03-18 10:51:58 +01:00
Nicolas Maillat
f5bb8adddc Merge pull request #3992 from alchemy-fr/PHRAS-3560-users-list-admin 
PHRAS-3560  merge add space between button
 2022-03-18 10:51:48 +01:00
Nicolas Maillat
54ada9fff2 Translated using Weblate (French) 
Currently translated at 99.6% (2821 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-18 10:27:25 +01:00
Jennifer Piva
19ccd97d65 Translated using Weblate (English) 
Currently translated at 99.7% (2825 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2022-03-18 10:27:25 +01:00
Jennifer Piva
2408763114 Translated using Weblate (German) 
Currently translated at 99.7% (2825 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/de/
 2022-03-18 10:27:24 +01:00
Nicolas Maillat
f0f3bb3120 Translated using Weblate (French) 
Currently translated at 99.1% (2807 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-18 10:20:13 +01:00
Jennifer Piva
cdb97c5ba0 Translated using Weblate (French) 
Currently translated at 99.1% (2806 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-18 10:19:58 +01:00
Nicolas Maillat
ed0a43ca71 Translated using Weblate (French) 
Currently translated at 99.1% (2806 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-18 10:19:57 +01:00
Nicolas Maillat
c182b97a60 Translated using Weblate (French) 
Currently translated at 99.1% (2807 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-18 10:08:14 +01:00
aynsix
504e049945 add space between button 2022-03-18 11:35:59 +03:00
Nicolas Maillat
619da9bba9 Translated using Weblate (French) 
Currently translated at 99.1% (2807 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/fr/
 2022-03-17 22:44:30 +01:00
Nicolas Maillat
32fd67f301 Translated using Weblate (English) 
Currently translated at 99.2% (2811 of 2831 strings)

Translation: Phraseanet/Phraseanet master message
Translate-URL: https://hosted.weblate.org/projects/phraseanet/phraseanet-master-message/en/
 2022-03-17 22:44:29 +01:00
Nicolas Maillat
24950be3bc Merge pull request #3989 from alchemy-fr/PHRAS-3560-users-search-improvement 
PHRAS-3560  merge Admin - Users list and search improvement - Export users as .csv , add "last connection"
 2022-03-17 20:59:41 +01:00
Nicolas Maillat
7ee7d67baf Merge branch 'master' into PHRAS-3560-users-search-improvement 2022-03-17 19:32:29 +01:00
Nicolas Maillat
cd7817115c Merge pull request #3990 from alchemy-fr/PHRAS-3644_rc2 
PHRAS-3644 maerge update readme and add scheme
 4.1.6-rc2
 2022-03-17 18:47:30 +01:00
nmaillat
21f512158a fix typo 2022-03-17 17:36:31 +01:00
aynsix
cd28e6968b add translation 2022-03-17 19:15:28 +03:00
nmaillat
2ac2418c13 fix typo 2022-03-17 17:06:47 +01:00
nmaillat
15c3ef4142 fix typo 2022-03-17 16:37:33 +01:00
aynsix
c4f761816c filter phantoms only 2022-03-17 17:43:38 +03:00