Commit Graph

8406 Commits

Author SHA1 Message Date
Gauthier PC portable 024
5116337e0b FIX : stickler feedbacks 2020-12-21 13:29:44 +01:00
Gauthier PC portable 024
7b739920a2 NEW : Workstations management 2020-12-21 12:28:45 +01:00
Laurent Destailleur
67de45b8d7 Fix responsive 2020-12-21 01:40:15 +01:00
Laurent Destailleur
d3bd709ad6 Fix phpcs 2020-12-20 18:51:17 +01:00
Frédéric FRANCE
92f38f664a Remove no more needed file 2020-12-20 10:44:55 +01:00
Laurent Destailleur
0c6ccb64e0 Fix links 2020-12-19 21:48:29 +01:00
Laurent Destailleur
fcfd657240 Fix links 2020-12-19 21:41:15 +01:00
Laurent Destailleur
70d1cc79e0 Fix link 2020-12-19 21:30:56 +01:00
Laurent Destailleur
b41b528f33 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/sms.php
2020-12-19 15:28:58 +01:00
ptibogxiv
22b2247442 Update sms.php 2020-12-19 13:41:49 +01:00
Laurent Destailleur
0eaf924d3b Add warning on non https website to axplain why features is broken 2020-12-18 15:08:00 +01:00
Laurent Destailleur
90d8299c92 Fix purge tool 2020-12-18 13:24:02 +01:00
Laurent Destailleur
3b8947dadd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/class/html.form.class.php
	htdocs/product/price.php
2020-12-17 21:50:05 +01:00
Laurent Destailleur
f79dec80e6 Fix phpcs 2020-12-17 16:45:56 +01:00
Laurent Destailleur
b04cc22350 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/prelevement.php
2020-12-17 14:10:45 +01:00
Laurent Destailleur
f0d787debb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 2020-12-17 14:07:24 +01:00
Laurent Destailleur
27542ed8ed Update prelevement.php 2020-12-17 13:53:09 +01:00
Laurent Destailleur
36d6b472ce Update prelevement.php 2020-12-17 13:52:03 +01:00
Haldarys
10ac74162e Fix PRELEVEMENT_ADDDAYS check
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
2020-12-17 10:19:21 +01:00
Laurent Destailleur
9c759e91f0 Fix debug management of docs in ticket module 2020-12-16 19:01:26 +01:00
Laurent Destailleur
21c2fae00c Fix setup of antivirus 2020-12-16 17:41:18 +01:00
Laurent Destailleur
66e4de628c Fix permissions 2020-12-14 20:38:22 +01:00
Laurent Destailleur
43bb5554d7 Clean deprecated page 2020-12-14 12:19:24 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Frédéric FRANCE
8aaa1905a0 create url from socialid 2020-12-12 21:03:27 +01:00
Frédéric FRANCE
758763f489 Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks 2020-12-12 19:25:15 +01:00
Frédéric FRANCE
6a4990d5bd clean 2020-12-12 19:21:40 +01:00
Laurent Destailleur
75570cc984 Merge pull request #15743 from frederic34/mycompanysocialnetworks
Mycompany social networks separate tab
2020-12-12 19:21:29 +01:00
Laurent Destailleur
a5d2e04dea Debug v13 2020-12-12 19:09:07 +01:00
Laurent Destailleur
d19cdae980 Merge pull request #15727 from frederic34/patch-8
add option hide topmenu in Config/Display
2020-12-12 18:48:11 +01:00
Frédéric FRANCE
818af46b86 clean 2020-12-12 18:37:09 +01:00
Frédéric FRANCE
b8a01b4d2d my company social networks in a separate tab 2020-12-12 18:31:26 +01:00
Frédéric FRANCE
621f246d58 my company social networks in a separate tab 2020-12-12 18:26:54 +01:00
Frédéric FRANCE
0b3a5dc796 fix style 2020-12-11 18:09:37 +01:00
Frédéric FRANCE
e9288ce0da fix translation 2020-12-11 17:58:43 +01:00
Frédéric FRANCE
8882759e7a hide topmenu option in config/display 2020-12-11 17:55:08 +01:00
Laurent Destailleur
1f6f434a9c Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/export_files.php
	test/phpunit/SecurityTest.php
2020-12-11 15:56:19 +01:00
Laurent Destailleur
4fcd3fe493 Fix disallow -- string into filename for security purpose. Vulnerability
reported by Yılmaz Değirmenci
2020-12-11 15:12:42 +01:00
Laurent Destailleur
2adbd29b49 Debug generation of doc from modulebuilder 2020-12-11 14:22:36 +01:00
Laurent Destailleur
c2124479c7 Fix missing test on IMAP 2020-12-10 16:05:43 +01:00
Laurent Destailleur
c850f4c918 Fix fatal error 2020-12-10 16:01:06 +01:00
Laurent Destailleur
abe8d25a9a Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs
FIX regenerate mycompany logos thumbs if not exists
2020-12-09 22:06:19 +01:00
Laurent Destailleur
075cacb8cf Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF 2020-12-09 17:40:28 +01:00
Regis Houssin
c18e8ac317 FIX regenerate mycompany logos thumbs if not exists 2020-12-09 09:28:46 +01:00
Laurent Destailleur
6e479af5b6 Merge pull request #15661 from frederic34/adminsms
fix trans removing html
2020-12-07 22:45:14 +01:00
Laurent Destailleur
ff1e6ec371 Merge pull request #15665 from frederic34/admin_boxes
fix style
2020-12-07 22:40:51 +01:00
Laurent Destailleur
d9ba821411 Merge pull request #15669 from frederic34/template
typo ortho
2020-12-07 22:35:45 +01:00
Laurent Destailleur
3fb63e6a4b Look and feel v13 2020-12-07 15:51:22 +01:00
Frédéric FRANCE
d1204e5e9b typo ortho 2020-12-05 15:35:52 +01:00
Laurent Destailleur
991cfde0a2 Fix css 2020-12-05 14:46:29 +01:00