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,995 Commits 268 Branches 107 Tags
713e41fac76bf480985b95275da3621675e27f2d
Commit Graph

12995 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Nicolas Maillat
69862ee289 Merge branch 'master' into PHRAS-2562-multistage 2019-05-16 11:29:24 +02:00
Nicolas Maillat
e569db8a65 Merge branch 'master' into PHRAS-2079_Admin_personnalisation_section 2019-05-16 11:29:03 +02:00
Nicolas Maillat
cf5a47797c Merge pull request #3025 from aynsix/PHRAS-2564-permalink-video-start-url-parameter 
PHRAS-2564 #comment merge Permalink on video file , add start parameter on url
 2019-05-16 11:28:35 +02:00
Nicolas Maillat
c77cf24545 Merge branch 'master' into PHRAS-2564-permalink-video-start-url-parameter 2019-05-16 10:56:21 +02:00
Nicolas Maillat
f5af760e86 Remove artefact 2019-05-16 10:55:35 +02:00
Harrys Ravalomanana
f8a28f6821 PHRAS-2079_Prod_Preview_logo 2019-05-16 10:38:28 +04:00
Harrys Ravalomanana
27971580f1 PHRAS-2079_Admin_personnalisation_section 2019-05-16 10:11:11 +04:00
Nicolas Maillat
474b81f091 Merge branch 'master' into PHRAS-2562-multistage 2019-05-15 18:19:04 +02:00
Nicolas Maillat
d58fa56cd0 Merge pull request #3029 from xrousset78800/fix/update-playbook-for-phraseanet-box 
PHRAS-2565 #comment Update playbook for phraseanet vagrant box workflow
 2019-05-15 17:44:40 +02:00
Xavier Rousset
02790561b6 Update playbook for phraseanet vagrant box workflow 2019-05-15 17:22:11 +02:00
Nicolas Maillat
b8cdefcd5b Merge pull request #3022 from jygaulier/PHRAS-2399_arch-task-cnx-timeout_4.1 
PHRAS-2399 #comment db reconnection in each methods
 2019-05-15 17:08:04 +02:00
aina-esokia
4097e19abb add a video start t parameter in permalink url 
#time 6h
 2019-05-15 16:13:16 +04:00
Jean-Yves Gaulier
0d0e5e6388 PHRAS-2399_arch-task-cnx-timeout_4.1 
add reconnect everywhere
 2019-05-15 11:50:27 +02:00
Nicolas Maillat
5f5afc6a76 Merge pull request #3020 from jygaulier/PHRAS-2563_subdef-task-alldb_4.1 
PHRAS-2563_subdef-task-alldb_4.1
 2019-05-14 17:05:41 +02:00
Jean-Yves Gaulier
c0fb681400 PHRAS-2563_subdef-task-alldb_4.1 
fake change to run tests
 2019-05-14 16:51:43 +02:00
Jean-Yves Gaulier
cf542587a0 PHRAS-2563_subdef-task-alldb_4.1 
subdef task : if the "all" databox is checked, the task runs on every dbox (even the new ones)
also : changed the task-manager notification timeout to 1s to be more responsive.
 2019-05-14 16:51:43 +02:00
Nicolas Maillat
8063436167 Merge pull request #3019 from aynsix/PHRAS-2557-port-share-media-on-linkedin 
PHRAS-2557 #comment Port to 4.1 - Allow to share media on LinkedIn.com
 2019-05-14 16:09:17 +02:00
Nicolas Maillat
a61eb423ce Merge branch 'master' into PHRAS-2557-port-share-media-on-linkedin 2019-05-14 15:53:14 +02:00
Nicolas Maillat
0b1a36e08e Merge pull request #3018 from HRavalomanana/PHRAS-2552_Videojs_embed_bundle_update_workflow_bis 
PHRAS-2552 #comment merge embed_bundle_update_workflow
 2019-05-14 15:52:53 +02:00
aina-esokia
506f0eef6a port to 4.1 share media in linkedin 
#time 1h
 2019-05-14 17:41:16 +04:00
