Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-23 09:51:33 +01:00
Code Issues Packages Projects Releases Wiki Activity
82,240 Commits 36 Branches 190 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

414 Commits

Author SHA1 Message Date
Frédéric FRANCE
6ee186096c Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-24 23:48:51 +01:00
Frédéric FRANCE
041310c4ee wip 2019-02-24 23:47:00 +01:00
Laurent Destailleur
14b9a06e57 Merge pull request #10680 from ptibogxiv/patch-130 
FIX donations API
 2019-02-24 20:50:32 +01:00
ptibogxiv
c2d05141bf FIX donations API 2019-02-24 16:36:06 +01:00
Frédéric FRANCE
167a857f4c replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Laurent Destailleur
42bb96dc27 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-12 19:44:30 +01:00
Laurent Destailleur
6a8504e1f8 Fix missing constant 2019-02-12 19:44:12 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Frédéric FRANCE
580e5c42d2 GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
648eea3a70 Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
c33860cfab Merge pull request #10368 from ptibogxiv/patch-91 
NEW thirdparty in donation if option ON
 2019-01-27 18:07:46 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +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
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
ptibogxiv
e5d1466ec5 Update card.php 2019-01-22 18:44:28 +01:00
ptibogxiv
4d2231a6a2 Fix double < 2019-01-21 23:53:17 +01:00
Laurent Destailleur
844643c37d Merge pull request #10375 from grandoc/new_branch_19_01_2019 
update with html5 compliant code
 2019-01-20 19:48:32 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
2bbaae88d6 Fix standardize 'createfromclone' param when cloning 2019-01-19 12:46:38 +01:00
Philippe GRAND
29fdad144d update with html5 compliant code 2019-01-19 12:40:17 +01:00
ptibogxiv
a3153889b8 fix 2019-01-19 11:31:40 +01:00
Laurent Destailleur
302a838673 Merge pull request #10365 from ptibogxiv/patch-89 
NEW Add option DONATION_USE_THIRDPARTIES in admin of membership module
 2019-01-19 11:25:25 +01:00
ptibogxiv
d6cfd15102 NEW add API REST for donations 2019-01-18 17:56:56 +01:00
ptibogxiv
e74bccca21 Update don.class.php 2019-01-18 17:51:42 +01:00
ptibogxiv
c2c238ec24 Update don.class.php 2019-01-18 16:32:13 +01:00
ptibogxiv
d961ae3225 Update card.php 2019-01-18 16:31:26 +01:00
ptibogxiv
8fcdb3bb6d Update card.php 2019-01-18 16:30:28 +01:00
ptibogxiv
89e348515a Update don.class.php 2019-01-18 14:14:38 +01:00
ptibogxiv
4b447d7799 Update card.php 2019-01-18 14:13:55 +01:00
ptibogxiv
09567ebaaf Update card.php 2019-01-18 11:28:29 +01:00
ptibogxiv
af03f108a1 Update card.php 2019-01-18 11:28:09 +01:00
ptibogxiv
5232024de9 ADD thirdparty support 2019-01-18 11:26:12 +01:00
ptibogxiv
c7bedbe7dc Update for thirdparty support 2019-01-18 11:22:33 +01:00
ptibogxiv
f20dd80194 FIX: better thirparty support 2019-01-18 11:20:36 +01:00
ptibogxiv
9ae08d7897 FIX constant DONATION_USE_THIRDPARTIES in admin 2019-01-17 22:22:31 +01:00
Laurent Destailleur
58bda12e22 css 2019-01-17 19:31:01 +01:00
ldestailleur
f5b3ba231f Fix phpcs 2019-01-02 20:00:08 +01:00
ptibogxiv
4b1ea18e32 Update donation.php 2018-12-30 17:35:50 +01:00
ptibogxiv
e503e7e698 Fix ajax toogle in donation.php 2018-12-30 17:34:44 +01:00
Laurent Destailleur
2011afe6fb Merge branch 'develop' into actionrefused 2018-12-14 15:48:24 +01:00
Laurent Destailleur
ca1f9c7e60 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/stocks.lang
 2018-11-28 16:57:39 +01:00
ptibogxiv
21f4d474b4 Fix sql don.class.php 2018-11-28 16:11:10 +01:00
Laurent Destailleur
0373cad2cd FIX Method setValid not found 2018-11-28 16:11:00 +01:00
ptibogxiv
fe30eee16e Fix sql don.class.php 2018-11-21 19:50:55 +01:00
Frédéric FRANCE
731d19a29b add tooltip to butActionRefused 2018-11-13 21:40:17 +01:00