Harrys Ravalomanana
|
30f2d2824f
|
PHRAS-2978
|
2020-03-23 18:20:56 +04:00 |
|
Nicolas Maillat
|
64942e6eff
|
Merge branch 'master' into PHRAS-2937_libfdk_aac_in_db_model
|
2020-03-23 14:34:30 +01:00 |
|
Nicolas Maillat
|
a13ca88125
|
Merge pull request #3409 from alchemy-fr/PHRAS-2989-Prod-detailed-view-basket
PHRAS-2989 #comment Prod - Detailed view - link in basket
|
2020-03-23 14:33:46 +01:00 |
|
Nicolas Maillat
|
fda0c860ce
|
Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket
|
2020-03-23 14:32:34 +01:00 |
|
Nicolas Maillat
|
caaa565c10
|
Merge pull request #3408 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format
PHRAS-2978 #comment merge of Feedback basket - Change date format lib for translation and UI fix
|
2020-03-23 14:32:17 +01:00 |
|
Harrys Ravalomanana
|
dc312296fe
|
PHRAS-2989
|
2020-03-23 17:00:47 +04:00 |
|
Harrys Ravalomanana
|
ed7c73458d
|
Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket
|
2020-03-23 16:59:17 +04:00 |
|
Harrys Ravalomanana
|
b6b2a4aae6
|
PHRAS-2978
|
2020-03-23 16:52:26 +04:00 |
|
Harrys Ravalomanana
|
769185952c
|
PHRAS-2989 Fix on detailled view
|
2020-03-23 15:52:25 +04:00 |
|
Harrys Ravalomanana
|
b5cbb6328f
|
Merge branch 'master' into PHRAS-2978_feedback_basket-change_date-format
|
2020-03-23 14:32:25 +04:00 |
|
Nicolas Maillat
|
556409392c
|
Merge pull request #3406 from alchemy-fr/PHRAS-2989-Prod-detailed-view-basket
PHRAS-2989 #comment merge Prod - Detailed view - link in basket, store etc ... requires a double click
|
2020-03-23 10:31:02 +01:00 |
|
Nicolas Maillat
|
e4cf024180
|
Merge branch 'master' into PHRAS-2978_feedback_basket-change_date-format
|
2020-03-20 19:07:51 +01:00 |
|
Harrys Ravalomanana
|
3700b1a1ce
|
PHRAS-2978 fix on datepicker
|
2020-03-20 18:13:29 +04:00 |
|
nmaillat
|
008d5d6766
|
replace libmp3aac by libfdk_aac in databox model
|
2020-03-20 00:05:19 +01:00 |
|
Harrys Ravalomanana
|
3d64d47614
|
Merge branch 'master' into PHRAS-2989-Prod-detailed-view-basket
|
2020-03-19 17:25:29 +04:00 |
|
Harrys Ravalomanana
|
28766799be
|
PHRAS-2989 fix dblclick on view details
|
2020-03-19 17:23:24 +04:00 |
|
Nicolas Maillat
|
f6591cc30c
|
Merge pull request #3403 from alchemy-fr/PHRAS-2979-41-fix-right-access
PHRAS-2979 #comment 4.1 The content of a story is not displayed even for users with appropriate on the collection
|
2020-03-18 13:08:44 +01:00 |
|
aynsix
|
4277bd5d06
|
add command system:apply-rights
|
2020-03-18 14:48:19 +03:00 |
|
aynsix
|
ca2611f4c9
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2979-41-fix-right-access
|
2020-03-18 14:18:34 +03:00 |
|
Nicolas Maillat
|
3a1be947a5
|
Merge pull request #3172 from aynsix/PHRAS-2680-webhook-privacy-and-security
PHRAS-2680 #comment merge of webhook privacy and security in worker context
|
2020-03-18 11:17:49 +01:00 |
|
Nicolas Maillat
|
d1c299e774
|
Merge branch 'master' into PHRAS-2680-webhook-privacy-and-security
|
2020-03-18 11:00:44 +01:00 |
|
Nicolas Maillat
|
191cbb2b5e
|
Merge pull request #3174 from aynsix/PHRAS-2739-incorporate-subdefwebhook
PHRAS-2739 #comment merge incorporate Phraseanet-plugin-SubdefWebhook into Phraseanet
|
2020-03-18 10:59:55 +01:00 |
|
Nicolas Maillat
|
5cbf1e8729
|
Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook
|
2020-03-18 10:34:04 +01:00 |
|
Nicolas Maillat
|
a89f170241
|
Merge branch 'master' into PHRAS-2979-41-fix-right-access
|
2020-03-18 10:27:58 +01:00 |
|
Nicolas Maillat
|
c046f7990f
|
Merge pull request #3173 from aynsix/PHRAS-2741-worker-service-part1
PHRAS-2741 #comment merge worker service part 1, require for Phraseanet-plugin-worker
|
2020-03-18 10:27:28 +01:00 |
|
Nicolas Maillat
|
83d9416d7b
|
Merge branch 'master' into PHRAS-2741-worker-service-part1
|
2020-03-18 01:38:15 +01:00 |
|
Nicolas Maillat
|
936c24329b
|
Translated using Weblate (French)
Currently translated at 98.9% (2451 of 2476 strings)
|
2020-03-18 00:35:36 +00:00 |
|
Nicolas Maillat
|
fba38da25c
|
Translated using Weblate (English)
Currently translated at 98.9% (2451 of 2476 strings)
|
2020-03-18 00:35:31 +00:00 |
|
Nicolas Maillat
|
9a3d4600b9
|
Merge branch 'master' into PHRAS-2741-worker-service-part1
|
2020-03-18 00:37:29 +01:00 |
|
Nicolas Maillat
|
5fdcc9eb86
|
Merge branch 'master' into PHRAS-2979-41-fix-right-access
|
2020-03-18 00:01:54 +01:00 |
|
Nicolas Maillat
|
4c0668869d
|
Merge pull request #3405 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format
PHRAS-2978 #comment merge Feedback basket - enable to edit validation deadline
|
2020-03-17 16:57:14 +01:00 |
|
Harrys Ravalomanana
|
026148c582
|
PHRAS-2978 fix design
|
2020-03-17 18:40:05 +04:00 |
|
Harrys Ravalomanana
|
a1deb3c28f
|
PHRAS-2978 fix date format
|
2020-03-17 18:35:36 +04:00 |
|
Harrys Ravalomanana
|
d1d1181a69
|
PHRAS-2989 #comment Fix on Prod detailled view basket #time 3h
|
2020-03-17 16:52:03 +04:00 |
|
Harrys Ravalomanana
|
5e8dda54a5
|
Add translation
|
2020-03-17 15:45:59 +04:00 |
|
Harrys Ravalomanana
|
eddc47301c
|
merge of master
|
2020-03-17 15:44:16 +04:00 |
|
Harrys Ravalomanana
|
fbc4e01ef3
|
PHRAS-2978 #comment update feedback expiration date #time 6h
|
2020-03-17 15:34:24 +04:00 |
|
Nicolas Maillat
|
3da61ce01d
|
Merge branch 'master' into PHRAS-2972_update_readme-1
|
2020-03-17 01:58:30 +01:00 |
|
Nicolas Maillat
|
057b690fb6
|
Translated using Weblate (English)
Currently translated at 99.1% (2451 of 2471 strings)
|
2020-03-16 22:31:51 +00:00 |
|
Nicolas Maillat
|
4881e4c402
|
Translated using Weblate (French)
Currently translated at 99.1% (2451 of 2471 strings)
|
2020-03-16 22:11:56 +00:00 |
|
Nicolas Maillat
|
c4399fd4ac
|
Translated using Weblate (English)
Currently translated at 99.1% (2450 of 2471 strings)
|
2020-03-16 22:11:56 +00:00 |
|
Nicolas Maillat
|
58de45ecfa
|
Merge pull request #3401 from alchemy-fr/PHRAS-2981-builder-for-dev
PHRAS-2981 #comment merge add dev utils to builder image
|
2020-03-16 22:31:58 +01:00 |
|
Nicolas Maillat
|
d118347880
|
Merge branch 'master' into PHRAS-2981-builder-for-dev
|
2020-03-16 18:26:28 +01:00 |
|
Nicolas Maillat
|
be5b67d7e2
|
Merge branch 'master' into PHRAS-2741-worker-service-part1
|
2020-03-16 15:42:48 +01:00 |
|
Nicolas Maillat
|
fbc2b24459
|
Merge pull request #3400 from alchemy-fr/PHRAS-2978_feedback_basket-change_date-format
PHRAS-2978 #comment merge Feedback basket - Change date format lib for translation and UI fix
|
2020-03-16 15:07:43 +01:00 |
|
Harrys Ravalomanana
|
9c87ba5504
|
PHRAS-2978 remove other change for PHRAS-2989
|
2020-03-16 17:40:32 +04:00 |
|
Harrys Ravalomanana
|
7e3b480442
|
PHRAS-2978 fix icon preview
|
2020-03-16 16:51:02 +04:00 |
|
Harrys Ravalomanana
|
56f6eb83e3
|
PHRAS-2978-add feedback creation date on workzone feedback
|
2020-03-16 15:46:41 +04:00 |
|
Nicolas Maillat
|
1e8de458bd
|
Add default value for SSH_AUTH_SOCK
|
2020-03-14 00:46:42 +01:00 |
|
Arthur de Moulins
|
6ed22b53dc
|
fix AddPluginTest
|
2020-03-13 19:51:10 +01:00 |
|