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
13,346 Commits 268 Branches 107 Tags
16a9863b0fe22ed88c6326c2b3e185f7411450e4
Commit Graph

13346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
16a9863b0f PHRAS-2846 #comment fix button style on Prod-push window #time 2h 2019-11-29 12:31:14 +04:00
Nicolas Maillat
31d45b296e Merge pull request #3233 from alchemy-fr/circleci_use_cache 
PHRAS-2845 #comment Circleci refactor build image
 2019-11-28 15:02:40 +01:00
Alexandre BRACH
fe243ebdff circleci #comment circleci refactor build 2019-11-28 12:31:58 +01:00
Nicolas Maillat
40f66ad3ea Merge pull request #3242 from HRavalomanana/PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report-b 
PHRAS-2829 #comment merge Lightbox mobile : sort basket list + add user info
 2019-11-28 09:43:14 +01:00
Harrys Ravalomanana
59a8439ad7 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report-b 2019-11-28 11:23:26 +04:00
Harrys Ravalomanana
2cbaaa4fc1 PHRAS-2829 #comment Lightbox mobile filter sort of basket list + add user info #time 4h 2019-11-28 10:50:27 +04:00
Nicolas Maillat
f7c319f18c Merge pull request #3239 from HRavalomanana/PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report-b 
PHRAS-2829 #comment merge of lightbox  hide list of users depending on right access
 2019-11-27 13:04:28 +01:00
Harrys Ravalomanana
0ca3469bf3 PHRAS-2829 lightbox hide list of users 2019-11-27 15:26:50 +04:00
Nicolas Maillat
5e5bc0a9e9 Merge pull request #3222 from aynsix/PHRAS-2814-setup-install-elasticsearch-information 
PHRAS-2814 #comment merge  Elasticsearch informations on setup command line options are missing on master version
 2019-11-26 17:42:59 +01:00
Nicolas Maillat
32bd07e804 Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information 2019-11-26 16:08:58 +01:00
Nicolas Maillat
0488209887 Merge pull request #3223 from HRavalomanana/PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 
PHRAS-2829 #comment merge  Port 41 of Lightbox mobile: user choice and validation report
 2019-11-26 16:08:03 +01:00
Nicolas Maillat
9e2d9434b5 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 2019-11-26 15:56:43 +01:00
Harrys Ravalomanana
861c13b07a PHRAS-2829 set height of image 2019-11-26 17:57:02 +04:00
Harrys Ravalomanana
194d8e243a PHRAS-2829 #comment fix lightbox mobile 2019-11-26 16:33:09 +04:00
Nicolas Maillat
59349de2fb Merge pull request #3236 from jygaulier/PHRAS-2796_actionbar-enhancements_4.1 
PHRAS-2796 #comment merge of action bar enhancements 4.1 for plugin
 2019-11-25 21:32:53 +01:00
Nicolas Maillat
dca17064af Merge branch 'master' into PHRAS-2796_actionbar-enhancements_4.1 2019-11-25 16:20:32 +01:00
Nicolas Maillat
597043674c Merge pull request #3237 from aynsix/PHRAS-2834-field-editable-visible-true 
PHRAS-2834 #comment Now When create a database from model, all fields have properties gui_editable gui_visible set to true
 2019-11-25 16:20:12 +01:00
aynsix
4944822062 fields gui_editable and guivisible set to true by default 2019-11-25 18:47:43 +04:00
Harrys Ravalomanana
c9907449a3 merge branch from master 2019-11-25 18:39:07 +04:00
Nicolas Maillat
b58a0c95e3 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 2019-11-25 15:23:25 +01:00
jygaulier
2aef7273eb Merge branch 'master' into PHRAS-2796_actionbar-enhancements_4.1 2019-11-25 14:47:45 +01:00
Harrys Ravalomanana
7a88ece5fe PHRAS-2829 2019-11-25 17:45:29 +04:00
Jean-Yves Gaulier
ac45c47ca2 PHRAS-2796_actionbar-enhancements_4.1 
fix toolbar plugin button to trigger action
 2019-11-25 14:41:07 +01:00
Nicolas Maillat
3b8163e98c Merge pull request #3234 from alchemy-fr/PHRAS-2842_audio_codec_libmp3lame 
PHRAS-2842 #comment change audio codec in databases models #time 15m
 2019-11-23 08:17:17 +01:00
nmaillat
1f5a484a3a PHRAS-2842 #comment change audio codec in databases model #time 1h 2019-11-22 22:55:19 +01:00
Nicolas Maillat
fe74bf62c4 Merge pull request #3230 from alchemy-fr/PHRDPL-81_circleci_docker_tag 
PHRDPL-81 #comment Use circle env vars CIRCLE_BRANCH
 2019-11-22 17:22:48 +01:00
