2
0
forked from Wavyzz/dolibarr
Commit Graph

3374 Commits

Author SHA1 Message Date
Laurent Destailleur
840ca73464 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/class/hookmanager.class.php
	htdocs/main.inc.php
	htdocs/theme/eldy/info-box.inc.php
	htdocs/theme/eldy/style.css.php
2020-10-30 04:21:07 +01:00
Laurent Destailleur
1b5bcaccc6 Fix remove warnings 2020-10-30 04:13:31 +01:00
Laurent Destailleur
ec0c8e0c79 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/core/lib/security2.lib.php
	htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
	htdocs/core/tpl/advtarget.tpl.php
2020-10-30 03:35:40 +01:00
Frédéric FRANCE
20c00d0c43 Update timeline.inc.php 2020-10-28 17:54:45 +01:00
Laurent Destailleur
3ca379c9e6 FIX Restore multiselect (selection of prospect level)
Conflicts:
	htdocs/core/class/html.form.class.php
2020-09-21 12:22:57 +02:00
Laurent Destailleur
4c0e1d20d6 FIX CSS 2020-08-30 05:28:01 +02:00
Laurent Destailleur
fb5b29a32b FIX Restore the links on late badge 2020-08-05 19:39:38 +02:00
Laurent Destailleur
b6a3938921 FIX Size of image on the help popup of modules 2020-08-03 14:32:42 +02:00
Laurent Destailleur
41483df689 FIX #14076 2020-07-29 12:31:03 +02:00
Laurent Destailleur
d6f1a897f6 Fix size of module box 2020-07-24 13:44:32 +02:00
Laurent Destailleur
f756864670 CSS 2020-07-09 12:44:31 +02:00
Laurent Destailleur
ce1649233d FIX CSS 2020-07-09 12:39:00 +02:00
Laurent Destailleur
edb4aac8d3 CSS 2020-07-08 18:09:35 +02:00
Laurent Destailleur
415398fc66 Better contrast 2020-07-06 21:06:32 +02:00
Laurent Destailleur
f34a3785f0 FIX CSS 2020-06-29 16:02:50 +02:00
Laurent Destailleur
194b92e70f Fix load of menu when 'perm' or 'enabled' is '0'. 2020-06-27 15:27:09 +02:00
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
4d2cbf7006 Fix alert picto of expired services not visible
Fix CSS
2020-06-23 11:27:40 +02:00
Laurent Destailleur
d84fbb7165 css 2020-06-20 18:59:13 +02:00
Laurent Destailleur
2de3eb8ac0 Fix CSS 2020-06-20 00:00:17 +02:00
Laurent Destailleur
d8927143fa Fix chrome style 2020-06-19 20:01:57 +02:00
Laurent Destailleur
8f4a181380 css 2020-06-17 15:35:52 +02:00
Laurent Destailleur
7b64e8643f Trans and css 2020-06-15 16:08:48 +02:00
Laurent Destailleur
a0b6d9c4e0 css 2020-06-12 01:19:50 +02:00
Laurent Destailleur
c70cd01971 Fix css 2020-06-11 17:58:00 +02:00
Laurent Destailleur
5e13a7f1e2 css 2020-06-10 22:05:49 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser
Conflicts:
	htdocs/main.inc.php
2020-06-10 12:46:55 +02:00
Laurent Destailleur
233c7e53f1 Debug v12 2020-06-08 20:31:09 +02:00
Laurent Destailleur
f7563818ac css 2020-06-07 23:12:56 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
36bc266d67 css 2020-06-06 17:33:26 +02:00
Laurent Destailleur
d252248319 Fix back to link in ECM menu
Fix picto in search_page
2020-06-05 13:41:33 +02:00
Laurent Destailleur
ae3d786593 Fix crop on media file manager
Conflicts:
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/core/photos_resize.php
	htdocs/theme/eldy/global.inc.php
2020-06-03 12:38:42 +02:00
Laurent Destailleur
054d5c5f4c css 2020-06-02 17:00:08 +02:00
Laurent Destailleur
a9973ad60e Fix language key and css 2020-06-02 15:30:07 +02:00
Laurent Destailleur
c4d8f0b6cc css 2020-06-01 12:35:27 +02:00
Laurent Destailleur
fbaf705c2a Look and feel v12 2020-05-27 22:50:38 +02:00
Laurent Destailleur
e37e45f984 Debug credit transfer 2020-05-27 22:35:55 +02:00
Laurent Destailleur
d3e21c82f2 CSS 2020-05-27 02:38:54 +02:00
Laurent Destailleur
44273e0570 Fix duplicate code 2020-05-26 22:31:27 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Laurent Destailleur
25d1a2a1d8 Restore missing png file 2020-05-25 13:36:56 +02:00
Laurent Destailleur
160ac14eb3 Update logo 2020-05-25 13:32:57 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
0dbb8224fb Fix logo 2020-05-25 12:50:54 +02:00
Laurent Destailleur
c67eeeaf6c CSS 2020-05-25 11:30:52 +02:00
Laurent Destailleur
509ce9f571 CSS 2020-05-24 01:09:45 +02:00
Laurent Destailleur
4cb0ffeb1f Fix css 2020-05-24 01:04:56 +02:00
Laurent Destailleur
5f3a82423f Fix regression in look and feel v12 2020-05-23 14:38:37 +02:00