lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
60,906 Commits 43 Branches 150 Tags 886 MiB
30c39d246b
Commit Graph

60906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
30c39d246b Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-22 11:18:56 +02:00
Laurent Destailleur
206d46cbb7 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	scripts/cron/cron_run_jobs.php
 2017-08-22 11:18:17 +02:00
Laurent Destailleur
41ce4886fd Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-08-22 11:15:30 +02:00
Laurent Destailleur
256f6e410c Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0 2017-08-22 11:14:51 +02:00
Laurent Destailleur
d5d337c631 Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.9 2017-08-22 11:14:27 +02:00
Laurent Destailleur
71818da6a5 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.8 2017-08-22 11:13:58 +02:00
Laurent Destailleur
c53aef9955 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-08-22 10:51:30 +02:00
Laurent Destailleur
a18995d3dc Merge branch '3.6' of git@github.com:Dolibarr/dolibarr.git into 3.7 2017-08-22 10:47:47 +02:00
Regis Houssin
a17e4434be Fix: wrong app name 2017-08-22 10:46:06 +02:00
Regis Houssin
d2955cb32f Fix: virtualmin script update 2017-08-22 10:46:02 +02:00
Laurent Destailleur
5b0e6297bb Merge pull request #7272 from rycks/5.0_cron 
FIX 'Error cronjob->run_job: Permission denied'
 2017-08-22 10:43:29 +02:00
Laurent Destailleur
749355abc2 Update cron_run_jobs.php 2017-08-22 10:41:30 +02:00
BENKE Charlene
7c3640a4c3 Bad ojbject for extrafields 
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/59536-extrafields-commande-dans-expedition
 2017-08-22 10:37:21 +02:00
Laurent Destailleur
ca3b3b9843 Merge pull request #7270 from atm-florian/6.0_fix 
6.0 fix
 2017-08-22 10:33:08 +02:00
Laurent Destailleur
b3d1cdf84c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/expensereport/card.php
 2017-08-22 10:11:32 +02:00
Laurent Destailleur
9be342bd25 Fix missing $form 2017-08-22 10:02:45 +02:00
Laurent Destailleur
1fe23e3fec Move french text into english 2017-08-22 09:24:26 +02:00
Laurent Destailleur
731f826a55 NEW jquery date selector become default date selector 2017-08-22 09:23:35 +02:00
Laurent Destailleur
4a310f36d8 Fix help url 2017-08-22 08:12:30 +02:00
Laurent Destailleur
e647b5562b Fix hidden option EXPENSEREPORT_LINES_SORTED_BY_ROWID to restore 
compatibility.
 2017-08-21 23:41:32 +02:00
Laurent Destailleur
9ffcd9e922 Fix cover background size 2017-08-21 21:18:07 +02:00
Laurent Destailleur
599f6426a5 Fix link http 2017-08-21 20:49:12 +02:00
Laurent Destailleur
348a42542d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/theme/eldy/style.css.php
 2017-08-21 13:29:08 +02:00
Laurent Destailleur
e8a2680e31 Sync transifex 2017-08-21 13:26:56 +02:00
Laurent Destailleur
2104ab9aed Disable event reminder 2017-08-21 13:11:29 +02:00
Laurent Destailleur
0e173d85ae Fix translation 2017-08-21 13:01:14 +02:00
Laurent Destailleur
70dcace0a1 Fix regression syntax 2017-08-21 12:52:47 +02:00
Laurent Destailleur
f5993a2507 Better style 2017-08-21 12:51:48 +02:00
Laurent Destailleur
fe724a2e69 Fix syntax error 2017-08-21 12:35:43 +02:00
Laurent Destailleur
9782937138 Better info style 2017-08-21 12:25:38 +02:00
Laurent Destailleur
7aff424d1c Fix bad position of field 2017-08-21 12:24:58 +02:00
Laurent Destailleur
b48f501a0c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 11:04:09 +02:00
Laurent Destailleur
d7be62b7da Better style 2017-08-21 11:02:24 +02:00
Laurent Destailleur
48f2e465fa Better info style 2017-08-21 11:01:24 +02:00
Laurent Destailleur
2e6a211577 Clean code 2017-08-21 04:17:28 +02:00
Laurent Destailleur
583fc485a9 Work on website module 2017-08-21 03:13:44 +02:00
Laurent Destailleur
84d584f607 Missing translation 2017-08-21 01:39:22 +02:00
Laurent Destailleur
68c31c55c5 FIX delete dir when there is symlinks 2017-08-21 01:26:22 +02:00
Laurent Destailleur
eedf5e0a22 FIX delete dir when there is symlinks 2017-08-21 01:24:34 +02:00
Laurent Destailleur
e7ae82f9b3 Fix clone of web site 2017-08-21 01:04:30 +02:00
Laurent Destailleur
4f6363bff8 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-21 00:49:47 +02:00
Laurent Destailleur
5a0641a30e Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 
Conflicts:
	htdocs/compta/bank/bankentries.php
 2017-08-21 00:47:58 +02:00
Laurent Destailleur
ac3a270e17 FIX Do not delete files into sym links 
Conflicts:
	htdocs/core/lib/files.lib.php
 2017-08-21 00:43:52 +02:00
Laurent Destailleur
a9b033e82f Can clone a website 2017-08-21 00:40:45 +02:00
Laurent Destailleur
b9511fd4c6 FIX Do not delete files into sym links 2017-08-21 00:40:32 +02:00
Laurent Destailleur
083cb33a6c Clean ecm code 2017-08-20 23:16:20 +02:00
Laurent Destailleur
11be4c8632 Remove useless code 2017-08-20 21:26:18 +02:00
Laurent Destailleur
2321091170 NEW Move the upload input on top right in ECM module 2017-08-20 21:23:19 +02:00
Laurent Destailleur
d911749b17 Remove deprecated constant 2017-08-20 19:47:55 +02:00
Laurent Destailleur
b1121f9f61 Better mode to clean not corrctly removed modules. 2017-08-20 19:27:12 +02:00