hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,653 Commits 268 Branches 107 Tags
2b61f1963fbaf801e2f85d04d95e5a05c9220c82
Commit Graph

14653 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
gjacobjn
2b61f1963f Update docker-compose.yml 2020-07-02 12:33:45 +02:00
gjacobjn
e444e67215 Update .env 2020-07-02 12:31:45 +02:00
Nicolas Maillat
c0491b92be Merge pull request #3551 from alchemy-fr/PHRAS-3158_path_download_lazaret 
PHRAS-3158 merge adding missing env in phraseanet container
 2020-07-02 07:51:20 +02:00
Nicolas Maillat
fe57bdf8a5 adding missing env for phraseanet container 2020-07-02 00:08:16 +02:00
Nicolas Maillat
dc796b41e4 Merge pull request #3549 from alchemy-fr/PHRAS-3148_thesaurus_Guy 
PHRAS-3148 merge Thesaurus Guy : add string in properties modale for button, remove arrow to locale menue , fix issue about replace in stock from properties windows, remove delete button from properties modale
 2020-07-01 20:44:22 +02:00
Harrys Ravalomanana
a7bee21988 PHRAS-3148 : add string 2020-07-01 17:46:15 +04:00
Harrys Ravalomanana
d93b0151f2 Merge branch 'master' into PHRAS-3148_thesaurus_Guy 2020-07-01 17:41:07 +04:00
Harrys Ravalomanana
237f7a05a4 PHRAS-3148 2020-07-01 17:40:22 +04:00
Nicolas Maillat
73ff5faeca Merge pull request #3550 from alchemy-fr/PHRAS-3151-upgrade_mapbox 
PHRAS-3151 merge  upgrade phraseanet-production-client including subtitle and mapbox upgrade , subtitling is missing in 240-d version due to missing merge
 2020-07-01 14:00:40 +02:00
Harrys Ravalomanana
38f8a2c553 PHRAS-3151 upgrade phraseanet-production-client 2020-07-01 14:33:41 +04:00
Harrys Ravalomanana
88ac03d738 PHRAS-3148 upgrade phraseanet-production-client 2020-07-01 14:31:48 +04:00
Harrys Ravalomanana
ab6f7ebae4 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3148_thesaurus_Guy 2020-07-01 14:30:19 +04:00
Harrys Ravalomanana
fc7b477d59 PHRAS-3148 2020-07-01 13:32:26 +04:00
Nicolas Maillat
6ed33888bb Merge pull request #3545 from alchemy-fr/PHRAS-3151-upgrade_mapbox 
PHRAS-3151 merge upgrade mapbox web GL lib
 2020-07-01 11:32:05 +02:00
Nicolas Maillat
10693c739a Merge branch 'master' into PHRAS-3151-upgrade_mapbox 2020-06-30 23:31:04 +02:00
Nicolas Maillat
2d6711803e Merge pull request #3548 from alchemy-fr/PHRAS-3144-install-plugin 
PHRAS-3144 comment rm cache
 2020-06-30 23:30:23 +02:00
Nicolas Maillat
dbfdf1dded Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-30 23:10:29 +02:00
Nicolas Maillat
140d048068 Merge branch 'master' into PHRAS-3151-upgrade_mapbox 2020-06-30 20:55:47 +02:00
Nicolas Maillat
276c403f0b Translated using Weblate (French) 
Currently translated at 99.2% (2578 of 2598 strings)
 2020-06-30 18:52:04 +00:00
Nicolas Maillat
88e976c238 Translated using Weblate (English) 
Currently translated at 99.3% (2580 of 2598 strings)
 2020-06-30 18:50:56 +00:00
Nicolas Maillat
4a6e4b7876 Merge pull request #3547 from alchemy-fr/PHRAS-3148_thesaurus_Guy 
PHRAS-3148 merge Thesaurus GUI design improvement
 2020-06-30 20:37:40 +02:00
Harrys Ravalomanana
9e3d9f9c7d PHRAS-3148 improve thesaurus guy 2020-06-30 18:56:21 +04:00
Harrys Ravalomanana
87ea25214e Merge branch 'PHRAS-3151-upgrade_mapbox' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3151-upgrade_mapbox 2020-06-30 16:00:21 +04:00
Harrys Ravalomanana
0648e6d9cd PHRAS-3151 downgrade mapbox.js 2020-06-30 15:59:50 +04:00
Nicolas Maillat
5436a068e4 Translated using Weblate (French) 
Currently translated at 99.3% (2580 of 2598 strings)
 2020-06-30 11:50:56 +00:00
