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
13,178 Commits 268 Branches 107 Tags
6660c7fe32ca9b6b32ded2679e6c55f358a82c3f
Commit Graph

13178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Harrys Ravalomanana
4902620347 PHRAS-2544 #comment save skin preference #time 1h 2019-07-03 15:33:23 +04:00
Harrys Ravalomanana
86ef7618da Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-07-03 13:55:47 +04:00
Harrys Ravalomanana
4bfa1b109f PHRAS-2544 #comment port41 of 2537 #time 4h 2019-07-03 13:52:37 +04:00
Nicolas Maillat
f8f2221910 Merge pull request #3091 from aynsix/PHRAS-2507_Enhance_addplugin_downloadplugin 
PHRAS-2507 #comment enhance addplugin downloadplugin
 2019-07-02 15:34:57 +02:00
aina-esokia
ba302125f8 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2507_Enhance_addplugin_downloadplugin 2019-07-02 15:35:51 +04:00
aina-esokia
11c9b2ba99 update AddPlugin 2019-07-02 15:34:42 +04:00
aina-esokia
1b4110c085 add composer.lock 2019-07-02 14:23:12 +04:00
Nicolas Maillat
e1210cc398 Merge pull request #3089 from aynsix/PHRAS-2405-substitue-update-record-table 
PHRAS-2405  #comment merge  update record type and mimetype when sustitute a document
 2019-07-02 12:18:04 +02:00
aina-esokia
61a92d9cb0 fix conflict 2019-07-02 12:19:45 +04:00
Harrys Ravalomanana
fc022f817b PHRAS-2544 fix statistic popup 2019-07-01 18:32:12 +04:00
aina-esokia
0263f7b5a5 update record type and mimetype on sustitute 2019-07-01 18:15:08 +04:00
Harrys Ravalomanana
63a89521b6 PHRAS-2544 #comment update fix on grey and white theme #time 8h 2019-07-01 17:41:01 +04:00
Nicolas Maillat
22e3605153 Merge pull request #3088 from HRavalomanana/PHRAS-1310_Login_page_Fix_select_language 
PHRAS-1310 # merge  Fix select language on login page this is also for issue PHRAS-2556 and related to cokies PHRAS-1838
 2019-07-01 09:42:12 +02:00
Nicolas Maillat
7fd5f9184b Merge branch 'master' into PHRAS-1310_Login_page_Fix_select_language 2019-06-27 16:36:32 +02:00
Nicolas Maillat
d8e67520f6 Merge pull request #3087 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors 
PHRAS-2544 #comment merge upgrade phraseanet-production-client@0.34.41-d
 2019-06-27 16:36:13 +02:00
Harrys Ravalomanana
ede2cda427 PHRAS-1310 #comment Fix select language on login page #time 2h 2019-06-27 16:18:54 +04:00
Harrys Ravalomanana
529dbf9783 PHRAS-2544 #comment upgrade phraseanet-production-client@0.34.41-d 2019-06-27 14:13:13 +04:00
Nicolas Maillat
93c09d2461 Merge pull request #3086 from HRavalomanana/PHRAS-2544_Prod-grey_and_white_skins_colors 
PRHAS-2544  Prod- Grey and White Skins -Colors corrections
 2019-06-27 10:57:08 +02:00
Nicolas Maillat
ec057989d2 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-27 10:41:04 +02:00
Nicolas Maillat
c51f029ca5 Merge pull request #3085 from HRavalomanana/PHRAS-2620-Prod-facet-change-icon 
PHRAS-2620 #comment merge add new icomoon font and change icon on facet masking
 2019-06-27 10:40:48 +02:00
Harrys Ravalomanana
8837363126 PHRAS-2620 Add new font #time 2h 2019-06-25 17:46:33 +04:00
Harrys Ravalomanana
e33cd0d142 Merge branch 'master' into PHRAS-2544_Prod-grey_and_white_skins_colors 2019-06-25 17:05:13 +04:00
Harrys Ravalomanana
3e2795776d PHRAS-2544 2019-06-25 16:53:48 +04:00
Nicolas Maillat
47d71d6f2c Merge branch 'master' into PHRAS-2620-Prod-facet-change-icon 2019-06-25 11:28:45 +02:00
Nicolas Maillat
6f7c52fed6 Merge pull request #3084 from HRavalomanana/PHRAS-2623_upgrade_videojs_and_remove_video_chapter_thumbnail 
PHRAS-2623  #comment Remove video-chapter-thumbail videojs and roll back on view
 2019-06-25 11:28:30 +02:00
