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,799 Commits 268 Branches 107 Tags
6bb94250288dc8ca2007ee6d4417332f51a0bc5e
Commit Graph

12799 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Nicolas Maillat
b2f2149f08 Merge pull request #3004 from HRavalomanana/PHRAS-2551-Advance_search-search_on_date_field_NOK_when_selected_field_is_reset 
PHRAS-2551 #comment  Advance search - search on date field NOK when selected date field is reset
 2019-05-07 14:11:57 +02:00
Harrys Ravalomanana
61ee6e0839 PHRAS-2551 remove package-lock.json 2019-05-07 15:57:10 +04:00
Harrys Ravalomanana
68e4b2542d PHRAS-2551-Advance_search-search_on_date_field_NOK_when_selected_field_is_reset update phraseanet-production-client version 2019-05-07 15:07:03 +04:00
Nicolas Maillat
904b67192e Merge pull request #2923 from HRavalomanana/PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 
PHRAS-2430 #comment Port to 4.1 - Advance search refacto , Restore Query, JYG refacto, HR transcript, Phraseanet-Production-Client need to be set to 0.34.8 in composer.json
 2019-05-03 21:19:13 +02:00
Nicolas Maillat
70430b5891 PHRAS-2430 rollback Phraseanet-production-client 
PHRAS-2430 #comment rollback Phraseanet-production-client to 0.33.7
 2019-05-03 20:36:34 +02:00
Nicolas Maillat
4008d14d3c Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-05-03 20:32:55 +02:00
Nicolas Maillat
d5fb463108 PHRAS-2430 Bump version of phraseanet-production-client 
PHRAS-2430 #comment change version of of phraseanet-production-client to 0.34.8
#time 1h bump version to 0.34.8
 2019-05-03 20:29:55 +02:00
Nicolas Maillat
e63e384dd0 Merge pull request #3003 from alchemy-fr/PHRAS-2539_remove_workflow_filtering 
PHRAS-2539 remove workflow branch filtering
 2019-05-03 20:16:02 +02:00
Nicolas Maillat
59439c5698 Update config.yml 2019-05-03 19:10:58 +02:00
Nicolas Maillat
a9ff9c3c06 PHRAS-2539 remove workflow branch filtering 
PHRAS-2539 #comment remove workflow branch filtering
 2019-05-03 17:37:44 +02:00
Nicolas Maillat
9e5623240e Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-05-03 17:07:20 +02:00
Nicolas Maillat
5fc0835d57 PHRAS-2539 Merge pull request #3002 from alchemy-fr/PHRAS-2539_circleCI_image 
PHRAS-2539 #comment  circleci image
PHRAS-2539 #time  24h This worklog including  setup conf, Dev and test.
 2019-05-02 19:15:38 +02:00
Nicolas Maillat
7ee29b756a Update AUTHORS 2019-05-02 17:39:08 +02:00
Nicolas Maillat
01f3835b92 Delete branch filter 2019-05-02 17:26:22 +02:00
Nicolas Maillat
21ffa009dc Merge branch 'master' into PHRAS-2539 2019-05-02 16:57:04 +02:00
Nicolas Maillat
9725756910 typo fix 2019-05-02 16:55:34 +02:00
Alexandre BRACH
5a2f09c94c Fix typo 2019-05-02 16:33:19 +02:00
Alexandre BRACH
ee41fb5336 Context name update 2019-05-02 16:19:06 +02:00
Nicolas Maillat
57473ed38b Merge branch 'master' into PHRAS-2539 2019-05-02 16:06:41 +02:00
Alexandre BRACH
0e8c8acc2e Modular CircleCI 2019-05-02 15:57:53 +02:00
Alexandre BRACH
2c42f018bd Docker images are buildables 2019-05-02 13:44:51 +02:00
Nicolas Maillat
54bad38ea9 Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 15:29:10 +02:00
Jennifer
9c6568890e Translated using Weblate (German) 
Currently translated at 89.3% (2142 of 2396 strings)
 2019-04-30 15:26:40 +02:00
Jennifer
bf7f74ede5 Translated using Weblate (French) 
Currently translated at 92.6% (2221 of 2396 strings)
 2019-04-30 15:26:39 +02:00
Jennifer
f7a0fe9bad Translated using Weblate (English) 
Currently translated at 94.7% (2271 of 2396 strings)
 2019-04-30 15:26:39 +02:00
Harrys Ravalomanana
d0e1baed54 Merge branch 'PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query' of https://github.com/HRavalomanana/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 13:51:53 +04:00
Harrys Ravalomanana
5e5f5e34cb PHRAS-2430 update phraseanet-production-client@0.34.7 2019-04-30 13:50:01 +04:00
Harrys Ravalomanana
dd6422c620 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 13:48:29 +04:00
Nicolas Maillat
768ccafd3c Merge branch 'master' into PHRAS-2430_Port_to_41-Advance_search_refacto_Restore_Query 2019-04-30 10:29:04 +02:00
Jennifer
f82df20d50 Translated using Weblate (German) 
Currently translated at 89.4% (2143 of 2396 strings)
 2019-04-29 16:51:03 +02:00
Jennifer
c292915bb6 Translated using Weblate (French) 
Currently translated at 92.4% (2215 of 2396 strings)
 2019-04-29 16:51:02 +02:00
Jennifer
9182888c15 Translated using Weblate (English) 
Currently translated at 94.9% (2275 of 2396 strings)
 2019-04-29 16:51:02 +02:00
Jennifer
3e48c7e6ae Translated using Weblate (German) 
Currently translated at 88.8% (2114 of 2380 strings)
 2019-04-29 15:12:28 +02:00
Jennifer
80428a802f Translated using Weblate (French) 
Currently translated at 92.9% (2212 of 2380 strings)
 2019-04-29 15:12:28 +02:00
Jennifer
f8ea3f1f3f Translated using Weblate (English) 
Currently translated at 95.3% (2270 of 2380 strings)
 2019-04-29 15:12:27 +02:00
Nicolas Maillat
865c38e2a5 Translated using Weblate (French) 
Currently translated at 93.1% (2213 of 2376 strings)
 2019-04-29 15:12:27 +02:00
Nicolas Maillat
a2dffd0916 Merge pull request #2998 from aynsix/PHRAS-1972-update-key-config-delete-account 
PHRAS-1972: 4.1 delete account update config structure
 2019-04-25 21:16:22 +02:00