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
12,862 Commits 268 Branches 107 Tags
5fd12d0b9b17a68025f42fe30096e97434276d5b
Commit Graph

12862 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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