Harrys Ravalomanana
419ffd4aab PRHAS-2544 #comment Fix colorpicker display #time 2h 2019-06-24 17:24:09 +04:00
Harrys Ravalomanana
3dc4feade8 PHRAS-2620 #comment add new icomoon font # time 2h 2019-06-24 14:21:02 +04:00
Harrys Ravalomanana
53d8615c59 PHRAS-2623 #comment update composer.json and package.lock on phraseanet 2019-06-20 17:52:42 +04:00
Nicolas Maillat
7d66dd4f17 Merge pull request #3081 from alchemy-fr/PHRAS-2434_update_changelog 
PHRAS-2434 #comment merge update changelog.md
 2019-06-17 12:05:48 +02:00
Nicolas Maillat
713e41fac7 PHRAS-2434 #comment update changelog.md 
PHRAS-2434 #comment update changelog.md #time 2h reread add to changelog.md
 2019-06-17 11:19:54 +02:00
Nicolas Maillat
f2ebef2dd0 Merge pull request #3078 from HRavalomanana/PHRAS-2619_Admin_Publication_fix_icon_size 
PHRAS-2619 Admin Publication : Fix icon size
 2019-06-14 14:23:16 +02:00
Nicolas Maillat
d2b2dd712b Merge branch 'master' into PHRAS-2619_Admin_Publication_fix_icon_size 2019-06-14 13:47:29 +02:00
Nicolas Maillat
f146fbda9f Merge pull request #3077 from HRavalomanana/PHRAS-2530_Port41_Admin_Fix_user_search_with_field 
PHRAS-2530 #comment merge Admin: user search by country and company fields
 2019-06-14 13:47:15 +02:00
Harrys Ravalomanana
55fe0a9722 PHRAS-2619 #comment Fix icon size #time 0.5h 2019-06-14 14:50:56 +04:00
Harrys Ravalomanana
e6b22cb34c PHRAS-2530 #comment Fix Admin: user search by country and company fields #time 1h 2019-06-14 14:38:24 +04:00
Nicolas Maillat
a41b5a0c67 Merge pull request #3076 from HRavalomanana/PHRAS-2622_Prod_search_Result_sort 
PHRAS-2622  #comment merge update on version  phraseanet-production-client@0.34.31-d
 2019-06-14 12:34:03 +02:00
Harrys Ravalomanana
76cbee1bd4 PHRAS-2622 #comment update on stable version phraseanet-production-client@0.34.31-d 2019-06-14 14:07:58 +04:00
Nicolas Maillat
7d1a9dc865 Merge pull request #3073 from jygaulier/PHRAS-2628_toolbar-plugin_4.1 
PHRAS-2628 #comment merge toolbar-plugin_4.1
 2019-06-13 17:10:04 +02:00
Nicolas Maillat
b84dad40e2 Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1 2019-06-13 16:32:30 +02:00
Nicolas Maillat
3166e36556 Merge pull request #3075 from HRavalomanana/PHRAS-2618_Records_title_on_overview 
PHRAS-2618 #comment merge Records: fix title and description display on overview
 2019-06-13 13:36:50 +02:00
Harrys Ravalomanana
985ee2220a PHRAS-2618 #comment fix title and description display #time 2h 2019-06-13 15:20:46 +04:00
Nicolas Maillat
ffc1370cdd PHRDPL-61 #comment update readme 2019-06-13 11:47:28 +02:00
Nicolas Maillat
0f1b073e55 Merge pull request #3074 from AlexandreBrach/PHRDPL-61_thumbnails_not_shown 
PHRDPL-61 #comment worker use the app user to run jobs
 2019-06-13 11:34:33 +02:00
Alexandre BRACH
7fe9739625 PHRDPL-61 #comment worker use the app user to run jobs 2019-06-13 11:22:10 +02:00
Nicolas Maillat
6339bd3781 Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1 2019-06-12 16:34:35 +02:00
Nicolas Maillat
b3893261bd Merge pull request #3071 from xrousset78800/PHRAS-2565/prompt-for-provisioning 
PHRAS-2565 #comment  merge Add prompt for selecting prebuilt box from vagrant hub or build a new box  and for build local form Xenial and PHP 7
 2019-06-12 16:34:18 +02:00
Nicolas Maillat
23a9e1385d Merge branch 'master' into PHRAS-2565/prompt-for-provisioning 2019-06-12 16:22:14 +02:00
Xavier Rousset
dc44ddb59b Add colors on prompt 2019-06-12 15:47:37 +02:00
Nicolas Maillat
9f0ef049ad Merge branch 'master' into PHRAS-2628_toolbar-plugin_4.1 2019-06-12 15:34:05 +02:00
Nicolas Maillat
5a466f6bd1 Merge pull request #3072 from HRavalomanana/PHRAS-2386-Feedback_display 
PHRAS-2386 #comment merge  fix of feedback display block
 2019-06-12 15:33:22 +02:00