hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,890 Commits 268 Branches 107 Tags
eef9bb21e3c6a6d4826318ac888d3f540befe63c
Commit Graph

12890 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
eef9bb21e3 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-05-24 15:21:32 +04:00
Nicolas Maillat
6b887fcd97 Merge pull request #3050 from HRavalomanana/PHRAS-2592-embed_bundle_fix_audio_player 
PHRAS-2592 #comment composer.json : upgrade embed-bundle version for fix videojs player when read audio file
 2019-05-24 09:36:51 +02:00
Harrys Ravalomanana
a38a702ff4 PHRAS-2592 #comment update composer.json for embed-bundle #time 1h 2019-05-24 11:18:55 +04:00
Nicolas Maillat
8115d015e7 Merge pull request #3049 from alchemy-fr/PHRAS-2598_field_type_in_model 
PHRAS-2598 #comment Merge pull request #3049 from alchemy-fr/PHRAS-2598_field_type_in_model
 2019-05-23 22:58:18 +02:00
nmaillat
b4634a8bf7 PHRAS-2598 #comment add type string to fields, change to number lat and long for iptc's model #time 1h 2019-05-23 22:07:56 +02:00
jygaulier
2f36448d21 Merge pull request #2917 from HRavalomanana/PHRAS-2419_refacto_Icons_actions_under_Thumbnail 
PHRAS-2419 refacto_Icons_actions_under_Thumbnail
 2019-05-23 18:01:08 +02:00
jygaulier
9783bbb23d Merge branch 'master' into PHRAS-2419_refacto_Icons_actions_under_Thumbnail 2019-05-23 17:51:01 +02:00
Nicolas Maillat
2d97ec8ef0 Merge pull request #3046 from alchemy-fr/PHRAS-2561_clean_yarn 
PHRAS-2561 #comment clean yarn install
 2019-05-23 16:30:47 +02:00
Nicolas Maillat
4f359035ef PHRAS-2561 #comment rm yarn link before 2019-05-23 16:19:41 +02:00
Nicolas Maillat
256637024d Update config.yml 2019-05-23 16:03:08 +02:00
Nicolas Maillat
83cfeb95d8 Merge pull request #3045 from AlexandreBrach/PHRAS-2600-fpm-user 
PHRAS-2600 #comment merge fpm service doesn't use root account anymore
 2019-05-23 15:15:16 +02:00
Alexandre BRACH
bf6da6f438 fpm service doesn't use root account anymore 2019-05-23 12:16:24 +02:00
Nicolas Maillat
454613111c Merge pull request #3043 from alchemy-fr/PHRAS-2534_dublincore_template_update 
PHRAS-2534 #comment Dublincore Databox template update.
 2019-05-21 16:05:49 +02:00
Nicolas Maillat
3db65cc514 Dublincore Databox template update. 
PHRAS-2534 #comment Set type for all fields of this databox template  #time 30m
 2019-05-21 14:59:40 +02:00
