Laurent Destailleur
|
4ef6c9cc13
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/class/html.formticket.class.php
htdocs/langs/en_US/ticket.lang
|
2019-11-26 11:54:42 +01:00 |
|
Laurent Destailleur
|
d1419f81da
|
Merge pull request #12390 from bb2a/patch-4
Use english name of subsitution variables for thirdparties
|
2019-11-26 10:26:45 +01:00 |
|
Laurent Destailleur
|
b370d70426
|
Merge pull request #12511 from erpware/develop
just fixed two small css issues
|
2019-11-26 09:20:40 +01:00 |
|
Laurent Destailleur
|
0032b27a8e
|
Merge pull request #12517 from frederic34/patch-16
$out does not seem to be defined for all execution paths
|
2019-11-26 09:14:55 +01:00 |
|
Laurent Destailleur
|
cee40561df
|
Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop
|
2019-11-26 09:13:52 +01:00 |
|
Laurent Destailleur
|
b0b579bdbf
|
Fix phpcs
|
2019-11-26 09:13:35 +01:00 |
|
Laurent Destailleur
|
034267edbf
|
Merge pull request #12516 from frederic34/patch-15
doxygen
|
2019-11-26 09:11:10 +01:00 |
|
Laurent Destailleur
|
b44817f2bf
|
Merge pull request #12518 from frederic34/patch-17
doxygen
|
2019-11-26 09:10:47 +01:00 |
|
Frédéric FRANCE
|
4c4ae5b6e1
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-26 08:10:40 +01:00 |
|
Alexandre SPANGARO
|
6cc61fef9c
|
Fix Ticket - Deprecated <center>
|
2019-11-26 04:32:38 +01:00 |
|
Frédéric FRANCE
|
1ccf0808d0
|
doxygen
|
2019-11-26 00:28:26 +01:00 |
|
Frédéric FRANCE
|
a142c0050e
|
$out does not seem to be defined for all execution paths
|
2019-11-26 00:24:00 +01:00 |
|
Frédéric FRANCE
|
77a300c9ae
|
doxygen
|
2019-11-26 00:20:40 +01:00 |
|
andreubisquerra
|
6baa1c8d4a
|
Fix travis
|
2019-11-25 23:32:40 +01:00 |
|
Daniel Seichter
|
7a4beb824f
|
Merge remote-tracking branch 'upstream/develop' into develop
|
2019-11-25 23:14:19 +01:00 |
|
Daniel Seichter
|
9eafc8f550
|
fix small css issues
|
2019-11-25 23:13:31 +01:00 |
|
andreubisquerra
|
b2e995279e
|
Fix takepos.lib.php to add Receipt tab and delete unnecessary takepos.lib.php
|
2019-11-25 19:29:07 +01:00 |
|
Laurent Destailleur
|
61f414488a
|
Fix translation
|
2019-11-24 18:34:07 +01:00 |
|
Laurent Destailleur
|
bc5270ce76
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/fourn/facture/card.php
|
2019-11-24 18:15:25 +01:00 |
|
Laurent Destailleur
|
712ae48e4e
|
Fix default setup
|
2019-11-24 18:07:38 +01:00 |
|
Laurent Destailleur
|
cf0311dd6a
|
FIX Hook getAccessForbiddenMessage was missing parameters
|
2019-11-22 16:13:22 +01:00 |
|
Laurent Destailleur
|
32f590f274
|
Merge pull request #12485 from aspangaro/12.0_a2
NEW Add shipment widget
|
2019-11-22 14:39:56 +01:00 |
|
Laurent Destailleur
|
e2009ceff0
|
Fix extrafields of line for receptions
|
2019-11-22 14:22:35 +01:00 |
|
Laurent Destailleur
|
00ad95c01e
|
Figth against useless dependencies: Remove library the core never use.
|
2019-11-22 14:06:43 +01:00 |
|
Laurent Destailleur
|
1ed2eacbef
|
Debug add email profile
|
2019-11-22 12:40:17 +01:00 |
|
Laurent Destailleur
|
6191307865
|
Debug v11
|
2019-11-22 12:22:27 +01:00 |
|
Alexandre SPANGARO
|
f4e1361d06
|
NEW small fix
|
2019-11-22 06:53:05 +01:00 |
|
Laurent Destailleur
|
92a65a8039
|
Log
|
2019-11-21 21:36:03 +01:00 |
|
Laurent Destailleur
|
5fdd6f698d
|
More complete error message
Conflicts:
htdocs/core/class/CMailFile.class.php
|
2019-11-21 20:46:27 +01:00 |
|
Laurent Destailleur
|
b46362dff9
|
More complete error message
|
2019-11-21 20:45:19 +01:00 |
|
Laurent Destailleur
|
e8bc8b68c1
|
Fix missing field in migration
|
2019-11-21 18:17:40 +01:00 |
|
Anthony Berton
|
496aa0c065
|
Update functions.lib.php
|
2019-11-21 10:38:59 +01:00 |
|
Alexandre SPANGARO
|
2f064567ef
|
NEW Add shipment widget
|
2019-11-21 07:50:44 +01:00 |
|
Laurent Destailleur
|
58c38912ab
|
Fix action into actionlogin to avoid conflict
|
2019-11-20 16:42:18 +01:00 |
|
stickler-ci
|
3209d550c2
|
Fixing style errors.
|
2019-11-20 11:45:12 +00:00 |
|
ptibogxiv
|
2c810988a6
|
Update dolgraph.class.php
|
2019-11-20 12:43:49 +01:00 |
|
Frédéric FRANCE
|
d182eee4bf
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-19 23:26:00 +01:00 |
|
Laurent Destailleur
|
2f3b4d239b
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
|
2019-11-19 18:56:12 +01:00 |
|
Laurent Destailleur
|
6bfb76d40d
|
Merge pull request #12464 from bb2a/patch-6
Update getfullname
|
2019-11-19 10:55:47 +01:00 |
|
Scrutinizer Auto-Fixer
|
cd7523318d
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-19 08:30:26 +00:00 |
|
Laurent Destailleur
|
5b6f0cb101
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/core/class/extrafields.class.php
|
2019-11-18 21:19:10 +01:00 |
|
Laurent Destailleur
|
918f476c2b
|
Fix backport fix not checking mandatory extrafields of type select
|
2019-11-18 19:02:12 +01:00 |
|
Frédéric FRANCE
|
2e5f539b2a
|
Merge remote-tracking branch 'upstream/develop' into actioncomm_category
|
2019-11-18 17:45:52 +01:00 |
|
Laurent Destailleur
|
ae0fdf014f
|
Debug email collector. Missing unique key. Fix initial setup.
|
2019-11-18 11:55:22 +01:00 |
|
Laurent Destailleur
|
b69a7f9709
|
css
|
2019-11-17 20:25:39 +01:00 |
|
Laurent Destailleur
|
16d67a1a8e
|
Fix several trouble with some types in modulebuilder
Fix difference between null and 0
|
2019-11-17 17:36:36 +01:00 |
|
Anthony Berton
|
7a5883588c
|
Update commonobject.class.php
|
2019-11-17 14:07:01 +01:00 |
|
Anthony Berton
|
fe3c921152
|
Merge branch 'develop' into patch-4
|
2019-11-17 10:17:47 +01:00 |
|
Scrutinizer Auto-Fixer
|
1648fc142e
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2019-11-16 22:24:29 +00:00 |
|
Anthony Berton
|
e1f36ae107
|
Update functions.lib.php
|
2019-11-16 17:37:18 +01:00 |
|