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
|
67d3055391
|
fix item number and force download
|
2022-01-28 16:58:22 +03:00 |
|
Moctar
|
9b8461e6ff
|
Merge branch 'PHRAS-3636-add-db-backup-container' of github.com:alchemy-fr/Phraseanet into PHRAS-3636-add-db-backup-container
|
2022-01-28 11:18:53 +01:00 |
|
Moctar
|
326b0a2f9a
|
remove backup from prod profile
|
2022-01-28 11:16:52 +01:00 |
|
Hosted Weblate
|
7d97173c7a
|
Merge branch 'origin/master' into Weblate.
|
2022-01-28 09:00:46 +01:00 |
|
Nicolas Maillat
|
994f9472e7
|
Merge pull request #3941 from alchemy-fr/PHRAS-3618-bin-maintenance
PHRAS-3618 merge clean references to orphans/missing data
|
2022-01-28 09:00:41 +01:00 |
|
aynsix
|
8f915f322e
|
add some options
|
2022-01-27 19:12:34 +03:00 |
|
Nicolas Maillat
|
37f6e6c947
|
Merge branch 'master' into PHRAS-3618-bin-maintenance
|
2022-01-26 23:47:27 +01:00 |
|
Nicolas Maillat
|
c984596ea4
|
tmp removing time
|
2022-01-26 23:08:47 +01:00 |
|
Nicolas Maillat
|
7d198a2c32
|
Merge branch 'master' into PHRAS-3636-add-db-backup-container
|
2022-01-26 22:44:37 +01:00 |
|
Hosted Weblate
|
3e07b54e6a
|
Merge branch 'origin/master' into Weblate.
|
2022-01-26 22:44:29 +01:00 |
|
Nicolas Maillat
|
8172fafb97
|
Merge pull request #3942 from alchemy-fr/PHRAS-3620-admin-subview-bad-path
PHRAS-3620 merge Admin - subviews : a bad path can lead to creating file at the roots of the Phraseanet sources.
|
2022-01-26 22:44:22 +01:00 |
|
aynsix
|
f9446b55d5
|
update translation
|
2022-01-26 19:43:45 +03:00 |
|
aynsix
|
e65aa1ebeb
|
fix
|
2022-01-26 18:33:52 +03:00 |
|
aynsix
|
d9d2fd0ac3
|
fix focus in ui dialog
|
2022-01-26 18:21:15 +03:00 |
|
aynsix
|
9584e91e3d
|
use word subdefs instead subview
|
2022-01-26 16:32:51 +03:00 |
|
aynsix
|
308c2dd896
|
some fix
|
2022-01-26 16:27:03 +03:00 |
|
Nicolas Maillat
|
5726f9a8c0
|
Merge branch 'master' into PHRAS-3618-bin-maintenance
|
2022-01-25 14:59:19 +01:00 |
|
aynsix
|
f9aaec1e49
|
PHRAS-3633 add tittle and message on print
|
2022-01-25 16:24:51 +03:00 |
|
Moctar
|
4b4ccffef6
|
fix nginx error when adding simplesaml config
|
2022-01-25 12:37:11 +01:00 |
|
Moctar
|
0e171e3e23
|
PHRAS-3636 update .env and docker-compose-tools to add backup db
|
2022-01-25 12:28:36 +01:00 |
|
Moctar
|
b7fdae249c
|
Merge branch 'master' of github.com:alchemy-fr/Phraseanet into HEAD
|
2022-01-25 10:25:14 +01:00 |
|
Nicolas Maillat
|
7ed464eaec
|
Merge branch 'master' into PHRAS-3620-admin-subview-bad-path
|
2022-01-24 09:55:43 +01:00 |
|
Hosted Weblate
|
9da5d4d1d4
|
Merge branch 'origin/master' into Weblate.
|
2022-01-24 09:55:33 +01:00 |
|
Nicolas Maillat
|
c4c0a4e870
|
Merge pull request #3947 from alchemy-fr/PHRAS-3229-thesaurus-gui
PHRAS-3229 merge Thesaurus GUI improvement - import - refresh candidat terms
|
2022-01-24 09:55:27 +01:00 |
|
Nicolas Maillat
|
64d9a17880
|
Merge branch 'master' into PHRAS-3229-thesaurus-gui
|
2022-01-21 11:51:04 +01:00 |
|
Hosted Weblate
|
92c210b35f
|
Merge branch 'origin/master' into Weblate.
|
2022-01-21 11:25:23 +01:00 |
|
jygaulier
|
1a5f74adef
|
Update README.md
add rm cache after build cmd line
|
2022-01-21 11:25:18 +01:00 |
|
aynsix
|
d5b03a425b
|
PHRAS-3229 fix properties
|
2022-01-21 12:05:55 +03:00 |
|
aynsix
|
2c16088f37
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3229-thesaurus-gui
|
2022-01-21 11:11:59 +03:00 |
|
Nicolas Maillat
|
c896f3f452
|
Merge branch 'master' into PHRAS-3620-admin-subview-bad-path
|
2022-01-20 16:43:18 +01:00 |
|
aynsix
|
464bfd0e2a
|
fix table properties
|
2022-01-20 18:25:51 +03:00 |
|
aynsix
|
dfc51a0e31
|
merge master into branch
|
2022-01-20 16:40:02 +03:00 |
|
aynsix
|
7f1e747ea3
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3618-bin-maintenance
|
2022-01-20 16:27:11 +03:00 |
|
Hosted Weblate
|
77c6d8a881
|
Merge branch 'origin/master' into Weblate.
|
2022-01-20 14:26:18 +01:00 |
|
Nicolas Maillat
|
96e233ba4e
|
Merge pull request #3948 from alchemy-fr/PHRAS-3285-fix-stock
PHRAS-3285 merge Thesaurus - candidat panel - The Stock is not available
|
2022-01-20 14:26:13 +01:00 |
|
aynsix
|
ce43e61c4a
|
add command sessions
|
2022-01-20 16:11:12 +03:00 |
|
Nicolas Maillat
|
e1677f870f
|
Merge branch 'master' into PHRAS-3620-admin-subview-bad-path
|
2022-01-20 10:02:18 +01:00 |
|
aynsix
|
2886e9edfc
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3618-bin-maintenance
|
2022-01-19 19:01:58 +03:00 |
|
aynsix
|
09ec714009
|
PHRAS-3285 fix stock cterm
|
2022-01-18 18:40:51 +03:00 |
|
aynsix
|
7a9b95c952
|
thesaurus gui improvement
|
2022-01-17 19:33:07 +03:00 |
|
Hosted Weblate
|
1c14201cde
|
Merge branch 'origin/master' into Weblate.
|
2022-01-13 11:55:54 +01:00 |
|
jygaulier
|
145790fb26
|
Merge pull request #3946 from alchemy-fr/PHRAS-3628_APIV3-records.post-without-file
PHRAS-3628 : 500 on API.create record
|
2022-01-13 11:55:50 +01:00 |
|
jygaulier
|
60ae82272a
|
PHRAS-3628 : 500 on API.create record
fix error 500 on api_v3 / records / POST with no file
(dbox.records.type should be "unknown", not null)
|
2022-01-13 10:59:22 +01:00 |
|
Nicolas Maillat
|
bf4e7aba9a
|
Merge branch 'master' into PHRAS-3620-admin-subview-bad-path
|
2022-01-12 10:03:21 +01:00 |
|
Hosted Weblate
|
845ec778bb
|
Merge branch 'origin/master' into Weblate.
|
2022-01-12 09:58:46 +01:00 |
|
Nicolas Maillat
|
b7a1b383f2
|
Merge pull request #3944 from alchemy-fr/PHRAS-3626-fix-z-index
PHRAS- 3626 merge Prod - detailed view - Print, Export windows appear behind the detailed view (zindex)
|
2022-01-12 09:58:42 +01:00 |
|
aynsix
|
279f3b9d73
|
PHRAS- 3626 fix z-index
|
2022-01-11 18:36:58 +03:00 |
|
Hosted Weblate
|
ef0ebf7053
|
Merge branch 'origin/master' into Weblate.
|
2022-01-10 11:00:23 +01:00 |
|
jygaulier
|
30f44e61c9
|
Merge pull request #3943 from alchemy-fr/PHRAS-3619-fix-delete-record-cache
PHRAS-3619 After record removal, we have an HTTP status 200 on the /records route of the API on the deleted record
|
2022-01-10 11:00:19 +01:00 |
|