Nicolas Maillat
9061c68ab6 Translated using Weblate (English) 
Currently translated at 99.2% (2579 of 2598 strings)
 2020-06-30 11:49:18 +00:00
nmaillat
ee889b0596 comment rm cache/ 2020-06-30 10:03:25 +02:00
Nicolas Maillat
474b43bf09 Merge pull request #3546 from alchemy-fr/PHRAS-3144-install-plugin 
PHRAS-3144 merge Chown on plugin repository only if exist
 2020-06-29 19:27:38 +02:00
nmaillat
7ee68d0b67 Chown on plugin repository only if exist 2020-06-29 19:06:43 +02:00
Nicolas Maillat
397d94502b Merge branch 'master' into PHRAS-3151-upgrade_mapbox 2020-06-29 18:05:15 +02:00
Nicolas Maillat
418b8e7ee8 Translated using Weblate (French) 
Currently translated at 99.3% (2580 of 2598 strings)
 2020-06-29 15:59:42 +00:00
Nicolas Maillat
e754e49943 Translated using Weblate (English) 
Currently translated at 99.2% (2579 of 2598 strings)
 2020-06-29 15:59:41 +00:00
Harrys Ravalomanana
c55c0cbba9 PHRAS-3151 upgrade mapbox lib 2020-06-29 19:12:45 +04:00
Nicolas Maillat
ed037b4874 Merge pull request #3541 from alchemy-fr/PHRAS-3148_thesaurus_guy 
PHRAS-3148 Merge Thesaurus GUI - redirect all popup in modal on main windows
 2020-06-29 17:10:57 +02:00
Harrys Ravalomanana
ad7c7b145d PHRAS-3148 Add string translation 2020-06-29 11:57:00 +04:00
Harrys Ravalomanana
18d925b532 PHRAS-3148 fix n drag and drop from stock 2020-06-29 11:48:21 +04:00
Harrys Ravalomanana
b3f402a69f PHRAS-3148 2020-06-25 17:32:18 +04:00
Harrys Ravalomanana
b0ff7e228b Merge branch 'PHRAS-3148_thesaurus_guy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3148_thesaurus_guy 2020-06-25 17:28:04 +04:00
Harrys Ravalomanana
752e255f86 PHRAS-3148 : styling 2020-06-25 17:27:36 +04:00
Nicolas Maillat
cbe50ee973 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-25 12:57:48 +02:00
Nicolas Maillat
564546654e Adding notes about elasticsearch container 2020-06-25 12:19:43 +02:00
Harrys Ravalomanana
19c7b27ad4 Merge branch 'PHRAS-3148_thesaurus_guy' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3148_thesaurus_guy 2020-06-25 13:55:16 +04:00
Harrys Ravalomanana
b2774d8bb6 PHRAS-3148 Add accept term modal 2020-06-25 13:54:43 +04:00
Nicolas Maillat
3573939d9b Merge pull request #3539 from alchemy-fr/PHRAS-3144-install-plugin 
PHRAS-3144 merge change www and plugins directory owner on install , add volumes www/plugins to gateway
 2020-06-24 22:29:35 +02:00
Nicolas Maillat
9bcdbce1f9 Merge branch 'master' into PHRAS-3148_thesaurus_guy 2020-06-24 17:52:23 +02:00
Nicolas Maillat
76d0cef9b5 Merge branch 'master' into PHRAS-3144-install-plugin 2020-06-24 17:52:05 +02:00
Nicolas Maillat
27b424f712 Merge pull request #3544 from alchemy-fr/change-plugins-delimiter 
PHRAS-3144 merge change plugin delimiter
 2020-06-24 17:51:39 +02:00
Arthur de Moulins
2a37909341 change plugin delimiter 2020-06-24 17:20:34 +02:00
Harrys Ravalomanana
10eb3638e9 PHRAS-3148 2020-06-24 18:37:59 +04:00
Harrys Ravalomanana
6a5b96be6a PHRAS-3148 2020-06-24 18:29:33 +04:00