hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 07:23:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,606 Commits 268 Branches 107 Tags
c8caea396ba79b459f4ca528ce0f182c87bcd40c
Commit Graph

15606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina esokia
fc73ae6834 fix test 2021-02-16 15:34:51 +03:00
aina esokia
74c66a7fef PHRAS-3080 add pdf file cgu in zip 2021-02-16 15:09:52 +03:00
Nicolas Maillat
96c4ca57bd Merge pull request #3724 from alchemy-fr/PHRAS-3364-remove-duplicate-db-mailhog 
PHRAS-3364 merge  remove duplicate entry for db and mailhog service
 2021-02-16 11:39:06 +01:00
Nicolas Maillat
fc979cf2ab PHRAS-3364 remove duplicate entry for db mailhog 2021-02-16 11:22:37 +01:00
Nicolas Maillat
58b69d21ab Merge pull request #3723 from alchemy-fr/PHRAS-3364-remove-duplicate-COMPOSE_FILE 
PHRAS-3364 merge remove duplicate COMPOSE_FILE
 2021-02-16 10:13:59 +01:00
Nicolas Maillat
dfcd6d7324 PHRAS-3364 remove duplicate COMPOSE_FILE 2021-02-16 09:45:33 +01:00
Nicolas Maillat
865467dd3c Merge pull request #3722 from alchemy-fr/PHRAS-3346_Healthcheck_Gateway_check_Fpm 
PHRAS-3346 merge Healtcheck in gateway, nginx reload configuration if fpm i…
 2021-02-15 19:37:18 +01:00
nmaillat
6c9f936efb PHRAS-3346 Healtcheck in gateway, nginx reload configuration if fpm is not up 2021-02-15 19:13:10 +01:00
Nicolas Maillat
e3fe04e4b5 Merge pull request #3720 from alchemy-fr/PHRAS-3364_explode_compose_file 
PHRAS-3364 merge explode compose file
 2021-02-15 18:33:35 +01:00
nmaillat
d78e570889 Merge branch 'PHRAS-3364_explode_compose_file' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3364_explode_compose_file 2021-02-15 17:44:26 +01:00
nmaillat
9df88bc236 PHRAS-3364 explode docker-compose files for mariadb and mailhog 2021-02-15 17:38:54 +01:00
jygaulier
298882354b PHRAS-3153_Doc-to-Swagger 
- add extended mode to /record and /story
- fix compilation in 1 file
- better examples
- todo : extended mode for /search
- todo : check "include[]" available keys (compare with extended mode)
- todo : remove 'id' type ?
 2021-02-15 15:23:13 +01:00
jygaulier
7a2482c56e PHRAS-3153_Doc-to-Swagger 
- fix to comply with phpstorm AND swagger
 2021-02-15 15:23:13 +01:00
jygaulier
2f7b7dcea1 PHRAS-3153_Doc-to-Swagger 
- big refacto, split in multiple files
 2021-02-15 15:23:13 +01:00
jygaulier
63018e417e PHRAS-3153_Doc-to-Swagger 
- add: json examples for post/patch record
[ci skip]
 2021-02-15 15:23:13 +01:00
jygaulier
58f303547a PHRAS-3153_Doc-to-Swagger 
- add: finished searchraw
- change : using "additionalproperties" for key->values
[ci skip]
 2021-02-15 15:23:13 +01:00
jygaulier
38d2639fca PHRAS-3153_Doc-to-Swagger 
- add: searchraw (wip)
[ci skip]
 2021-02-15 15:23:13 +01:00
nmaillat
40dd937d89 PHRAS-3364 explode docker-compose files [SKIP CI] 2021-02-12 00:02:11 +01:00
nmaillat
7d56aa7936 COMPOSE_FILE explode docker-compose.yml 2021-02-11 23:43:50 +01:00
Nicolas Maillat
340b5f8664 Merge pull request #3705 from alchemy-fr/PHRAS-3351-Add-env-variables-to-allow-setup-editing 
PHRAS-3351 Merge use env variables for setup Phraseanet Instance Title, appearing on Phraseanet Home page
 2021-02-11 23:42:17 +01:00
nmaillat
775860e250 PHRAS-3351 reorganisation in .env file, remove unused env from worker 2021-02-11 23:20:11 +01:00
Nicolas Maillat
91511c83f0 Merge branch 'master' into PHRAS-3351-Add-env-variables-to-allow-setup-editing 2021-02-11 21:51:03 +01:00
Nicolas Maillat
c84b73189a Merge branch 'master' into PHRAS-3153_Api-doc-to-Swagger 2021-02-11 21:50:25 +01:00
Nicolas Maillat
c915b05dcc Merge pull request #3717 from alchemy-fr/PHRAS-3361-create-custom-network-for-phraseanet-using-env 
PHRAS-3361 merge Create custom network for phraseanet using env parameter PHRASEANET_S…
 2021-02-11 21:46:01 +01:00
