hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 06:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,059 Commits 268 Branches 107 Tags
713562c679b65d63fcc278518c25032abbbfad3c
Commit Graph

15059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
aina esokia
713562c679 load more,delete some fix displayed 
#time 7h
 2020-10-15 17:54:10 +03:00
aina esokia
50e2cc1a1a Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3189_Admin_expose_setting 2020-10-14 18:16:29 +03:00
aina esokia
37c8b7b609 PHRAS-3189 add cover 
#time 5h
 2020-10-14 18:16:04 +03:00
aina esokia
5dd01309d9 PHRAS-3189 fix assets display 
#time 3h
 2020-10-14 15:41:37 +03:00
aina esokia
14fd1715a2 PHRAS-3189 align load more button 2020-10-14 10:53:55 +03:00
aina esokia
e3e431ed76 PHRAS-3189 change some button display 2020-10-13 18:04:19 +03:00
Nicolas Maillat
aa4fd6f17a Merge pull request #3629 from alchemy-fr/PHRAS-3231-trusted-proxies-multiple-entries-setting 
PHRAS-3231 Merge loop on a list of trusted proxies into the entrypoint
 2020-10-09 18:41:46 +02:00
Nicolas Maillat
30a227c001 Merge branch 'master' into PHRAS-3231-trusted-proxies-multiple-entries-setting 2020-10-09 17:57:23 +02:00
Nicolas Maillat
9990194352 Merge pull request #3608 from alchemy-fr/PHRAS-3214_validation-tokens-mess_MASTER 
PHRAS-3214 Merge validation tokens refacto in 4.1
 2020-10-09 17:55:02 +02:00
Moctar
5cbfa820d1 loop on a list of trusted proxies into the entrypoint 2020-10-09 17:26:22 +02:00
aina esokia
ace1e4cf74 Merge branch 'PHRAS-3189_Admin_expose_setting' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3189_Admin_expose_setting 2020-10-09 15:07:24 +03:00
aina esokia
2f181da2cd Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3189_Admin_expose_setting 2020-10-09 15:06:32 +03:00
aina esokia
4229d1862d Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3214_validation-tokens-mess_MASTER 2020-10-09 14:31:55 +03:00
aina esokia
f316cef7a2 PHRAS-3214 fix command validation:remind 2020-10-09 14:17:35 +03:00
Nicolas Maillat
05b7a2a352 Merge branch 'master' into PHRAS-3189_Admin_expose_setting 2020-10-09 11:46:47 +02:00
Nicolas Maillat
0ebea5299d Merge pull request #3628 from alchemy-fr/PHRAS-3230-Create-env-variable-for-trusted-proxies 
PHRAS-3230 merge Add env variable PHRASEANET_TRUSTED_PROXIES in fpm and worker container
 2020-10-09 11:37:01 +02:00
Nicolas Maillat
953499d358 Merge branch 'master' into PHRAS-3230-Create-env-variable-for-trusted-proxies 2020-10-09 10:47:24 +02:00
Nicolas Maillat
00a277d74e Translated using Weblate (French) 
Currently translated at 99.7% (2599 of 2605 strings)
 2020-10-09 08:45:43 +00:00
Nicolas Maillat
2a4819628d Translated using Weblate (English) 
Currently translated at 99.7% (2599 of 2605 strings)
 2020-10-09 08:45:43 +00:00
Nicolas Maillat
f0bbe70052 Translated using Weblate (German) 
Currently translated at 100.0% (2605 of 2605 strings)
 2020-10-09 08:44:49 +00:00
Nicolas Maillat
c46f7daa42 Translated using Weblate (English) 
Currently translated at 99.6% (2597 of 2605 strings)
 2020-10-09 08:33:58 +00:00
Nicolas Maillat
23438ce415 Remove double entry for trusted proxies env 2020-10-09 10:28:53 +02:00
gjacobjn
48bda26e57 Update docker-compose.yml 2020-10-08 18:35:44 +02:00
gjacobjn
db92542b44 Update .env 2020-10-08 18:33:28 +02:00
Nicolas Maillat
561b3183f1 Merge pull request #3627 from alchemy-fr/PHRAS-3228-uploader-pull-mode-report-refactoring 
PHRAS-3228 Merge Uploader - Pull mode by Phraseanet - report refactoring Oauth of Phraseanet-service made in April 2020
 2020-10-08 17:43:59 +02:00