Nicolas Maillat
9c84ea3803 PHRAS-2552 #comment add caret to embed-bundle version 2019-05-14 15:06:57 +02:00
Harrys Ravalomanana
0e150f07a5 PHRAS-2552_embed_bundle_update_workflow 2019-05-14 16:46:37 +04:00
Nicolas Maillat
c965b5b449 Merge pull request #3016 from HRavalomanana/PHRAS-2552_Videojs_embed_bundle_update_workflow 
PHRAS-2552 #comment Change workflow for front deployment of embed-bundl. front is now deploy from vendor/alchemy/embed-bundle, stop using npm.org repo
 2019-05-14 14:13:37 +02:00
Harrys Ravalomanana
52b4e0014b PHRAS-2552-embed-bundle-edit-workflow 2019-05-14 15:47:11 +04:00
Milos Esokia
ec205d9b1b Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-14 13:22:06 +02:00
MilosEsokia
fa547e15e6 Removing duplicated clause 2019-05-14 13:15:32 +02:00
Nicolas Maillat
3919e3288f Merge pull request #3015 from HRavalomanana/PHRAS-2552_Videojs_embed_bundle_set_reading_head_position_at_specific_time 
PHRAS-2552 #comment Move to new organisation for the repo embed-bundle, see also issue PHRAS-2555
PHRAS-2555 #comment  Phraseanet use now the new repo organisation
 2019-05-14 12:59:54 +02:00
Harrys Ravalomanana
5e1cce59df PHRAS-2552_Videojs_embed_bundle_set_reading_head_position_at_specific_time 2019-05-14 14:42:48 +04:00
Nicolas Maillat
a438dcd272 Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-14 11:20:50 +02:00
Nicolas Maillat
f09c991b3f Update Dockerfile 2019-05-13 14:38:15 +02:00
Nicolas Maillat
6bb9425028 Merge branch 'master' into PHRAS-2562-multistage 2019-05-13 13:12:38 +02:00
Alexandre BRACH
9e0203c6b7 Multistage build 2019-05-13 11:06:03 +02:00
Nicolas Maillat
6068f12408 Update README.md 2019-05-10 21:20:47 +02:00
Nicolas Maillat
6660016b38 Merge branch 'master' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-10 21:15:11 +02:00
Nicolas Maillat
ce50edfadd Merge pull request #3007 from aynsix/PHRAS-2546-applog-in-stderr 
PHRAS-2546 : add monolog handler
 2019-05-10 21:14:51 +02:00
Nicolas Maillat
2f08b212a3 Merge branch 'master' into PHRAS-2546-applog-in-stderr 2019-05-10 21:03:13 +02:00
Nicolas Maillat
04a541aefa Merge pull request #3009 from alchemy-fr/PHRAS-2561_fix_test_oncircle_dockerImageBuild 
PHRAS-2561 #comment merged, we need to return to a simple run: yarn install
#time 2h
 2019-05-10 21:02:52 +02:00
Nicolas Maillat
b19f36516d PHRAS-2561 installing yarn 
PHRAS-2561 #comment installing yarn for nodes version 10.12.0
 2019-05-10 20:24:10 +02:00
Nicolas Maillat
e4db07278b PHRAS-2561 #comment force using specific yarn version 2019-05-10 19:57:54 +02:00
Nicolas Maillat
c0f2f16dd0 PHRAS-2561 #comment update yarn version 2019-05-10 18:02:02 +02:00
Nicolas Maillat
e39c131a65 Merge branch 'master' into PHRAS-2546-applog-in-stderr 2019-05-10 16:01:29 +02:00
Nicolas Maillat
30a324c235 Merge pull request #3008 from alchemy-fr/PHRAS-2561_fix_test_oncircle_dockerImageBuild 
PHRAS-2561 #comment Remove npm install  and Add yarn Install
 2019-05-10 16:00:28 +02:00
Nicolas Maillat
ca5deb6455 PHRAS-2561 #comment remove npm install add yarn Install 2019-05-10 15:46:20 +02:00
aina-esokia
54adff50b9 add monolog handler 2019-05-10 12:15:59 +04:00
MilosEsokia
98e0988f0f Merge remote-tracking branch 'origin/PHRAS-2529_enable_debug_depending_on_environment' into PHRAS-2529_enable_debug_depending_on_environment 2019-05-08 11:06:00 +02:00