Nicolas Maillat
b22337e039 Merge branch 'master' into PHRAS-3361-create-custom-network-for-phraseanet-using-env 2021-02-11 20:53:44 +01:00
Nicolas Maillat
7f47201f5f Merge pull request #3719 from alchemy-fr/PHRAS-3341-fix-color-title-bar 
PHRAS-3341 merge Prod - Detailled view - title bar - find an other place for base/collection
 2021-02-11 20:52:15 +01:00
jygaulier
5cb70407a6 PHRAS-3153_Doc-to-Swagger 
- add extended mode to /record and /story
- fix compilation in 1 file
- better examples
- todo : extended mode for /search
- todo : check "include[]" available keys (compare with extended mode)
- todo : remove 'id' type ?
 2021-02-11 19:41:40 +01:00
Moctar
f6e09c25b6 Order and sanitize docker-compose files 2021-02-11 18:09:25 +01:00
aina esokia
f7ee9711ad PHRAS-3341 change title color 2021-02-11 18:00:43 +03:00
aina esokia
7041a11873 PHRAS-2283 port to 4.1 access autorisation windows 2021-02-11 16:48:49 +03:00
Nicolas Maillat
d726268af0 Merge branch 'master' into PHRAS-3358-renaming-patch 2021-02-11 12:59:09 +01:00
jygaulier
d832d505a2 PHRAS-3153_Doc-to-Swagger 
- fix to comply with phpstorm AND swagger
 2021-02-11 11:37:18 +01:00
Moctar
dfac6176f2 extend network management to override 2021-02-11 11:20:46 +01:00
Moctar
ec03796eab Merge branch 'PHRAS-3361-create-custom-network-for-phraseanet-using-env' of github.com:alchemy-fr/Phraseanet into PHRAS-3361-create-custom-network-for-phraseanet-using-env 2021-02-11 11:12:39 +01:00
Moctar
2afb3c07ba Merge branch 'master' of github.com:alchemy-fr/Phraseanet into PHRAS-3361-create-custom-network-for-phraseanet-using-env 2021-02-11 11:01:03 +01:00
Moctar
d356bb5ed7 extend network management to override 2021-02-11 10:59:59 +01:00
jygaulier
36692fc348 PHRAS-3153_Doc-to-Swagger 
- big refacto, split in multiple files
 2021-02-10 23:12:28 +01:00
Nicolas Maillat
2f8918ae89 Merge branch 'master' into PHRAS-3361-create-custom-network-for-phraseanet-using-env 2021-02-10 17:10:03 +01:00
Nicolas Maillat
5fa01a0438 Merge pull request #3716 from alchemy-fr/PHRAS-3341-title-bar 
PHRAS-3341 Merge Prod - Detailled view - title bar - find an other place for base/collection
 2021-02-10 17:09:49 +01:00
aina esokia
78b0f61843 change text and icon size 2021-02-10 18:00:20 +03:00
Moctar
2e192980ab Create custom network for phraseanet using env parameter PHRASEANET_SUBNET_IPS 2021-02-10 15:58:17 +01:00
aina esokia
81aa75c600 add space 2021-02-10 17:26:46 +03:00
aina esokia
debeb01b41 fix interligne 2021-02-10 17:22:26 +03:00
aina esokia
e48186e98e different fix in screen 2021-02-10 16:09:06 +03:00
aina esokia
b069737507 PHRAS-3341 title bar base/collection other place 2021-02-09 18:14:07 +03:00
Nicolas Maillat
e5da00e8c6 Merge branch 'master' into PHRAS-3351-Add-env-variables-to-allow-setup-editing 2021-02-09 13:19:11 +01:00
Nicolas Maillat
add26e5e7c Merge pull request #3715 from alchemy-fr/PHRAS-3356-fix-detail-view 
PHRAS-3356 merge Prod - detailed view - related story - broken when no right to Access report
 2021-02-09 13:17:35 +01:00
aina esokia
63e6bd0307 PHRAS-3356 fix detail view when no right to report 2021-02-09 11:19:26 +03:00
jygaulier
bc1b9f96cc PHRAS-3153_Doc-to-Swagger 
- add: json examples for post/patch record
[ci skip]
 2021-02-08 21:18:17 +01:00
Nicolas Maillat
996962cdfc Merge pull request #3712 from alchemy-fr/PHRAS-3357_bump-php-in-composer 
PHRAS-3357 merge bump php in composer
 2021-02-08 19:57:40 +01:00