Commit Graph

13195 Commits

Author SHA1 Message Date
Xavier Rousset
80b4c9a6a6 PHRAS-2127 | Add https in default geoname server url, remove url formatter in register controller 2019-08-14 15:49:25 +02:00
Harrys Ravalomanana
816225036f PHRAS-2282 add loader on results display 2019-08-14 16:26:16 +04:00
Harrys Ravalomanana
0d84aa040a PHRAS-2282 #comment fix next page or previous page display for results #time 3h 2019-08-14 16:18:15 +04:00
Harrys Ravalomanana
8987e2dba5 PHRAS-2688 commit to run ccircle ci test 2019-08-13 11:39:57 +04:00
Harrys Ravalomanana
074e1cf9ea PHRAS-2282 commit to run circle ci test 2019-08-13 11:35:06 +04:00
Harrys Ravalomanana
947b97ee0b PHRAS-2706 2019-08-13 11:06:57 +04:00
Harrys Ravalomanana
772b102632 PHRAS-2282 #time 4h 2019-08-12 16:40:58 +04:00
Harrys Ravalomanana
e7ec57346a PRHAS-2282 #comment fix JY comments 2019-08-08 13:56:44 +04:00
Harrys Ravalomanana
366c486733 PHRAS-2282 #comment add new design #time 24h 2019-08-07 16:43:53 +04:00
Nicolas Maillat
70ff62badc Merge branch 'master' into PHRAS-2688_Pord_41_Prod_workzone_change_type_of_numbering 2019-08-02 15:31:58 +02:00
Nicolas Maillat
6b01a5df23 Merge pull request #3130 from alchemy-fr/PHRDPL-75_fix-docker-build
PHRDPL-75 #comment merge composer-install : update checksum
2019-08-02 13:00:48 +02:00
Alexandre BRACH
3663ace661 PHRDPL-75 #comment update .circleci 2019-08-02 12:32:09 +02:00
Harrys Ravalomanana
f185558de7 PHRAS-2688 #comment Port 41 of Prod workzone: Change type of numbering #time 1h 2019-08-02 13:48:48 +04:00
Alexandre BRACH
e679f78ed7 PHRDPL-75 #comment composer-install : update checksum 2019-08-02 11:15:49 +02:00
Nicolas Maillat
08d10605b3 Merge pull request #3108 from HRavalomanana/PHRAS-2671_change_behaviour_of_display_audio
PHRAS-2671 #comment merge Fix behaviour of preview display in audio file case
2019-08-01 22:38:30 +02:00
Nicolas Maillat
7a137c17ba Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio 2019-08-01 22:13:51 +02:00
Nicolas Maillat
1f2ae415ab Merge branch 'master' into PHRAS-2666_slow-notifications_4.1 2019-07-31 16:12:49 +02:00
jygaulier
9335bb2517 restore mailcatcher 2019-07-29 13:39:06 +02:00
jygaulier
2180332414 fix mailcatcher version
current version of mailcatcher wants ruby 2, downgrade to a version ok with ruby 1.9
2019-07-29 13:37:53 +02:00
Jean-Yves Gaulier
31b940239f PHRAS-2666_slow-notifications_4.1
fix dql
!!! WIP !!!
2019-07-25 19:34:32 +02:00
Jean-Yves Gaulier
568268a918 PHRAS-2666_slow-notifications_4.1
revert to fix unit test (?)
!!! WIP !!!
2019-07-25 18:16:43 +02:00
Jean-Yves Gaulier
3ae0c94863 PHRAS-2666_slow-notifications_4.1
fix bad fct arg type "string"
!!! WIP !!!
2019-07-25 17:33:21 +02:00
Jean-Yves Gaulier
2fcbd7e6d7 PHRAS-2666_slow-notifications_4.1
removed join on basket_elements where useless
code style + type hints
!!! WIP !!!
2019-07-25 17:23:10 +02:00
Jean-Yves Gaulier
5585893f05 PHRAS-2651_event-to-message_4.1
fix for php7.1
!!! WIP !!!
2019-07-25 17:23:10 +02:00
Jean-Yves Gaulier
b0c0f65764 PHRAS-2666_slow-notifications_4.1
removed join on basket_elements where useless
!!! WIP !!!
2019-07-25 17:23:10 +02:00
Nicolas Maillat
9709f6f8f4 Merge pull request #3098 from HRavalomanana/PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio
PHRAS-2665 #comment merge Fix video tool ratio
2019-07-24 14:56:24 +02:00
Nicolas Maillat
6e52fbe0bc Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio 2019-07-24 14:39:51 +02:00
jygaulier
714918f148 Restore xdebug provisioning
restore roles xdebug & nginx
2019-07-23 16:58:50 +02:00
Harrys Ravalomanana
86484c6580 PHRAS-2665 2019-07-23 11:29:00 +04:00
Harrys Ravalomanana
954e04477d PHRAS-2665 #comment fix code review #time 1h 2019-07-23 11:27:11 +04:00
Nicolas Maillat
d82a981370 Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio 2019-07-22 20:58:40 +02:00
Nicolas Maillat
a44ea3dfff Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio 2019-07-22 20:52:48 +02:00
jygaulier
c26942a3a5 Merge pull request #3104 from aynsix/PHRAS-2663-index-on-notification-table
PHRAS-2663 : Add mysql index on table notification applicationbox
2019-07-22 19:11:01 +02:00
Nicolas Maillat
8eeb190dcd Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio 2019-07-22 18:34:33 +02:00
jygaulier
27230b3a3e Merge branch 'master' into PHRAS-2663-index-on-notification-table 2019-07-22 17:25:17 +02:00
jygaulier
3664b5c5a8 Merge pull request #3101 from HRavalomanana/PHRAS-2668_fix_twig_error
PHRAS-2668  fix twig error
2019-07-22 17:15:28 +02:00
jygaulier
b68d9136ae Merge branch 'master' into PHRAS-2668_fix_twig_error 2019-07-22 17:07:41 +02:00
Nicolas Maillat
1bc208469f Merge branch 'master' into PHRAS-2665_PRod_video_tools_use_preview_ratio_instead_of_document_ratio 2019-07-22 15:21:08 +02:00
Nicolas Maillat
54a967a5da Merge branch 'master' into PHRAS-2663-index-on-notification-table 2019-07-22 15:20:38 +02:00
Nicolas Maillat
e1e8305eb0 Merge branch 'master' into PHRAS-2671_change_behaviour_of_display_audio 2019-07-22 15:15:27 +02:00
jygaulier
7b3a1f0c90 Merge pull request #3102 from xrousset78800/PHRAS-2496/update-master-provisioning
PHRAS-2496 | Update provisioning workflow, check if a box name is defined.
2019-07-22 14:39:03 +02:00
Harrys Ravalomanana
5bc66e8f23 PHRAS-2671 #comment Fix behaviour of display tooltip #time 4h 2019-07-19 12:04:19 +04:00
aynsix
e06a281dd0 add index on table notifications 2019-07-18 12:17:44 +04:00
Xavier Rousset
8c0f939339 Update provisioning workflow, check if a box name is defined. A playbook for box usage is created 2019-07-17 20:39:47 +02:00
aynsix
fdb67c74d9 fix port to 4.1 extract xmp:PageImage indesign 2019-07-17 17:16:29 +04:00
Nicolas Maillat
49f6ff58ee Update index.html.twig 2019-07-16 18:10:25 +02:00
Harrys Ravalomanana
c2f55eb8ba PHRAS-2668 #comment fix twig error #time 1h 2019-07-16 15:12:26 +04:00
Harrys Ravalomanana
1ba27e55c7 PHRAS-2665 #time 3h 2019-07-16 14:07:41 +04:00
Harrys Ravalomanana
4671f5948c merge branch 2019-07-15 18:32:54 +04:00
Harrys Ravalomanana
b590ae1c8a PHRAS-2665 2019-07-15 18:30:37 +04:00