Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
83,744 Commits 36 Branches 189 Tags
c29e1e78f3048e2f677697d3f3e665ff7e8ba75d
Commit Graph

137 Commits

Author SHA1 Message Date
Frédéric FRANCE
307bad1d2a doxygen todo 2019-12-11 19:11:13 +01:00
Scrutinizer Auto-Fixer
36a74cd160 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-12-03 10:17:29 +00:00
Frédéric FRANCE
41b5e82d48 The variable $error seems to be never defined 2019-12-01 16:42:18 +01:00
Laurent Destailleur
790fdc881c # WARNING: head commit changed in the meantime 
Restore file for travis
 2019-12-01 10:50:56 +01:00
Laurent Destailleur
6bf3af5d83 Merge branch '9.0' of https://github.com/dolibarr/dolibarr into 10.0 
Conflicts:
	htdocs/compta/tva/index.php
	htdocs/core/lib/pdf.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/margin/productMargins.php
	htdocs/margin/tabs/productMargins.php
 2019-12-01 10:30:22 +01:00
Laurent Destailleur
1d564c2a39 Merge branch '8.0' of https://github.com/dolibarr/dolibarr into 9.0 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-12-01 00:58:01 +01:00
Maxime Kohlhaas
02b5da5db1 Fix #12448 : notifications were sent to disabled user or contacts 2019-11-30 00:57:21 +01:00
Frédéric FRANCE
e2afcfb999 clean indent 2019-10-27 11:53:20 +01:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Frédéric FRANCE
2eaf3c0dda Add sendcontext to notification emails 2019-09-28 10:25:00 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
7e31e6b4f6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/notify.class.php
 2019-03-13 19:30:25 +01:00
Laurent Destailleur
9da84f68c7 Bad language file for civility order 2019-03-13 14:23:27 +01:00
Frédéric FRANCE
8b4e920d5e add visibility 2019-02-26 22:42:19 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
866729cd21 FIX bad link in notification 2018-10-30 22:32:42 +01:00
Laurent Destailleur
0e464ea4f5 Merge pull request #9866 from frederic34/emptylines 
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
 2018-10-26 15:31:24 +02:00
Laurent Destailleur
25a374bd9a NEW Notification module support expense report+holiday validation and 
approval event.
 2018-10-25 12:45:13 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
2c1e8d6535 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/expedition/class/expeditionbatch.class.php
	htdocs/public/payment/newpayment.php
	htdocs/stripe/config.php
 2018-10-16 18:47:11 +02:00
Laurent Destailleur
70366e9d91 Missing translation 2018-10-16 03:31:33 +02:00
Laurent Destailleur
35f9371343 Fix missing es translation string 2018-10-16 03:30:17 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Philippe GRAND
61daff6cb6 Standardize code 2018-10-06 12:34:51 +02:00
Frédéric FRANCE
48a063eca4 PSR2.Classes.ClassDeclaration.CloseBraceAfterBody 2018-10-04 20:18:24 +02:00
Laurent Destailleur
4fad28d360 Update notify.class.php 2018-10-04 19:30:45 +02:00
Laurent Destailleur
2232bd3944 Update notify.class.php 2018-10-04 19:30:03 +02:00
Philippe GRAND
c22b80831d fix regression 2018-10-01 17:14:28 +02:00
Philippe GRAND
0aae40f8aa fix when there is no project 2018-10-01 17:05:52 +02:00
Philippe GRAND
b32a9cc50e fix if no project linked 2018-10-01 09:13:02 +02:00
Philippe Grand
8acddb5bab Update notify.class.php 2018-09-29 18:43:50 +02:00
Philippe Grand
9a2fd7defe Update notify.class.php 2018-09-29 18:41:31 +02:00
Philippe GRAND
8ef9a301b3 add some significant info within notification mail 2018-09-29 14:51:52 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
edaa575435 Standardize and update code 2018-08-31 18:36:15 +02:00
Frédéric FRANCE
6aee680a4f PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Philippe GRAND
0ffad50974 Update and standardize code 2018-08-22 11:24:31 +02:00
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Laurent Destailleur
3710f95719 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/exports.lang
 2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21 Fix problem in some vars as reported in #8955 2018-07-16 09:57:45 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
Frédéric FRANCE
27bf5419d6 Merge branch 'develop' into swifmailer 2018-03-09 22:44:57 +01:00
Regis Houssin
093ea49cc6 Fix: use "multidir_output" instead "dir_output" 2018-02-26 11:35:30 +01:00