Commit Graph

13195 Commits

Author SHA1 Message Date
Alexandre BRACH
5f1f8b3b43 kubernetes #comment add composer in the fpm/worker images 2019-10-18 16:49:01 +02:00
Nicolas Maillat
ad76d73e64 Merge branch 'master' into kubernetes_ready 2019-10-18 11:23:59 +02:00
Nicolas Maillat
1becb29bc3 Merge pull request #3190 from xrousset78800/PHRAS-2791/serve-poster-image-with-subdef-permalink
PHRAS-2791  #comment merge  in 4.1 Serve a permalink instead of direct url.
2019-10-09 17:18:42 +02:00
Xavier Rousset
f6faaee857 PHRAS-2791 | 4.1 | Serve a permalink instead of direct url in case of specific subdef is selected 2019-10-09 17:04:08 +02:00
Nicolas Maillat
59900c3cdf Merge pull request #3189 from jygaulier/PHRAS-2751_geoloc-search-403err_master
PHRAS-2751 #comment geoloc search 403err master
2019-10-08 16:35:24 +02:00
Jean-Yves Gaulier
a4631cb434 PHRAS-2751_geoloc-search-403err_master
fix : geoloc search should work again (missed method during PHRAS-2707)
2019-10-08 15:30:19 +02:00
Alexandre BRACH
9b25efdc67 kubernetes #comment add global nginx configuration 2019-10-04 15:56:38 +02:00
Alexandre BRACH
9fdd704d5a kubernetes #comment create needed directory for worker 2019-10-04 09:30:42 +02:00
Alexandre BRACH
6660c7fe32 kubernetes #comment tmp owner is root at fpm startup 2019-10-03 16:40:02 +02:00
Alexandre BRACH
c85796fb29 kubernetes #comment fix permissions on datas and thumbnails directory at startup 2019-09-27 17:08:15 +02:00
Alexandre BRACH
b87ab0cd08 kubernetes #comment fpm stop on failure 2019-09-27 16:28:49 +02:00
Nicolas Maillat
d6c61eba28 Merge pull request #3179 from aynsix/PHRAS-2754-reactivate-permalink-41
PHRAS-2754 #comment merge in  4.1, reactivate permalink when record moved from TRASH
2019-09-27 16:27:05 +02:00
Nicolas Maillat
90959422eb Merge branch 'master' into PHRAS-2754-reactivate-permalink-41 2019-09-27 16:10:59 +02:00
Alexandre BRACH
b66aae5047 kubernetes #comment Reconfigure nginx to serve log on stdout 2019-09-27 14:31:17 +02:00
Nicolas Maillat
49ed81244e Merge pull request #3169 from HRavalomanana/PHRAS-2686_paging_new_design
PHRAS-2686 #comment merge Prod - answer grid - Keep Pagination always visible. last fix for max page number
2019-09-27 12:48:43 +02:00
Alexandre BRACH
b7f5a4cf3c kubernetes #comment Fix the owner of config to app at the fpm container startup 2019-09-27 10:20:58 +02:00
Alexandre BRACH
cea47e8725 kubernetes #comment remove unused server_name directive in nginx 2019-09-27 10:20:58 +02:00
aynsix
dbaca5bb94 reactivate permalink when record moved from TRASH 4.1 2019-09-27 11:49:09 +04:00
Nicolas Maillat
fcb275da4c Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-23 12:24:00 +02:00
Nicolas Maillat
62430e7c5d Merge pull request #3099 from jygaulier/PHRAS-2666_slow-notifications_4.1
PHRAS-2666 #comment merge slow notifications 4.1
2019-09-23 12:23:29 +02:00
jygaulier
704e119f6b Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-09-23 12:04:11 +02:00
Nicolas Maillat
39103c8509 Merge pull request #3103 from aynsix/PHRAS-2436-port-41
PHRAS-2436 #comment merge fix port to 4.1 extract xmp:PageImage indesign
2019-09-23 09:12:26 +02:00
aynsix
70c79d8118 merge 2019-09-23 10:52:31 +04:00
Nicolas Maillat
799dc1fef4 Merge pull request #3170 from HRavalomanana/PHRAS-2686_upgrade_phraseanet_production_client
PHRAS-2686 #comment merge upgrade phraseanet-production-client
2019-09-20 16:29:33 +02:00
Harrys Ravalomanana
d202fe5980 PHRAS-2686 upgrade phraseanet-production-client 2019-09-20 15:20:58 +04:00
Harrys Ravalomanana
e052d2ad06 Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-20 14:35:36 +04:00
Nicolas Maillat
861785e7ab Merge pull request #3168 from HRavalomanana/PHRAS-2721_Edit_form_fix_submit_form
PHRAS-2721  #comment merge Edit form : Clicking back on a multivalued field entry value form add value to field
2019-09-20 10:41:35 +02:00
Nicolas Maillat
7865c14bcc Merge branch 'master' into PHRAS-2721_Edit_form_fix_submit_form 2019-09-20 10:19:14 +02:00
Nicolas Maillat
456b65e481 Merge pull request #3167 from HRavalomanana/PHRAS-2661_help_menu
PHRAS-2661 #comment  Help menue : click on arrow doesn't open sub menue
2019-09-20 10:16:21 +02:00
Nicolas Maillat
db453645fa Merge branch 'master' into PHRAS-2661_help_menu 2019-09-20 09:53:01 +02:00
Harrys Ravalomanana
c16dc45208 PHRAS-2686 2019-09-20 11:10:26 +04:00
Harrys Ravalomanana
c0350649a1 Merge branch 'master' into PHRAS-2686_paging_new_design 2019-09-20 10:03:32 +04:00
Nicolas Maillat
6c17e6bf87 Merge pull request #3165 from HRavalomanana/PHRAS-2282_upgrade_phraseanet-production-client
PHRAS-2282 #comment merge Design of new basket windows Browser with last fix
2019-09-19 12:42:28 +02:00
Harrys Ravalomanana
b3af2c26b2 PHRAS-2686 2019-09-18 17:43:42 +04:00
Harrys Ravalomanana
44199925cd PHRAS-2721 #comment fix Edit form: multi-values submit #time 3h 2019-09-18 10:39:43 +04:00
Harrys Ravalomanana
20e918175c PHRAS-2661 2019-09-17 16:17:23 +04:00
Harrys Ravalomanana
a66c813835 PHRAS-2282 change icon 2019-09-17 14:15:27 +04:00
Harrys Ravalomanana
be9220969b PHRAS-2282 #time 4h 2019-09-17 13:34:06 +04:00
Harrys Ravalomanana
de46a85bce PHRAS-2661 #comment fix menu bar: help menu #time 3h 2019-09-16 17:58:39 +04:00
Harrys Ravalomanana
a1ce905c73 PHRAS-2282 #comment Add fix #time 3h 2019-09-12 17:31:01 +04:00
Nicolas Maillat
eda2c0555a Merge pull request #3163 from HRavalomanana/PHRAS-2282_upgrade_phraseanet-production-client
PHRAS-2282 #comment Merge Phraseanet side upgrade phraseanet-production-client@0.34.63-d
2019-09-10 14:30:58 +02:00
Nicolas Maillat
dda8eb05bb Merge branch 'master' into PHRAS-2282_upgrade_phraseanet-production-client 2019-09-10 13:34:20 +02:00
Nicolas Maillat
7756636a2a Merge pull request #3140 from xrousset78800/PHRAS-2127/fix-geoname-on-registration
PHRAS-2127 #comment Merge Add https in default geoname server url
2019-09-10 13:32:55 +02:00
Nicolas Maillat
4ce653b228 Merge branch 'master' into PHRAS-2127/fix-geoname-on-registration 2019-09-10 12:53:35 +02:00
Nicolas Maillat
1bcc71d9fb Merge pull request #3135 from HRavalomanana/PHRAS-2282_design_of_new_Browser_basket_windows
PHRAS-2282 #comment Merge Phraseanet side of Design of new basket windows Browser
2019-09-10 12:53:06 +02:00
Nicolas Maillat
3c6f12c5d9 Merge branch 'master' into PHRAS-2282_design_of_new_Browser_basket_windows 2019-09-10 12:37:39 +02:00
Nicolas Maillat
bb19ebb39c Merge pull request #3138 from HRavalomanana/PHRAS-2706
PHRAS-2706 #comment Merge Phraseanet side of  Prod - Basket browser windows - Received basket filter basket
2019-09-10 12:36:52 +02:00
Nicolas Maillat
e76c32338b Merge branch 'master' into PHRAS-2706 2019-09-10 12:22:17 +02:00
Nicolas Maillat
4ee22be6f2 Merge pull request #3146 from aynsix/PHRAS-2705-basket-browser-windows-nok
PHRAS-2705 #comment merge in Phraseanet repo fix basket browser windows nok
2019-09-10 12:21:55 +02:00
Harrys Ravalomanana
0212619314 PHRAS-2282 #comment upgrade phraseanet-production-client@0.34.63-d #time 2h 2019-09-10 14:03:51 +04:00