lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
68,083 Commits 43 Branches 150 Tags 886 MiB
dc34794ef1
Commit Graph

14386 Commits

Author SHA1 Message Date
Laurent Destailleur
2b7735ec71 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-24 17:06:55 +02:00
Laurent Destailleur
7e9a2c5ec7 Fix #9092 2018-07-24 17:06:41 +02:00
Laurent Destailleur
c1002e7b41
Merge pull request #9123 from atm-maxime/new_timespent_numeric 
NEW Allow to enter a timespent with a numeric value
 2018-07-24 16:58:24 +02:00
Laurent Destailleur
3e54ee5df7
Merge pull request #9131 from fappels/7.0_Fix_syslog_infinite_loop 
Fix chromephp firephp Syslog infinite loop
 2018-07-24 16:53:32 +02:00
Laurent Destailleur
a1bdc6022d Website module 2018-07-24 01:10:38 +02:00
Laurent Destailleur
174394c476 Work on website module 2018-07-23 14:08:20 +02:00
fappels
b697307bac Fix chromephp firephp Syslog infinite loop. 
When chromephp/firephp not found ->trans causes infinite loop. Can
happen when files moved to other server or location.
 2018-07-22 10:41:39 +02:00
Laurent Destailleur
2c7029850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
 2018-07-21 20:28:26 +02:00
Laurent Destailleur
1d8c42265c Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/modules/modFacture.class.php
 2018-07-21 20:26:19 +02:00
Laurent Destailleur
a1180f79bd Fix missing customer code and ref customer 2018-07-21 12:56:18 +02:00
Laurent Destailleur
8247bb683c Debug website module 2018-07-19 21:35:21 +02:00
Maxime Kohlhaas
22d94a570a Allow to enter a timespent with a numeric value 2018-07-19 19:04:07 +02:00
Laurent Destailleur
445db58966 FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df FIX website in inline edit mode 2018-07-19 16:06:06 +02:00
Laurent Destailleur
efa5cdeab1 More complete list of allowed html tags 2018-07-19 15:24:48 +02:00
Laurent Destailleur
7dc552a54e Fix alignement 2018-07-17 18:10:42 +02:00
Laurent Destailleur
26507ee712 Code comment 2018-07-17 14:02:08 +02:00
Laurent Destailleur
7fcec5f6c3 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:54:13 +02:00
Laurent Destailleur
8249179fb8 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:50:26 +02:00
Laurent Destailleur
d4a5491753 Fix duplicate tab "contact" on thirdparty 2018-07-17 13:48:08 +02:00
Laurent Destailleur
508133b336 Clean code 2018-07-17 13:04:54 +02:00
Laurent Destailleur
f747cefda3 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:44:44 +02:00
Laurent Destailleur
45a45b0dec NEW Can enable a module, even external module, from command line 
Conflicts:
	htdocs/install/upgrade2.php
 2018-07-16 15:35:00 +02:00
Laurent Destailleur
e5f2fbf8db Fix trans 2018-07-16 15:21:29 +02:00
Laurent Destailleur
41605ed4a7 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-07-16 11:29:47 +02:00
Laurent Destailleur
e92ab19a06 Fix var not defined 2018-07-16 11:26:23 +02:00
Laurent Destailleur
c477ca8266 Fix scrutinizer 2018-07-16 11:25:21 +02:00
Laurent Destailleur
4128cee3ee Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-16 11:21:29 +02:00
Laurent Destailleur
e3d9e609d5 Fix var not defined 2018-07-16 11:20:54 +02:00
Laurent Destailleur
d3cc2c81eb Better detail for time elapsed 2018-07-16 11:14:39 +02:00
Laurent Destailleur
89cc048fff FIX Init of contact in combo list when thirdparty not yet known 2018-07-16 10:46:10 +02:00
Laurent Destailleur
c94437c3cf Fix file in wrong dir 2018-07-16 10:14:51 +02:00
Laurent Destailleur
76c6f28d85
Merge pull request #9035 from grandoc/new_branch_29_06_2018 
update code
 2018-07-16 10:09:46 +02:00
Laurent Destailleur
6bf4ef5ef4
Fix double " 
Fix double "
 2018-07-16 10:09:13 +02:00
Laurent Destailleur
e72e56ce2d
Merge pull request #9041 from grandoc/new_branch_02_07_2018 
update description code
 2018-07-16 10:03:54 +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
Laurent Destailleur
1e42db0641 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:16:54 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018 
docs: complete comments
 2018-07-15 20:12:21 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop 
fix list of event of thirdparty and unformize code
 2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac Code comment 2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes 
fix sql error functions.lib.php
 2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php 2018-07-15 20:00:43 +02:00
Laurent Destailleur
4279ba66e1
Merge pull request #9103 from grandoc/new_branch_13_07_2018 
fix: breacking link
 2018-07-15 19:59:10 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018 
New branch 10 07 2018
 2018-07-15 19:52:07 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
florian HENRY
09fe2f83fa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747 fix list of event unformize code 2018-07-12 18:27:09 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +02:00