aina esokia
e8968441bf PHRAS-3228 uploader pull mode report oauth refactoring 2020-10-08 16:49:26 +03:00
Nicolas Maillat
1483fb90b5 Merge branch 'master' into PHRAS-3214_validation-tokens-mess_MASTER 2020-10-08 14:54:27 +02:00
Nicolas Maillat
267c4a5dec Merge pull request #3626 from alchemy-fr/PHRAS-3227-thesaurus-file 
PHRAS-3227 merge Unable to load a thesaurus file
 2020-10-08 14:53:02 +02:00
aina esokia
18a87be497 PHRAS-3227 fix import file 2020-10-07 15:29:28 +03:00
aina esokia
541823f9c7 PHRAS-3222 expose upload asset 2020-10-06 18:06:36 +03:00
aina esokia
a9b3c5231e PHRAS-3189 add confirm dialog an button 2020-10-06 15:36:58 +03:00
Nicolas Maillat
c022f664d4 Merge branch 'master' into PHRAS-3214_validation-tokens-mess_MASTER 2020-10-05 16:48:53 +02:00
aina esokia
36908875f9 PHRAS-3189 remove asset and publication 2020-10-02 18:02:35 +03:00
aina esokia
d9a0409f06 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3189_Admin_expose_setting 2020-10-02 10:18:03 +03:00
Nicolas Maillat
6bbd0a2ca1 Merge pull request #3623 from alchemy-fr/PHRAS-3224-fix-pagination-disappeared 
PHRAS-3224  merge Prod - answer grid - page navigation have disappeared, the cause is e79f2cb4f2
 2020-10-01 16:25:19 +02:00
aina esokia
adafa6ab93 PHRAS-3224 fix test 2020-10-01 15:38:50 +03:00
aina esokia
585a24c40d PHRAS-3224 2020-10-01 15:11:54 +03:00
aina esokia
e0e5460bf9 PHRAS-3189 move js 2020-09-30 17:39:36 +03:00
aina esokia
4ac0646920 fix dialog, display assets, add link in title 2020-09-30 16:55:29 +03:00
jygaulier
aaec2ada31 Merge pull request #3619 from alchemy-fr/PHRAS-3174_api-v3-records_4.1 
PHRAS-3174_api-v3-records_4.1
 2020-09-29 20:22:25 +02:00
jygaulier
4da47a7908 - fix : include=facets now works also in extended mode 2020-09-29 20:00:14 +02:00
aina esokia
f7b2fa581c fix edit and list 2020-09-29 18:26:25 +03:00
aina esokia
1be9b62ea8 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3189_Admin_expose_setting 2020-09-29 14:07:23 +03:00
Nicolas Maillat
96faa2b70a Merge branch 'master' into PHRAS-3214_validation-tokens-mess_MASTER 2020-09-29 11:08:33 +02:00
Nicolas Maillat
07e28010ba Merge pull request #3617 from alchemy-fr/PHRAS-3221-about-url-scheme 
PHRAS-3221 merge Prod - Admin about url to store.alchemy.fr switch scheme from https to http
 2020-09-29 10:34:13 +02:00
aina esokia
9a1f0e4ada change scheme https to http 2020-09-29 10:50:01 +03:00
aina esokia
944225ff2e port expose from old production-client 2020-09-28 16:31:32 +03:00
aina esokia
728511055d merge master into PHRAS-3189 2020-09-28 14:35:35 +03:00
Nicolas Maillat
e7ccb4f1dc Merge branch 'master' into PHRAS-3214_validation-tokens-mess_MASTER 2020-09-28 13:04:41 +02:00
Nicolas Maillat
4120943b72 Merge pull request #3614 from alchemy-fr/PHRAS-3190-production-client-to-phraseanet 
PHRAS-3190  merge Phraseanet-production-client and phraseanet-common in Phraseanet git hub repository AKA all front dependencies in one repo
 2020-09-28 13:04:12 +02:00