Commit Graph

45 Commits

Author SHA1 Message Date
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
Mike Ng
374f8eaff4 migrate backbone and underscore to npm and refactored test modules 2018-01-19 15:03:00 +04:00
Mike Ng
802c52d7ff refatored html code to use proper font-awesome classes 2018-01-19 13:32:20 +04:00
Mike Ng
790c76a2d9 modify js and css files for PDFJS 2017-08-07 17:24:47 +04:00
jygaulier
a70bf2fc70 PHRAS-1304_AUTO-COMPLETION_MASTER (#2061)
* PHRAS-1304_AUTO-COMPLETION_MASTER
ported from 4.0

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 (5.5.21 is obsolete in cicleci)

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump php version to 5.5.31 : php.ini moved in circelci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq & date to php for circleci

* PHRAS-1304_AUTO-COMPLETION_MASTER
add zmq

* PHRAS-1304_AUTO-COMPLETION_MASTER
bump amqp

* PHRAS-1304_AUTO-COMPLETION_MASTER
downgrade amqp to 1.2 to test compilation against old librabbit 0.4 (ubuntu)

* PHRAS-1304_AUTO-COMPLETION_MASTER
add amqp.so to php.ini, (re)bump amqp to 1.6

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again

* PHRAS-1304_AUTO-COMPLETION_MASTER
build rabittmq from git again and again

* PHRAS-1304_AUTO-COMPLETION_MASTER
fix test on media rotation 600*400 -> 400*599 !!!

* PHRAS-1304_AUTO-COMPLETION_MASTER
restore facebook sdk to 4.0.1 due to mistake

* PHRAS-1304_AUTO-COMPLETION_MASTER
deleted unwanted file
2017-02-06 18:26:56 +01: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
Xavier Rousset
f9d496f6c5 Align menu icons on prod view 2016-10-26 12:18:18 +02:00
Florian Blouet
8cac41f6f4 Merge pull request #1895 from lostdalek/hotfix/PHRAS-1104
PHRAS-1104 - edit record: fix empty value in multivalued fields
2016-05-31 15:12:14 +02:00
Florian BLOUET
e72cf0e41f PHRAS-1104 - edit record: fix empty value in multivalued fields 2016-05-31 14:36:39 +02:00
Florian BLOUET
2201ebdb67 PHRAS-1080 - prod advanced search: fix document status selection 2016-05-30 17:01:09 +02:00
Florian BLOUET
b7a3571d04 PHRAS-851 - add databox name, collection name and logo to record title in preview 2016-05-23 11:36:25 +02:00
Florian BLOUET
3d12754c8c fix PHRAS-1076 2016-05-09 15:05:22 +02:00
Benoît Burnichon
53ef815145 restore register at initialization 2016-04-22 20:22:56 +02:00
Benoît Burnichon
d6b386662d fix listener to be called when refreshing Basket Workzone 2016-04-22 19:18:29 +02:00
Florian BLOUET
755aac9e3e PHRAS-1038 - fix story navigation in workzone context 2016-03-22 17:17:01 +01:00
Florian BLOUET
ba646fa733 PHRAS-1039 - fix preview backward navigation 2016-03-21 10:20:56 +01:00
Florian BLOUET
7dd8b73606 PHRAS-945 - fix record selection in story detailled view 2016-02-26 17:29:36 +01:00
Benoît Burnichon
3300d7e06e Merge pull request #1734 from lostdalek/hotfix/PHRAS-995
PHRAS-995
2016-02-26 15:55:49 +01:00
Florian BLOUET
5ac036c123 PHRAS-995 - fix search results css in diapo mode 2016-02-26 15:32:42 +01:00
Florian BLOUET
588d10c2dc PHRAS-1016 - fix default selection to group instead of records for story editing 2016-02-26 13:04:26 +01:00
Florian BLOUET
3050c7904e PHRAS-999 - fix events delegation 2016-02-25 11:30:15 +01:00
Florian BLOUET
91edc4d822 PHRAS-681 - fix default value of advanced search options: sort value and sort order 2016-02-17 15:09:30 +01:00
Florian BLOUET
cfac4d7ecd wip PHRAS-681 2016-02-17 15:09:30 +01:00
Florian BLOUET
578c6aa298 PHRAS-974 - PHRAS-974 - fix publication module 2016-02-17 11:22:28 +01:00
Florian Blouet
15634e1cd4 PHRAS-896 - fix duplicated facets in workzone 2016-02-11 14:14:27 +01:00
Florian BLOUET
a1c5148700 PHRAS-941 - fix old jquery selector for selected and checked, fix jquery migrate url call 2016-02-11 14:14:27 +01:00
Florian BLOUET
dd35a3cad6 PHRAS-952 - fix thumbnail train synchronisation 2016-02-09 14:13:20 +01:00
Florian BLOUET
d00509fba3 PHRAS-937 - fix navigation in preview 2016-02-08 12:05:38 +01:00
Florian BLOUET
3e02804c51 PHRAS-863 - fix push modal events, fix jquery.selection to allow child events 2015-12-17 12:22:58 +01:00
Florian BLOUET
02da92b77b bump embed bundle, removed swfobject dependency, cleanup and fix thumbnail twig files 2015-12-14 18:26:31 +01:00
Florian BLOUET
1940d09125 fixes event delegation for modal links 2015-12-10 15:57:06 +01:00
Florian BLOUET
60639d0e96 fix tests 2015-12-02 17:35:43 +01:00
Florian BLOUET
ebaf36f2d2 PHRAS-845 - fix close button
PHRAS-846 - fix admin log view
PHRAS-843 - fix action icons
added white skin
misc fix on skin color handling
replace image icons by fonts icons
2015-12-02 17:35:42 +01:00
Florian BLOUET
cdff031887 fix admin reoladTree callback
fix admin leftPanel render method
fix admin reorder submit callback
remove usless images
2015-12-02 17:35:42 +01:00
Florian BLOUET
34689daaa8 fix tooltip in record editor
fix images path in record editor
wip: standardize font-sizes
2015-12-02 17:35:41 +01:00
Florian BLOUET
4e7131f296 fix tools actions with event delegation in basket workzone
fix bridge action href in basket workzone
PHRAS-615 - fix tools actions positionning in basket workzone
2015-12-02 17:35:41 +01:00
Florian BLOUET
3807b2f74c fix main menu colors, fix facets display on IE8 2015-12-02 17:35:41 +01:00
Florian BLOUET
5d2735cd0a update jquery attr into prop method for checked and disabled properties 2015-12-02 17:35:41 +01:00
Florian BLOUET
454f9d4db0 wip: jquery migration 2015-12-02 17:35:40 +01:00
Florian BLOUET
7c31c1914c fixes themes path issues, moved vendor libraries 2015-12-02 17:35:38 +01:00
Florian BLOUET
5a34aa786a added jquery-treeview to bower, misc dependencies cleanup 2015-12-02 17:35:38 +01:00
Florian BLOUET
0f723c6f58 moved thesaurus js files, moved prod dependencies, removed unused pixastic dependency 2015-12-02 17:35:38 +01:00
Florian BLOUET
0e97e4a0ae moved skins/icon to assets/common/images/icons 2015-12-02 17:35:37 +01:00
Florian BLOUET
f186091823 wip: component reorg, gathering js, css, images, ... 2015-12-02 17:35:36 +01:00