hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 01:43:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,756 Commits 268 Branches 107 Tags
23c2f999558992c78f51498ebe0eba22f241da4f
Commit Graph

14756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Maillat
229e234796 Merge branch 'master' into PHRAS-3164_lightbox-download_link 2020-07-07 09:17:34 +02:00
Nicolas Maillat
6f005a9735 Merge pull request #3553 from alchemy-fr/PHRAS-3150-Make-optional-for-sync-admin-password 
PHRAS-3150 merge Make the synchronization of the password of the Phraseanet root account optional
 2020-07-06 23:54:25 +02:00
Nicolas Maillat
7860d00230 Merge branch 'master' into PHRAS-3164_lightbox-download_link 2020-07-06 23:27:43 +02:00
Nicolas Maillat
0a4a2bd3f1 Merge branch 'master' into PHRAS-3150-Make-optional-for-sync-admin-password 2020-07-06 23:23:22 +02:00
Nicolas Maillat
e7b9544b44 Merge pull request #3560 from alchemy-fr/PHRAS-3167_add_fpm_parameters 
PHRAS-3167 merge add env for set the php and the nginx gateway timeout
 2020-07-06 23:21:51 +02:00
nmaillat
25319e6b18 fix sed src 2020-07-06 21:35:15 +02:00
nmaillat
f3750e987b add nginx.conf 2020-07-06 20:42:08 +02:00
nmaillat
e828e98916 set timeout default value to 120 sec 2020-07-06 20:18:26 +02:00
nmaillat
72d2bc028d set gateway fpm timeout 2020-07-06 20:13:27 +02:00
nmaillat
7eb95a97c5 set php timeout 2020-07-06 19:03:54 +02:00
jygaulier
2186142f9b Merge branch 'master' into PHRAS-3162_es-document-is-empy-pdf_4.1 2020-07-06 18:12:38 +02:00
jygaulier
71dd539c76 fix : if string cutting at 32766 OCTETS for es/lucene happened in the middle of a utf8 CHAR, string was invalid. 2020-07-06 18:06:51 +02:00
aynsix
8f3f3845c0 add subdef_source in config 2020-07-06 18:23:42 +03:00
Nicolas Maillat
3449df75c3 Merge branch 'master' into PHRAS-3164_lightbox-download_link 2020-07-06 17:16:18 +02:00
Nicolas Maillat
3f47636094 typo fix 2020-07-06 17:15:57 +02:00
Harrys Ravalomanana
b407a854c1 PHRAS-3164 #comment add download action on lightbox #time 6h 2020-07-06 18:31:46 +04:00
gjacobjn
7e5f020703 Fix for PHRASEANET_ADMIN_ACCOUNT_ID not set 
Fix condition when PHRASEANET_ADMIN_ACCOUNT_ID is not set in :env
 2020-07-06 16:21:50 +02:00
aynsix
22302982a4 set ginga config 2020-07-06 16:27:43 +03:00
Nicolas Maillat
4cf43797b9 Update .env 2020-07-06 13:25:13 +02:00
Nicolas Maillat
7b4e82a487 Update .env 2020-07-06 13:24:14 +02:00
Nicolas Maillat
5525b1da79 Merge pull request #3557 from alchemy-fr/PHRAS-3160-thesaurus-populate 
PHRAS-3160 merge Thesaurus - launch populate db - don't return elasticsearch detail in answer
 2020-07-03 22:25:30 +02:00
Nicolas Maillat
21c813c940 Merge branch 'master' into PHRAS-3160-thesaurus-populate 2020-07-03 22:03:19 +02:00
Nicolas Maillat
68e4dfea8b Merge pull request #3555 from alchemy-fr/PHRAS-3163-Prod-publication_fix-error-on-creation 
PHRAS-3163 merge Prod - Publication - Create publication - error in console when create
 2020-07-03 22:03:03 +02:00
Harrys Ravalomanana
a7254dd815 PHRAS-3163 Fix on publication creation 2020-07-03 19:45:47 +04:00
Harrys Ravalomanana
93575c7a3b PHRAS-3163 2020-07-03 19:29:45 +04:00
Harrys Ravalomanana
f29771693a PHRAS-3163 upgrade phraseanet-production-client 2020-07-03 19:18:20 +04:00
Harrys Ravalomanana
b1724cfc76 Merge branch 'master' into PHRAS-3163-Prod-publication_fix-error-on-creation 2020-07-03 19:16:30 +04:00
Nicolas Maillat
087d783957 Merge pull request #3554 from alchemy-fr/PHRAS-3157_prod_video_tools 
PHRAS-3157 merge Prod - Video Tools - Thumbnail tab - some fix
 2020-07-03 16:53:33 +02:00
aynsix
dad3bc4577 fix /thesaurus/populate return 2020-07-03 17:23:15 +03:00
Harrys Ravalomanana
21deba424f PHRAS-3163 rebase branch 2020-07-03 17:31:57 +04:00
Harrys Ravalomanana
d4bf89e8fe PHRAS-3157 upgrade phraseanet-production-client 2020-07-03 17:13:45 +04:00
aynsix
8d1fd1703b fix version to 4.1.1 2020-07-03 16:13:28 +03:00
aynsix
554d201c2d fix repo lazylocator 2020-07-03 15:16:56 +03:00
Harrys Ravalomanana
dfb0436bed PHRAS-3163 Publications fix #time 2h 2020-07-03 15:15:37 +04:00
aynsix
e878a60c5e fix log 2020-07-03 13:23:08 +03:00
aynsix
122c4c8607 add log 2020-07-03 13:18:34 +03:00
aynsix
1bdc82232f fix permalink url 2020-07-03 12:59:45 +03:00
aynsix
e790c2dc6e create subtitle worker 2020-07-03 11:54:19 +03:00
aynsix
952dd0f559 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2504-ginga-subtitle 2020-07-03 11:25:40 +03:00
Harrys Ravalomanana
e6bdcad4ba PHRAS-3157 : video tools : change loader gif 2020-07-03 10:51:38 +04:00
Harrys Ravalomanana
5ebc5f170e Merge branch 'master' into PHRAS-3157_prod_video_tools 2020-07-02 19:36:00 +04:00
Harrys Ravalomanana
d54b2a1e24 PHRAS-3157 Video tools 2020-07-02 19:21:55 +04:00
Nicolas Maillat
910e6c8be3 Merge pull request #3552 from alchemy-fr/PHRAS-3148_thesaurus_Guy 
PHRAS-3148 Merge fix populate from Thesaurus GUI
 2020-07-02 14:42:21 +02:00
Nicolas Maillat
17242dee8f Merge branch 'master' into PHRAS-3148_thesaurus_Guy 2020-07-02 13:38:59 +02:00
gjacobjn
b647f17228 Update entrypoint.sh 2020-07-02 12:37:36 +02:00
gjacobjn
2b61f1963f Update docker-compose.yml 2020-07-02 12:33:45 +02:00
Harrys Ravalomanana
e7e1e08c33 PHRAS-3148 2020-07-02 14:32:42 +04:00
gjacobjn
e444e67215 Update .env 2020-07-02 12:31:45 +02:00
Harrys Ravalomanana
2b432e2a8f PHRAS-3148 : unbind click on populate buton 2020-07-02 14:29:39 +04:00
Harrys Ravalomanana
e01daeed8c PHRAS-3148 Properties remove Hits 2020-07-02 12:23:25 +04:00