Nicolas Maillat
1ccda42f8d update repo name 2019-11-22 16:59:16 +01:00
Nicolas Maillat
6040917774 Merge branch 'master' into PHRDPL-81_circleci_docker_tag 2019-11-22 16:53:29 +01:00
Alexandre BRACH
6a5678d1b7 PHRDPL-81 #comment remove obsolete param in circuleci.xml 2019-11-22 16:37:14 +01:00
Nicolas Maillat
60f13074e9 Merge pull request #3232 from alchemy-fr/reqdme-docker-deployment 
README instruction to deploy the phraseanet stack
 2019-11-22 16:25:48 +01:00
Alexandre BRACH
03402cec92 #comment README instruction to deploy the phraseanet stack 2019-11-22 15:47:31 +01:00
Alexandre BRACH
3c0bf41e51 PHRDPL-81 #comment Use circle env vars CIRCLE_BRANCH to push image with correct tag 2019-11-22 15:29:50 +01:00
Nicolas Maillat
a9ed349f86 Merge branch 'master' into PHRAS-2829_Port41_Lightbox-mobile-users-choice-and-validation-report 2019-11-22 15:21:00 +01:00
Harrys Ravalomanana
fb708cb131 PHRAS-2829 #comment fix lightbox mobile #time 8h 2019-11-22 17:50:55 +04:00
Jean-Yves Gaulier
59a417bd59 PHRAS-2796_actionbar-enhancements_4.1 
fix (contextual menu was rendered in toolbar)
 2019-11-21 19:09:50 +01:00
Jean-Yves Gaulier
472a054919 PHRAS-2796_actionbar-enhancements_4.1 
fix missing option, bad icons
 2019-11-21 14:52:09 +01:00
Harrys Ravalomanana
443fce14da PHRAS-2829 lightbox-mobile nw design 2019-11-21 17:30:07 +04:00
Jean-Yves Gaulier
257bc50e3e PHRAS-2796_actionbar-enhancements_4.1 
fix work on selected record
 2019-11-21 14:28:20 +01:00
Jean-Yves Gaulier
246ffd15ef PHRAS-2796_actionbar-enhancements_4.1 
port code from 4.0
 2019-11-21 14:11:33 +01:00
Nicolas Maillat
e79b409354 Merge pull request #3227 from jygaulier/PHRAS-2830_space-in-query_4.1 
PHRAS-2830 #comment  space-in-query_4.1
 2019-11-21 09:07:55 +01:00
Nicolas Maillat
c9b6e7175a Merge branch 'master' into PHRAS-2830_space-in-query_4.1 2019-11-20 22:36:59 +01:00
Nicolas Maillat
2ebb05be4a Merge pull request #3207 from alchemy-fr/dependabot/npm_and_yarn/fstream-1.0.12 
PHRAS-2515 #comment Bump fstream from 1.0.11 to 1.0.12
 2019-11-20 22:36:19 +01:00
Nicolas Maillat
9b3a751f8a Merge branch 'master' into PHRAS-2830_space-in-query_4.1 2019-11-20 19:28:00 +01:00
Nicolas Maillat
2e10a1121a Merge branch 'master' into dependabot/npm_and_yarn/fstream-1.0.12 2019-11-20 19:27:45 +01:00
Nicolas Maillat
57a988ffb7 Merge pull request #3208 from alchemy-fr/dependabot/npm_and_yarn/mixin-deep-1.3.2 
PHRAS-2515 #comment Bump mixin-deep from 1.3.1 to 1.3.2 github  bot pr
 2019-11-20 19:27:20 +01:00
Jean-Yves Gaulier
bac72e269a PHRAS-2830_space-in-query_4.1 
fixed grammar
 2019-11-20 18:34:55 +01:00
Nicolas Maillat
3aac7f692e Merge branch 'master' into dependabot/npm_and_yarn/mixin-deep-1.3.2 2019-11-20 18:31:51 +01:00
Nicolas Maillat
078c7c8be6 Merge branch 'master' into PHRAS-2814-setup-install-elasticsearch-information 2019-11-20 15:49:06 +01:00
Harrys Ravalomanana
b98d51397d PHRAS-2829 #comment lightbox: fix basket display on mobile #time 1h 2019-11-20 16:37:53 +04:00
Nicolas Maillat
425264edb4 Merge pull request #3213 from HRavalomanana/PHRAS-2824_admin_add_string_translation 
PHRAS-2824 #comment Admin add string for Gui_editable and Gui_visible in admin
 2019-11-20 10:53:42 +01:00