Commit Graph

12601 Commits

Author SHA1 Message Date
Filip Vilic
749f75b45d PHRAS-2220_feedback_window_UI__correction 2018-09-20 14:22:52 +02:00
Nicolas Maillat
fa379500c4 Merge pull request #2741 from filipx/PHRAS-2221_list_manager_UI___corrections_NEW
PHRAS-2221_list_manager_UI___corrections_NEW
2018-09-19 21:28:08 +00:00
Nicolas Maillat
d3bb93f8b0 Merge pull request #2740 from filipx/PHRAS-2219_push_window__corrections
PHRAS-2219_push_window__corrections
2018-09-19 21:27:47 +00:00
Filip Vilic
25afbc5311 PHRAS-2221_list_manager_UI___corrections 2018-09-19 14:13:52 +02:00
Filip Vilic
04590f4acb PHRAS-2219_push_window__corrections fix 2018-09-19 13:07:43 +02:00
Filip Vilic
37a8c0b4cd PHRAS-2219_push_window__corrections 2018-09-19 10:49:35 +02:00
Nicolas Maillat
03057c8c2a Merge pull request #2739 from filipx/PHRAS-2222_list_manager_advance_mode__corrections
PHRAS-2222_list_manager_advance_mode translations update
2018-09-18 13:13:34 +00:00
Nicolas Maillat
7fb2ab4456 Merge pull request #2738 from filipx/PHRAS-2222_list_manager_advance_mode__corrections
PHRAS-2222_list_manager_advance_mode__corrections
2018-09-17 22:32:41 +00:00
Nicolas Maillat
b004eef2db Merge pull request #2737 from filipx/PHRAS-2221_list_manager_UI__corrections
PHRAS-2221_list_manager_UI__corrections
2018-09-17 22:29:27 +00:00
Filip Vilic
c659ae6230 PHRAS-2222_list_manager_advance_mode translations update 2018-09-17 15:37:28 +02:00
Filip Vilic
c8ce9ce322 PHRAS-2222_list_manager_advance_mode__corrections 2018-09-17 15:08:41 +02:00
Filip Vilic
e40a524365 PHRAS-2221_list_manager_UI__corrections 2018-09-17 10:54:29 +02:00
moctardiouf
934adda4f4 Merge pull request #2736 from filipx/PHRAS-2223_list_manager___corrections
PHRAS-2223_list_manager___corrections
2018-09-14 16:07:22 +02:00
Filip Vilic
6f915f0f1f PHRAS-2223_list_manager___corrections 2018-09-14 14:25:47 +02:00
Nicolas Maillat
23a1e53907 Merge pull request #2733 from filipx/PHRAS-2217_admin_header_height_fix
PHRAS-2217_admin_header_height_fix
2018-09-07 07:55:59 +00:00
Filip Vilic
79e391aabe PHRAS-2217_admin_header_height_fix 2018-09-07 00:43:27 +02:00
Nicolas Maillat
23cd533ba1 Merge pull request #2725 from filipx/PHRAS-2100_refactoring_list_manager_modals
PHRAS-2100_refactoring_list_manager modals UI
2018-09-06 12:18:26 +00:00
Nicolas Maillat
33371e35ba Merge pull request #2715 from filipx/PHRAS-2191_string_translation
PHRAS-2191_string_translations generated
2018-09-06 12:18:14 +00:00
Nicolas Maillat
9e17f72dd7 Merge pull request #2712 from filipx/PHRAS-2186_list_manager_add_user
PHRAS-2186_list_manager_add_user
2018-09-06 12:17:59 +00:00
Nicolas Maillat
a1390dc5b6 Merge pull request #2732 from filipx/PHRAS-2212_refacto_admin_user_alerts
PHRAS-2212_refacto_admin_user_alerts
2018-09-06 09:30:19 +02:00
Filip Vilic
96488f5ca2 PHRAS-2212_refacto_admin_user_alerts 2018-09-05 16:08:18 +02:00
Nicolas Maillat
842e58d6ac Merge pull request #2731 from aynsix/PHRAS-2205-change-default-mod-configuration-file-create
PHRAS-2205 Change default mod when change the configuration file content
2018-09-04 16:16:11 +02:00
aina-esokia
89b9ea0b2a change default mod 2018-09-04 17:21:03 +04:00
Nicolas Maillat
4773678417 Merge pull request #2721 from aynsix/PHRAS-2175-task-log-size
PHRAS-2175 fix size in task log
2018-09-04 11:46:08 +02:00
Nicolas Maillat
9300823f05 Merge pull request #2726 from aynsix/PHRAS-2205-saving-configuration-file
PHRAS-2205 Change the configuration file content update methode : when saving from admin/setup
2018-09-04 11:45:36 +02:00
Nicolas Maillat
dfea2d8d52 Merge pull request #2719 from aynsix/PHRAS-2011-personalization-log
PHRAS-2011 add personalisation logo
2018-09-04 11:20:40 +02:00
jygaulier
028ebf89a1 PHRAS-2209 disable travis (#2730) 2018-09-03 15:17:27 +02:00
aina-esokia
288cdbd3e2 update Configuration.php 2018-09-03 15:03:47 +04:00
aina-esokia
354c918a90 admin/setup: change file content instead of recreate config file 2018-09-03 14:58:05 +04:00
Filip Vilic
11035fe4a4 PHRAS-2100_refactoring_list_manager modals UI 2018-09-03 10:01:04 +02:00
aina-esokia
c3790befce fix size in task log 2018-08-31 18:16:52 +04:00
Nicolas Maillat
9975b99861 Remove travis badge in master branch
Unit test is not played on travisci for 4.xx version
2018-08-31 15:51:35 +02:00
aina-esokia
c3486f9b8e allow svg logo and change gabari 2018-08-31 16:10:19 +04:00
aina-esokia
5948032af6 Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-2011-personalization-log 2018-08-31 15:41:55 +04:00
Nicolas Maillat
ebd6699b2f Merge pull request #2720 from filipx/PHRAS-2192_detailed_selection_dev
PHRAS-2192_detailed_selection_dev
2018-08-30 14:21:35 +02:00
Filip Vilic
e41145ead7 PHRAS-2192_detailed_selection_dev box position fix 2018-08-30 10:20:37 +02:00
aina-esokia
9406c2b2ce fix 2018-08-29 17:16:26 +04:00
aina-esokia
8f66a34b9d change gabari 2018-08-29 17:11:28 +04:00
aina-esokia
5dba9f64dd add personalisation logo 2018-08-29 15:11:04 +04:00
Nicolas Maillat
7a71da5d7e Merge pull request #2713 from filipx/PHRAS-2192_detailed_selection_dev
PHRAS-2192 detailed selection info - html added
2018-08-27 17:53:45 +02:00
Nicolas Maillat
6eb91a8d31 Merge pull request #2699 from aynsix/PHRAS-2175-subdef-building-duration
PHRAS-2175 add subdef building duration in task log
2018-08-27 14:52:37 +02:00
moctardiouf
6376bc584f Merge pull request #2716 from alchemy-fr/add-cache-dir
add cache dir for aws capistrano deployment
2018-08-22 17:46:06 +02:00
Moctar
80422652da add cache dir for aws capistrano deployment 2018-08-22 16:46:38 +02:00
Filip Vilic
c9a9a47b17 PHRAS-2191_string_translations generated 2018-08-21 13:35:56 +02:00
Filip Vilic
2994bbf890 PHRAS-2186_list_manager_add_user modal styling 2018-08-20 16:49:29 +02:00
Filip Vilic
5cd490ce99 PHRAS-2192 detailed selection info - html added 2018-08-16 11:37:50 +02:00
Filip Vilic
bb27de35a0 PHRAS-2186_list_manager_add_user 2018-08-14 11:49:48 +02:00
jygaulier
ac1bed84f2 Disable Travis on branche Symfony-4 2018-08-13 17:47:17 +02:00
Moctar
18d71a7a9b port modification made on 4.0 to master 2018-08-10 16:40:56 +02:00
aina-esokia
57a8612e92 add duration and file size 2018-08-09 16:08:15 +04:00