Commit Graph

60886 Commits

Author SHA1 Message Date
Laurent Destailleur
5e67cb6dc6 Merge pull request #7273 from hregis/develop_mc
Fix: virtualmin script update
2017-08-22 10:44:53 +02:00
Laurent Destailleur
c3183a9b03 Merge pull request #7271 from defrance/patch-23
FIX Bad ojbject for extrafields
2017-08-22 10:36:51 +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
Regis Houssin
77180db1a3 Fix: wrong app name 2017-08-22 08:35:16 +02:00
Regis Houssin
1a39f388ce Fix: virtualmin script update 2017-08-22 08:31:23 +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
Laurent Destailleur
188653a85d Work on website module 2017-08-20 18:50:51 +02:00
Laurent Destailleur
aeba02fb22 Fix bad table alignement 2017-08-20 16:21:07 +02:00
Laurent Destailleur
1101a1094f Fix translation and migration 2017-08-20 16:07:38 +02:00
Laurent Destailleur
5c5c4046a1 Prepare setup for email reminder 2017-08-20 16:07:22 +02:00
BENKE Charlene
05754d4690 Bad ojbject for extrafields
https://www.dolibarr.fr/forum/527-bugs-sur-la-version-stable-courante/59536-extrafields-commande-dans-expedition
2017-08-19 13:26:50 +02:00
Laurent Destailleur
5d76227948 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2017-08-18 23:22:36 +02:00
Laurent Destailleur
260beed512 NEW Generated files are now indexed in database 2017-08-18 23:19:55 +02:00
Laurent Destailleur
097b660c41 Mutualize code 2017-08-18 16:25:00 +02:00
Laurent Destailleur
398733ff9a Fix syntax error 2017-08-17 23:44:16 +02:00
Laurent Destailleur
22a7c9bd6b Merge pull request #7220 from guerrierk/develop
NEW|Add possibility to propose last num releve in conciliation
2017-08-17 23:42:07 +02:00