Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-14 21:41:23 +01:00
Code Issues Packages Projects Releases Wiki Activity
94,477 Commits 36 Branches 190 Tags
026e4548258febf35c66351c8ff7cb1556db84e7
Commit Graph

696 Commits

Author SHA1 Message Date
Laurent Destailleur
113ef1a02b Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/user/class/user.class.php
 2021-01-19 16:21:53 +01:00
Laurent Destailleur
2d8ca513d6 Fix param 'all' 2021-01-19 12:55:24 +01:00
Laurent Destailleur
ed25b252b9 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-05 11:30:14 +01:00
Laurent Destailleur
2e04aa4e03 Fix warning 2021-01-05 11:29:40 +01:00
Laurent Destailleur
8baa4c67ae Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-04 12:34:09 +01:00
Laurent Destailleur
3cdcaa70d8 Fix warning 2021-01-03 14:29:22 +01:00
Laurent Destailleur
a3a7069c9c Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-01-02 17:43:42 +01:00
Laurent Destailleur
821ef72d48 Fix warnings 2021-01-02 17:43:02 +01:00
Frédéric FRANCE
1620ab3118 societe_id to socid 2020-12-30 20:47:57 +01:00
Laurent Destailleur
58cd7c97a5 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/comm/mailing/card.php
	htdocs/comm/mailing/cibles.php
	htdocs/comm/mailing/class/mailing.class.php
 2020-12-24 13:05:17 +01:00
Laurent Destailleur
3abceadb86 Add info 2020-12-24 13:02:45 +01:00
Laurent Destailleur
739695c442 Fix delay to wait between email for emailing refused float. 2020-12-24 12:49:17 +01:00
Laurent Destailleur
acb73966f7 Clean code. Removed phpexcel library. 2020-12-13 16:27:44 +01:00
Laurent Destailleur
3b55eb1d82 FIX master must be after session_start but dol_getprefix must be before 
and after filefunc.inc.php.
 2020-12-05 13:26:58 +01:00
Laurent Destailleur
040d22ef0a Fix phpcs 2020-12-04 01:59:47 +01:00
Laurent Destailleur
333d5fe1ca Debug script to clean emails 2020-12-03 17:45:38 +01:00
Scrutinizer Auto-Fixer
6df4954b20 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-12-01 01:41:19 +00:00
Laurent Destailleur
42d88b6e62 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-11-26 16:20:21 +01:00
Laurent Destailleur
dfa161ca30 Fix property 2020-11-26 16:19:45 +01:00
Laurent Destailleur
f29ed4b045 Fix limit to send emails 2020-11-19 17:49:23 +01:00
Laurent Destailleur
1708874306 Merge branch 'develop' into develop 2020-11-18 18:16:29 +01:00
Laurent Destailleur
fd50f27d5d Removed temporary warning 2020-11-14 00:52:13 +01:00
lmarcouiller
304e4ac8e6 FIX : #15373 Reset invalid email script 2020-11-13 11:07:35 +01:00
lmarcouiller
a1f26f2b55 FIX :15373 Reset invalid email script 2020-11-13 11:03:49 +01:00
lmarcouiller
fc786d165c FIX : #15373 Reset invalid email script 2020-11-13 10:56:12 +01:00
lmarcouiller
e9d837c02d New: Reset invalid email script 2020-11-12 17:22:33 +01:00
lmarcouiller
7272f64177 New: Reset invalid email script 2020-11-12 17:15:26 +01:00
Laurent Destailleur
d9beced0e3 Add skeleton of script to clean email database 2020-11-12 12:09:36 +01:00
Laurent Destailleur
31fcf12643 Add script reset-invalid-emails.php 2020-11-12 12:03:43 +01:00
Scrutinizer Auto-Fixer
ab25e047c0 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 17:51:30 +00:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Laurent Destailleur
32ff76178e FIX #15168 2020-10-27 01:44:00 +01:00
Laurent Destailleur
f7fc89a9d2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-06 19:46:59 +02:00
Laurent Destailleur
f0892b08b8 Fix limit 2020-06-06 19:46:28 +02:00
Laurent Destailleur
40816c02ce Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
7a17bbacb9 Can force lang during import 2020-05-24 18:04:08 +02:00
Frédéric FRANCE
e5402988d9 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
e2f0f0d71d Add exclude id 2020-05-24 12:11:39 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
def53338de add new rule 2020-05-21 09:07:10 +02:00
Laurent Destailleur
ff8d22a80d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:57:01 +02:00
Laurent Destailleur
9336828710 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/comm/action/class/actioncomm.class.php
	htdocs/compta/paiement/card.php
	htdocs/expedition/class/expedition.class.php
 2020-05-18 15:54:39 +02:00
Laurent Destailleur
45345440a4 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/expedition/class/expedition.class.php
	scripts/cron/cron_run_jobs.php
 2020-05-18 15:50:36 +02:00
Laurent Destailleur
18a19dafe5 Update cron_run_jobs.php 2020-05-18 15:01:29 +02:00
Maxime Kohlhaas
54af917afb Fix cron globals reload, missing mysoc and langs 2020-05-16 20:13:47 +02:00
Laurent Destailleur
fbbb898d52 Better log 2020-05-10 18:31:55 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
233a7f1022 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-04-05 12:24:27 +02:00
Laurent Destailleur
9bbedce3d6 Fix phpcs 2020-04-05 12:23:58 +02:00
Laurent Destailleur
b1c5490a74 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/tpl/extrafields_add.tpl.php
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_advanced.php
 2020-04-05 04:03:53 +02:00