Jennifer
3821e8af00 Translated using Weblate (German) 
Currently translated at 92.9% (2228 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Jennifer
00321b581a Translated using Weblate (French) 
Currently translated at 95.5% (2292 of 2398 strings)

PHRAS-2589
 2019-05-21 13:12:00 +02:00
Jennifer
32a7328650 Translated using Weblate (English) 
Currently translated at 97.8% (2346 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Jennifer
1dd15841b2 Translated using Weblate (French) 
Currently translated at 93.9% (2253 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Jennifer
74f60967d8 Translated using Weblate (German) 
Currently translated at 92.5% (2220 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Jennifer
17ca34e1c2 Translated using Weblate (French) 
Currently translated at 93.8% (2251 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Jennifer
01758cb26d Translated using Weblate (English) 
Currently translated at 96.4% (2313 of 2398 strings)
 2019-05-21 13:12:00 +02:00
Nicolas Maillat
e51daa0a04 Translated using Weblate (French) 
Currently translated at 92.7% (2223 of 2398 strings)
 2019-05-21 13:11:59 +02:00
Nicolas Maillat
ac628119c8 Merge pull request #3005 from MilosEsokia/PHRAS-2529_enable_debug_depending_on_environment 
PHRAS-2529 Enable console debug depending on environment
 2019-05-21 10:26:58 +02:00
Nicolas Maillat
5fd12d0b9b Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-21 10:19:36 +02:00
Nicolas Maillat
78babf729d Merge pull request #3042 from HRavalomanana/PHRAS-2589-Admin_personnalisation_logo_fix 
PHRAS-2589 Admin_personnalisation_logo_fix
 2019-05-21 09:42:42 +02:00
Harrys Ravalomanana
f5f0527600 PHRAS-2589-Admin-personnalisation update translation 2019-05-21 10:03:27 +04:00
Harrys Ravalomanana
28151751eb PHRAS-2589-Admin_personnalisation_logo_fix 2019-05-20 14:31:46 +04:00
Harrys Ravalomanana
f61efe1e45 PHRAS-2589-Admin_personnalisation_logo_fix 2019-05-20 14:23:38 +04:00
Nicolas Maillat
0acb794f56 Merge pull request #3041 from AlexandreBrach/PHRAS2586-data-folder 
PHRAS-2586 #comment make every writable folder writable
 2019-05-17 19:30:31 +02:00
Alexandre BRACH
136501909c make every writable folder writable 2019-05-17 19:22:29 +02:00
Nicolas Maillat
0698d58bff Merge pull request #3040 from AlexandreBrach/PHRAS-2585-Hotfix-Dockerfile 
PHRAS-2585 #comment copy to the right location
 2019-05-17 17:23:45 +02:00
Alexandre BRACH
0b2d033d50 copy to the right location 2019-05-17 17:17:51 +02:00
Nicolas Maillat
247daa7fba Merge pull request #3038 from AlexandreBrach/PHRAS-2540-docker-compose 
PHRAS-2540 #comment Dockerfile optimisation and add warning on WIP docker on README
 2019-05-17 16:00:33 +02:00
Alexandre BRACH
636a08bb4c Dockerfile optimisation and add warning on WIP docker on README 2019-05-17 15:09:56 +02:00
Nicolas Maillat
ff2c1eb219 Merge pull request #2948 from HRavalomanana/PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode 
PHRAS-2422 #comment Prod - Highlight fulltext is Nok when display option is "Graphiste mode"
 2019-05-17 12:09:46 +02:00
Nicolas Maillat
0c6385a7bb Merge branch 'master' into PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode 2019-05-17 10:49:43 +02:00
Nicolas Maillat
808ee121ad Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-16 22:29:57 +02:00
Nicolas Maillat
bc812d7b19 Merge pull request #3036 from AlexandreBrach/PHRAS-2582-docker-build-2-images 
Docker build instruction in README, circle-ci can build and push the …
 2019-05-16 17:57:08 +02:00
Alexandre BRACH
be588ca396 Docker build instruction in README, circle-ci can build and push the two images 2019-05-16 17:43:28 +02:00
Nicolas Maillat
23014279a8 Merge branch 'master' into PHRAS-2422_Prod-Highlight_fulltext_is_Nok_when_display_option_is_Graphiste_mode 2019-05-16 16:05:12 +02:00
Nicolas Maillat
6e55ff92d6 Merge pull request #3030 from HRavalomanana/PHRAS-2079_Admin_personnalisation_section 
PHRAS-2079 #comment merge Dev front of admin personnalisation section (upload logo) and Prod-Preview page
 2019-05-16 16:04:35 +02:00
Nicolas Maillat
609d50a4d6 Merge branch 'master' into PHRAS-2079_Admin_personnalisation_section 2019-05-16 15:50:57 +02:00
Harrys Ravalomanana
339e1bc811 Merge branch 'PHRAS-2079_Admin_personnalisation_section' of https://github.com/HRavalomanana/Phraseanet into PHRAS-2079_Admin_personnalisation_section 2019-05-16 17:41:07 +04:00
Harrys Ravalomanana
aafa248fed PHRAS-2079_Admin_personalisation_section #Remove console.log() 2019-05-16 17:40:19 +04:00
Nicolas Maillat
6352a0c351 Merge pull request #3032 from AlexandreBrach/PHRAS-2580-CircleCI-Docker-Layer-Caching 
CircleCI : building machine use Docker Llayer caching
 2019-05-16 15:26:15 +02:00
Alexandre BRACH
25b6679314 CircleCI : building machine use Docker Llayer caching 2019-05-16 15:05:39 +02:00
Nicolas Maillat
15ecb6e30e Merge pull request #3031 from alchemy-fr/PHRAS-2576_fix-warnmikey179-vfsstream 
PHRAS-2576 #comment typo fix mikey179/vfsstream check circleci execution
 2019-05-16 14:36:27 +02:00
Nicolas Maillat
bd58b8d2ed PHRAS-2576 #comment typo fix mikey179/vfsstream 2019-05-16 14:20:55 +02:00
Nicolas Maillat
9ffcb7b2e9 Merge branch 'master' into PHRAS-2079_Admin_personnalisation_section 2019-05-16 12:06:06 +02:00
Nicolas Maillat
ef4af8f41c Merge pull request #3010 from AlexandreBrach/PHRAS-2562-multistage 
PHRAS-2562 #comment Multistage build fix remove package.json
 2019-05-16 11:50:15 +02:00