Nicolas Maillat
|
b3956f28a5
|
Merge branch 'master' into PHRAS-2846-Prod_Push_windows_fix_butto_style
|
2019-11-29 14:35:08 +01:00 |
|
Nicolas Maillat
|
a5adab6cf4
|
Merge pull request #3243 from HRavalomanana/PHRAS-2774_Prod_answer_grid_Add_margin-bottom
PHRAS-2774 #comment mergeof Prod answer grid: add margin-bottom (upgrade ppc@0.34.81-d)
|
2019-11-29 14:31:31 +01:00 |
|
Nicolas Maillat
|
4d3b7b3b05
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-29 13:14:38 +01:00 |
|
Nicolas Maillat
|
f28488b6ec
|
Merge branch 'master' into PHRAS-1154-remove-all-last-default-query
|
2019-11-29 13:14:21 +01:00 |
|
Nicolas Maillat
|
b515ff7e7d
|
Merge pull request #3241 from alchemy-fr/PHRAS-1324-libfaac-abandoned-4-1
PHRAS-1324 #comment merge libfaac abandoned 4.1
|
2019-11-29 13:13:55 +01:00 |
|
Nicolas Maillat
|
016f331906
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-29 11:22:41 +01:00 |
|
Nicolas Maillat
|
5224ba5ea2
|
Merge branch 'master' into PHRAS-2846-Prod_Push_windows_fix_butto_style
|
2019-11-29 11:22:09 +01:00 |
|
Nicolas Maillat
|
61dd9b899f
|
Merge branch 'master' into PHRAS-1324-libfaac-abandoned-4-1
|
2019-11-29 10:41:55 +01:00 |
|
Nicolas Maillat
|
2eb9a24aef
|
Merge pull request #3244 from alchemy-fr/PHRDPL-82_opmimize_dockerfile
PHRDPL-82 #comment merge Optimize docker build speed
|
2019-11-29 10:41:01 +01:00 |
|
Harrys Ravalomanana
|
16a9863b0f
|
PHRAS-2846 #comment fix button style on Prod-push window #time 2h
|
2019-11-29 12:31:14 +04:00 |
|
aynsix
|
166c302889
|
remove all and last in default query pref
|
2019-11-29 12:22:24 +04:00 |
|
Nicolas Maillat
|
772cdf846e
|
Merge branch 'master' into PHRAS-1324-libfaac-abandoned-4-1
|
2019-11-28 21:08:11 +01:00 |
|
Alexandre BRACH
|
94f6fe9265
|
PHRDPL-82 #comment Optimize docker build speed
|
2019-11-28 17:19:58 +01:00 |
|
aynsix
|
c9356ec206
|
max_items depends on header application/vnd.phraseanet.story-paginate
|
2019-11-28 18:15:55 +04:00 |
|
aynsix
|
4acc98574b
|
Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2196-api-stories-pagination
|
2019-11-28 18:14:19 +04:00 |
|
Nicolas Maillat
|
f2874aa5c2
|
Merge branch 'master' into PHRAS-2774_Prod_answer_grid_Add_margin-bottom
|
2019-11-28 15:03:38 +01: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 |
|
Harrys Ravalomanana
|
88d586b246
|
PHRAS-2774 Prod answer grid: add margin bottom (upgrade phraseanet-production-client)
|
2019-11-28 17:31:00 +04:00 |
|
Alexandre BRACH
|
fe243ebdff
|
circleci #comment circleci refactor build
|
2019-11-28 12:31:58 +01:00 |
|
Nicolas Maillat
|
d7a37890b3
|
Merge branch 'master' into PHRAS-1324-libfaac-abandoned-4-1
|
2019-11-28 09:48:20 +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 |
|
aynsix
|
cb38023290
|
libfaac abandoned
|
2019-11-27 17:37:05 +04:00 |
|
Nicolas Maillat
|
e6ebc29ecd
|
Merge branch 'master' into PHRAS-2196-api-stories-pagination
|
2019-11-27 13:21:31 +01: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 |
|