Nicolas Maillat
d572833dba
Merge pull request #3760 from alchemy-fr/PHRAS-3399-improve-ux-button
...
PHRAS-3399 merge fix initiator color and button order
2021-03-26 16:31:47 +01:00
aynsix
3e27e757f4
change string
2021-03-26 18:04:53 +03:00
aynsix
74dc743829
PHRAS-3399 fix initiator and button color
2021-03-26 17:46:10 +03:00
Nicolas Maillat
58e82b187a
Merge pull request #3747 from alchemy-fr/PHRAS-3390-delete-action
...
PHRAS-3390 merge Prod - Workzone - basket tab - local menu - "Delete" action, add "Archive" and "Cancel" choice in confirmation windows
2021-03-26 15:04:17 +01:00
aynsix
95ee11370b
fix dialog
2021-03-26 16:25:04 +03:00
aynsix
00ca49a3b6
merge master into branch
2021-03-26 14:06:10 +03:00
Nicolas Maillat
803dde18bd
Merge pull request #3756 from alchemy-fr/PHRAS-3399-feedback-improve-ux
...
PHRAS-3399 merge improve ux in feedback
2021-03-26 10:15:57 +01:00
aynsix
7cd865299f
PHRAS-3399 update string and test
2021-03-26 11:02:18 +03:00
aynsix
e90e406b01
fix generate translation error
2021-03-26 10:52:11 +03:00
aynsix
75a3038302
merge master into branch
2021-03-26 10:36:38 +03:00
Nicolas Maillat
495399825b
Merge pull request #3759 from alchemy-fr/PHRAS-3406_classification-field-centric_MASTER
...
PHRAS-3406 merge classification-field-centric_MASTER
PHRAS-3405 merge set icon improvement
PHRAS-3394 Rewriting "black-dialog-wrap" classe
2021-03-25 20:09:49 +01:00
jygaulier
f819833d4f
PHRAS-3406_classification-field-centric_MASTER
...
fix : new ux "field" centric
fix : black dlgbox
2021-03-25 18:30:15 +01:00
aynsix
420a645580
PHRAS-3399 lis new user, save not notify
2021-03-25 16:19:15 +03:00
aynsix
101399dd24
merge master into branch
2021-03-25 12:44:24 +03:00
Nicolas Maillat
45cc756e40
Merge pull request #3755 from alchemy-fr/PHRAS-3146-failed-queue-add-ttl
...
PHRAS-3146 merge add ttl in failed_q
2021-03-25 09:16:44 +01:00
Nicolas Maillat
9bb91f1504
Merge branch 'master' into PHRAS-3146-failed-queue-add-ttl
2021-03-24 15:14:42 +01:00
aynsix
82beb14762
PHRAS-3399 fix string issue
2021-03-24 13:48:49 +03:00
jygaulier
d08740f5e1
Merge pull request #3758 from alchemy-fr/PHRAS-3405_safari-classification-bad-rollover_MASTER
...
PHRAS-3405_safari-classification-bad-rollover_MASTER
2021-03-23 13:37:17 +01:00
jygaulier
df7d103ff6
PHRAS-3405_safari-classification-bad-rollover_MASTER
...
fix : better cursor feedback with safari, still no highlight of the term while dragging
2021-03-23 12:38:26 +01:00
aynsix
2bdf709e85
change
2021-03-22 15:20:20 +03:00
aynsix
f4698fd5ff
change message ttl in failed q to 7 days
2021-03-22 15:18:39 +03:00
aynsix
77d4b7b90e
PHRAS-3399 improve ux in feedback
2021-03-19 17:58:43 +03:00
aynsix
0753cddc0f
PHRAS-3146 add ttl in failed_q
2021-03-19 14:02:52 +03:00
Nicolas Maillat
6fe12e9f2b
Merge pull request #3753 from alchemy-fr/PHRAS-3399-feedback-right_issue
...
PHRAS-3399 merge Prod - feedback - right issue
2021-03-19 11:23:26 +01:00
Nicolas Maillat
dbca993f65
Merge branch 'master' into PHRAS-3399-feedback-right_issue
2021-03-19 09:37:32 +01:00
Nicolas Maillat
26718cefda
Merge pull request #3754 from alchemy-fr/PHRAS-3397_doubles-in-multi-values_MASTER
...
PHRAS-3397 merge doubles in multi-values
2021-03-18 19:12:00 +01:00
Nicolas Maillat
d1ed140b8e
Merge branch 'master' into PHRAS-3397_doubles-in-multi-values_MASTER
2021-03-18 18:22:16 +01:00
Nicolas Maillat
b2f07f579e
Merge pull request #3752 from alchemy-fr/PHRAS-3400_safari-th-classification-bad-ops_MASTER
...
PHRAS-3400 merge safari th classification bad operation
2021-03-18 18:21:51 +01:00
jygaulier
00845c58a1
PHRAS-3397_doubles-in-multi-values_MASTER
...
fix : adding/replacing values set_metadata() cannot create doubles in multi-v fields
2021-03-18 18:16:39 +01:00
jygaulier
8479d37188
Merge branch 'master' into PHRAS-3400_safari-th-classification-bad-ops_MASTER
2021-03-18 18:04:08 +01:00
aynsix
8a81a63598
fix user displayed
2021-03-18 18:14:57 +03:00
aynsix
c8465d5a53
PHRAS-3399 fix feedback right issue
2021-03-18 17:09:14 +03:00
Nicolas Maillat
a350d49990
Merge pull request #3749 from alchemy-fr/PHRAS-3392-record-edit-worker
...
PHRAS-3392 merge Worker recordEdit - apply description made by Tx as classification PHRAS-3381
2021-03-17 21:59:49 +01:00
jygaulier
492d50c0af
[skip ci]
...
PHRAS-3400_safari-th-classification-bad-ops_MASTER
fix : "operation" menu is ok on safari
change : all js in twig is moved to prod-client (bump to v10)
changed "poc/wip" message since now it writes meta
WIP
2021-03-17 20:29:27 +01:00
aynsix
47b8f202a5
fix get record
2021-03-17 14:29:16 +03:00
aynsix
b34d2b2c09
Merge branch 'PHRAS-3392-record-edit-worker' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3392-record-edit-worker
2021-03-17 10:32:24 +03:00
aynsix
f38dfae4ee
fix get databoxId
2021-03-17 10:31:16 +03:00
jygaulier
d8bc1d2109
Merge branch 'master' into PHRAS-3392-record-edit-worker
2021-03-16 17:33:41 +01:00
jygaulier
66e8f3f451
Merge pull request #3750 from alchemy-fr/PHRAS-3396_ffox-err-drop-record-on-term_MASTER
...
PHRAS-3396_ffox-err-drop-record-on-term_MASTER
2021-03-16 17:10:52 +01:00
jygaulier
c8caea396b
PHRAS-3396_ffox-err-drop-record-on-term_MASTER
...
fix : drop record on term is ok with ffox
[skip ci]
2021-03-16 17:07:48 +01:00
aynsix
bbd9e1de1a
PHRAS-3392 tx drag an drop in record edit
2021-03-16 18:15:22 +03:00
Nicolas Maillat
c90e4f3e84
Merge pull request #3748 from alchemy-fr/PHRAS-3381_tx-as-classification-plan-6_MASTER
...
PHRAS-3381 merge tx-as-classification-plan-6_MASTER
2021-03-16 14:15:17 +01:00
jygaulier
f332a6440d
Merge branch 'master' into PHRAS-3381_tx-as-classification-plan-6_MASTER
2021-03-16 13:47:18 +01:00
jygaulier
b876d97ca1
[skip ci]
...
PHRAS-3381_tx-as-classification-plan_MASTER
fix : "replace_all" ok
back : ok is handled
WIP
2021-03-16 13:44:44 +01:00
aynsix
9333f96428
add archive and cancel choice in delete action
2021-03-16 11:05:32 +03:00
jygaulier
ebd7062f57
Update README.md
...
[skip ci]
explicit directories for cmds
2021-03-15 17:20:44 +01:00
jygaulier
2f9c788ada
[skip ci]
...
PHRAS-3381_tx-as-classification-plan_MASTER
add deleted (how ?) production.min.js
WIP
2021-03-15 13:15:06 +01:00
jygaulier
634fa351ce
[skip ci]
...
PHRAS-3381_tx-as-classification-plan_MASTER
commit dist
bump phr-client to 9
WIP
2021-03-15 10:05:33 +01:00
jygaulier
8ca605f20c
[skip ci]
...
test commit to test push
WIP
2021-03-15 10:05:33 +01:00
jygaulier
a76f64e892
[skip ci]
...
PHRAS-3381_tx-as-classification-plan_MASTER
back controller for ok button
fix : PHRAS-3383
WIP
2021-03-15 10:05:32 +01:00
