lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
85,338 Commits 43 Branches 150 Tags 886 MiB
e9aa27d731
Commit Graph

5946 Commits

Author SHA1 Message Date
Laurent Destailleur
148e2e58e5 Fix MAIN_SHOW_LOGO 2020-03-07 17:37:08 +01:00
Laurent Destailleur
119784fb3d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-03-07 17:34:01 +01:00
Jean Traullé
a6e3980acb
Update ihm.php 2020-03-06 17:35:03 +01:00
Jean Traullé
ddf87e6d80
Fix param lost 
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
 2020-03-06 16:13:09 +01:00
Laurent Destailleur
7d0d0aa75a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2020-03-04 01:56:50 +01:00
Laurent Destailleur
6f3197bbea
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder 
Fix sql syntax error
 2020-03-03 22:54:11 +01:00
Laurent Destailleur
d5546df57b Responsive 2020-03-03 22:50:37 +01:00
Laurent Destailleur
fd64f0fadb Fix responsive 2020-03-03 22:46:29 +01:00
Laurent Destailleur
88d2e13f02 Fix reponsive 2020-03-03 22:15:55 +01:00
atm-ph
e916ff40ff Fix sql syntax error 2020-03-03 11:55:05 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Laurent Destailleur
b326d1fe49 Add link to wiki doc 2020-02-27 18:26:38 +01:00
Laurent Destailleur
f039008282 Fix reponsive 2020-02-27 16:33:24 +01:00
Laurent Destailleur
957295ee2d Fix look and feel v11 2020-02-27 01:12:53 +01:00
Laurent Destailleur
3d436eb645
Merge pull request #13208 from oscim/patch-25 
Update emailcollector_card.php
 2020-02-26 16:22:28 +01:00
Laurent Destailleur
aba29207a3 Fix param lost 2020-02-26 16:10:12 +01:00
Laurent Destailleur
4370bf8fdc FIX Use GETPOST instead of POST 
Conflicts:
	htdocs/admin/ihm.php
 2020-02-26 15:44:54 +01:00
Laurent Destailleur
8ceafa2624 FIX Use GETPOST instead of POST 2020-02-26 15:21:52 +01:00
stickler-ci
0e91b9e5ec Fixing style errors. 2020-02-26 07:20:08 +00:00
oscim
2522d1e31b
Update emailcollector_card.php 
support hook for add action
 2020-02-26 08:15:49 +01:00
Laurent Destailleur
2c6e7f2917 Tooltip for example on IP restrictions 2020-02-25 13:40:19 +01:00
Laurent Destailleur
32d74adf20 NEW Truncate columns names when too long and show full title as popup 2020-02-24 21:18:49 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-18 22:47:25 +00:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
 2020-02-14 19:14:26 +01:00
Laurent Destailleur
4f1c8e7f53 FIX #10203 2020-02-13 12:18:26 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
8518e0752f NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page 2020-02-11 16:01:32 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
 2020-02-08 15:42:35 +01:00
ksar
e951743077 Update export_files.php 
Remove Warning
 2020-02-08 15:04:27 +01:00
ksar
b5da9763ce Update export_files.php 
Remove Warning
 2020-02-06 12:15:18 +01:00
ksar
16fdab6089 Update export_files.php 
REmove the Warning
 2020-02-06 12:12:20 +01:00
Laurent Destailleur
5aa4f9b5ae Fix phpcs 2020-02-05 21:58:53 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
Laurent Destailleur
bd90cdf492 FIX #13023 2020-02-05 13:03:43 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744 FIX Log of authentication ko or ko + CVE-2020-7996 2020-02-02 19:05:38 +01:00
Laurent Destailleur
967d97ccd7 FIX CVE-2020-7994 2020-02-02 15:01:57 +01:00
Laurent Destailleur
bd322dc12e Fix search on country 2020-02-02 12:59:11 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
a9d917a3f0 Fix phpcs 2020-01-29 22:40:10 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/exports/class/export.class.php
 2020-01-29 19:28:06 +01:00
Laurent Destailleur
633ba666aa Add info of email reference syntax to help debug. 2020-01-29 19:26:04 +01:00
Laurent Destailleur
2ccfdce178 var not defined 2020-01-29 14:41:06 +01:00
Laurent Destailleur
65e8113373 Look and feel v11 2020-01-29 14:23:44 +01:00
Laurent Destailleur
7c34d97e2d Fix messages for SPF 2020-01-29 13:10:16 +01:00
ptibogxiv
ab0d60065d
Update delais.php 2020-01-28 21:27:45 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
40636adb56 Enhance #12865 
No need of option. A new parameter on url is enough.
 2020-01-28 03:34:56 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
 2020-01-25 14:43:57 +01:00
Laurent Destailleur
de6b30be8c Look and feel v11 2020-01-25 13:06:10 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
 2020-01-23 17:41:31 +01:00
Laurent Destailleur
553107258e Fix alignement 2020-01-22 17:00:54 +01:00
Laurent Destailleur
b6e7b228ee Removed useless vars in setup 2020-01-22 01:24:04 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
54a0d97891 Fix responsive 2020-01-21 10:48:15 +01:00
Laurent Destailleur
d2cf4c55ee Fix label of status 2020-01-20 23:58:01 +01:00
Laurent Destailleur
5b86851cf3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1 Doc 2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
 2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-18 15:17:07 +00:00
Laurent Destailleur
c578752714 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:52:49 +01:00
Laurent Destailleur
26e450fb2a Fix extension of backup file 2020-01-17 11:52:21 +01:00
Laurent Destailleur
48c077af56 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:39:46 +01:00
Laurent Destailleur
2099e05f22 Fix translation 2020-01-17 11:39:22 +01:00
Laurent Destailleur
9c1e409feb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:35:16 +01:00
Laurent Destailleur
906110dc1d Fix backup. Recommended compression is gzip. 2020-01-17 11:34:31 +01:00
Scrutinizer Auto-Fixer
0aa156db78 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-01-16 01:54:00 +00:00
Laurent Destailleur
ace43a4227 Fix message 2020-01-16 01:40:14 +01:00
Laurent Destailleur
8f73bce878 Add warning if zip lib missing 2020-01-16 01:11:39 +01:00
Laurent Destailleur
2e70739fe0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 21:50:32 +01:00
Laurent Destailleur
1de62b1f44 Doc 2020-01-15 21:50:11 +01:00
Laurent Destailleur
d708fcac5e Fix deploy module 2020-01-15 21:49:17 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
ed0e4b53d4 Fix error in mysqldump 2020-01-15 16:11:31 +01:00
Laurent Destailleur
6e367b6406 Fix detection 2020-01-15 12:56:36 +01:00
Tobias Sekan
503671a307
Fix lint error 2020-01-15 10:21:36 +01:00
Tobias Sekan
c47da64476
A few fixes 2020-01-15 10:13:55 +01:00
Tobias Sekan
a893b42202
Show extra short php function overview 2020-01-15 10:02:18 +01:00
Laurent Destailleur
ffd12cd44e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-13 13:44:44 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/stocks.lang
 2020-01-13 13:44:32 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4 
NEW Add social networks of the company
 2020-01-13 13:38:16 +01:00
Laurent Destailleur
5740d17450 Better help 2020-01-13 12:10:20 +01:00
Laurent Destailleur
58e5eeabdd Fix to be able to use zip signature 2020-01-11 11:15:50 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00