lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,709 Commits 43 Branches 150 Tags 886 MiB
753089a99d
Commit Graph

69709 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yanis LISIMA
753089a99d NEW Change forgotten password link in general parameters 
In some cases, user password are managed by external systems (ex: LDAP).
The new parameter MAIN_PASSWORD_FORGOTLINK will send users to true forgotten password link.
 2018-09-23 21:26:07 +02:00
Laurent Destailleur
d9ccc7624b Standardize code 2018-09-23 16:09:25 +02:00
Laurent Destailleur
33f9600c9c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:58:43 +02:00
Laurent Destailleur
6c814b32bd Standardize cod 2018-09-23 15:58:33 +02:00
Laurent Destailleur
f88170e22a
Merge pull request #9596 from tuxgasy/dev_bank_treso_hooks 
NEW Add somes hooks in bank planned entries
 2018-09-23 15:49:50 +02:00
Laurent Destailleur
94c43716b3 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 15:47:35 +02:00
Laurent Destailleur
48ca7e4603 Typo 2018-09-23 15:47:13 +02:00
Laurent Destailleur
e277670a70
Merge pull request #9573 from grandoc/new_branch_20_09_2018 
Standardize and update code from New branch 20 09 2018
 2018-09-23 15:35:42 +02:00
Laurent Destailleur
29979a8429 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-23 14:57:55 +02:00
Laurent Destailleur
8aa22f2c33 NEW Add option to swap sender/recipient address on PDF 2018-09-23 14:57:44 +02:00
Laurent Destailleur
a5b8c9f9e2
Merge pull request #9581 from grandoc/develop 
Standardize and update code
 2018-09-23 14:46:31 +02:00
Laurent Destailleur
efe7f57add
Merge pull request #9587 from frederic34/patch-9 
remove superfluous spaces and correct indentation
 2018-09-23 14:46:11 +02:00
Philippe GRAND
0a86515efc Merge remote-tracking branch 'upstream/develop' into develop 2018-09-23 11:48:06 +02:00
TuxGasy
db223af39b Add somes hooks in bank planned entries 2018-09-22 18:44:00 +02:00
Frédéric FRANCE
da7dc72ddb
Merge branch 'develop' into patch-9 2018-09-22 10:20:02 +02:00
Laurent Destailleur
fab57e163e Fix phpcs 2018-09-21 14:52:06 +02:00
Frédéric FRANCE
b064b580b4
remove superfluous spaces 2018-09-21 12:19:59 +02:00
Laurent Destailleur
7ece28ffd3 Trans 2018-09-21 11:48:01 +02:00
Laurent Destailleur
3be13f0cb6 Fix css 2018-09-21 11:45:04 +02:00
Laurent Destailleur
0abe05c6b7 Fix no form inside a table 2018-09-21 11:29:01 +02:00
Laurent Destailleur
e2a9bf3a83
Merge pull request #9586 from frederic34/patch-9 
correct link to setup modulebuilder
 2018-09-21 11:18:21 +02:00
Laurent Destailleur
ac8f82338e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-21 11:12:27 +02:00
Frédéric FRANCE
7434b076d8
correct link to setup modulebuilder 2018-09-21 11:12:19 +02:00
Laurent Destailleur
a078951a94 Add an help for user to avoid bad configuration 2018-09-21 11:12:08 +02:00
Philippe Grand
239be3b58c
Merge branch 'develop' into new_branch_20_09_2018 2018-09-21 10:12:48 +02:00
Laurent Destailleur
90b327af1d
Merge pull request #9584 from ptibogxiv/patch-54 
fix link with connect transaction.php
 2018-09-21 09:59:57 +02:00
Laurent Destailleur
486a6fdc3a
Merge pull request #9583 from ptibogxiv/patch-65 
fix link in connect mode charge.php
 2018-09-21 09:58:51 +02:00
ptibogxiv
60cb83cf25
Update transaction.php 2018-09-21 09:55:24 +02:00
ptibogxiv
d09b74abe5
Update transaction.php 2018-09-21 09:54:07 +02:00
ptibogxiv
933f253c86
Update transaction.php 2018-09-21 09:52:27 +02:00
ptibogxiv
61d0aa66a5
Update transaction.php 2018-09-21 09:52:08 +02:00
ptibogxiv
d544f0598b
fix link in connect mode 2018-09-21 09:50:31 +02:00
Laurent Destailleur
8cfe5d7252
Merge pull request #9569 from grandoc/new_branch_19_09_2018 
Missing translation
 2018-09-21 09:50:18 +02:00
ptibogxiv
d0fafe8f0f
fix link with connect transaction.php 2018-09-21 09:49:13 +02:00
Laurent Destailleur
21f959746f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-21 09:42:44 +02:00
Laurent Destailleur
0073d63464 Fix phpcs 2018-09-21 09:42:33 +02:00
Laurent Destailleur
f7392871dd
Merge pull request #9579 from frederic34/patch-9 
remove warning Line exceeds 500 characters
 2018-09-21 09:40:28 +02:00
Philippe GRAND
e8b7ad0fb5 Standardize and update code 2018-09-21 08:49:05 +02:00
Laurent Destailleur
160e97616b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-20 23:43:51 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
 2018-09-20 23:43:34 +02:00
Laurent Destailleur
37dcb33661 phpunit for Loan 2018-09-20 23:41:04 +02:00
Frédéric FRANCE
042555e716
remove warning Line exceeds 500 characters 2018-09-20 20:44:17 +02:00
Laurent Destailleur
5a0ffb68d7
Merge pull request #9576 from atm-john/FIX_attribute_closing 
FIX attribute closing
 2018-09-20 20:34:57 +02:00
Laurent Destailleur
b05954fb1e
Merge pull request #9061 from delcroip/comptafiles 
NEW: Page to check if the operations/itemw created between two dates have attached item(s) and possibility to download all attachements
 2018-09-20 19:45:46 +02:00
Laurent Destailleur
eb80c5c338 Fix translation not loaded and test on multicompany 2018-09-20 19:45:13 +02:00
Laurent Destailleur
4ba057528f Fix permissionss 2018-09-20 19:37:28 +02:00
Laurent Destailleur
e6a5c99b71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-20 19:35:24 +02:00
Laurent Destailleur
36b8958c59 Move Stripe menu transactions and charges from develop to experimental 2018-09-20 19:35:13 +02:00
Laurent Destailleur
4ab6155b07
Merge pull request #9545 from ptibogxiv/patch-64 
Fix link display
 2018-09-20 19:27:00 +02:00
Laurent Destailleur
b421c29ea7 FIX #9510 2018-09-20 19:20:15 +02:00