Commit Graph

60558 Commits

Author SHA1 Message Date
Laurent Destailleur
d511fed504 Enhance modulebuilder 2017-07-25 12:44:55 +02:00
Laurent Destailleur
dcf5fd20bb Fix navigation on card generated by modulebuilder 2017-07-25 10:38:39 +02:00
Laurent Destailleur
80da181802 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 09:55:29 +02:00
Laurent Destailleur
9043249740 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/commande/list.php
	htdocs/contrat/list.php
	htdocs/contrat/services.php
	htdocs/fourn/facture/list.php
2017-07-25 09:54:17 +02:00
Laurent Destailleur
aa9b4ce1f3 Fix too long combo for tags 2017-07-25 09:49:08 +02:00
Laurent Destailleur
bfd1fa3984 Enhance modulebuilder 2017-07-25 02:56:19 +02:00
Laurent Destailleur
13cd203502 Enhance modulebuilder 2017-07-25 01:54:54 +02:00
Laurent Destailleur
f6ab691c08 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 01:22:29 +02:00
Laurent Destailleur
e62a8d7bfa Debug modulebuilder 2017-07-25 01:22:06 +02:00
Laurent Destailleur
aff61fad7d Fix new generic classes system 2017-07-25 01:21:20 +02:00
Laurent Destailleur
fd84711a1c Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:33:56 +02:00
Laurent Destailleur
70341d6169 Debug modulebuilder 2017-07-25 00:33:43 +02:00
Laurent Destailleur
307b8ef4f6 Debug modulebuilder 2017-07-25 00:32:06 +02:00
Laurent Destailleur
1d7674906f Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:23:09 +02:00
Laurent Destailleur
e571616d52 Debug modulebuilder 2017-07-25 00:21:01 +02:00
Laurent Destailleur
bbb4047909 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-07-25 00:07:32 +02:00
Laurent Destailleur
b50236da4c Fix dir created at install 2017-07-25 00:07:17 +02:00
Laurent Destailleur
4ae60284fb Debug modulebuilder 2017-07-25 00:03:29 +02:00
Laurent Destailleur
9f3a5462b2 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-25 00:00:55 +02:00
Laurent Destailleur
41c6d9cbfb Debug modulebuilder 2017-07-25 00:00:08 +02:00
Laurent Destailleur
ddbf841514 Fix packager must ignore symbolic links in custom 2017-07-24 23:57:55 +02:00
Laurent Destailleur
1877a3b6fa Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-24 21:04:07 +02:00
Laurent Destailleur
8303cee676 Debug modulebuilder 2017-07-24 21:03:35 +02:00
Laurent Destailleur
dcb79e66cc Debug modulebuilder 2017-07-24 13:55:12 +02:00
Laurent Destailleur
67a442cd9a Uniformize fields 2017-07-24 11:53:57 +02:00
Laurent Destailleur
73c7aa378e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
2017-07-23 20:30:03 +02:00
Laurent Destailleur
9043cf759b Fix clone function 2017-07-23 20:27:30 +02:00
Laurent Destailleur
6421ec3139 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/class/doleditor.class.php
2017-07-23 19:27:40 +02:00
Laurent Destailleur
25b107defb Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
Conflicts:
	htdocs/contrat/list.php
	htdocs/fichinter/list.php
2017-07-23 19:09:00 +02:00
Laurent Destailleur
d5d95c31a6 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-07-23 19:07:14 +02:00
Laurent Destailleur
585dde6cf5 Fix url 2017-07-23 19:06:47 +02:00
Laurent Destailleur
0aed9ecd7c Fix ckeditor is now ok since there is no more jmobile. 2017-07-23 18:52:30 +02:00
Laurent Destailleur
f3de6cfd32 Support for robots and .htaccess file 2017-07-23 17:44:26 +02:00
Laurent Destailleur
7eee529c9f Can use - and _ into website alias 2017-07-23 16:28:56 +02:00
Laurent Destailleur
336400d9ea Can clone a page onto another website 2017-07-23 16:20:53 +02:00
Laurent Destailleur
0963a649b7 Update doc 2017-07-22 23:49:28 +02:00
Laurent Destailleur
7904e994a7 FIX When disconnected, the search box jump to login instead of error. 2017-07-22 23:43:40 +02:00
Laurent Destailleur
764c7ac792 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/websites/index.php
2017-07-22 20:46:02 +02:00
Laurent Destailleur
583452114b Split editor in 2 (html source and wysiwyg) 2017-07-22 20:19:10 +02:00
Laurent Destailleur
2a133f4a3f Generate table for extrafields 2017-07-22 20:12:00 +02:00
Laurent Destailleur
437d620fe4 Add support of language in website module 2017-07-22 20:01:29 +02:00
Laurent Destailleur
854a6ca3d5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 2017-07-22 16:40:45 +02:00
Laurent Destailleur
9e6666e511 Fix translation keys for taxes 2017-07-22 16:40:19 +02:00
Laurent Destailleur
6470b62f56 Fix bad rounding 2017-07-22 16:13:21 +02:00
Laurent Destailleur
340203cc18 Fix vat label for India 2017-07-22 16:05:51 +02:00
Laurent Destailleur
44023606c6 Fix pb in dolGetFirstLineOfText. Add PHPunit 2017-07-22 12:47:35 +02:00
Laurent Destailleur
4803f2d29a Fix package v6 2017-07-22 11:26:25 +02:00
Laurent Destailleur
e0f0769405 Fix packager 2017-07-22 02:31:33 +02:00
Laurent Destailleur
a0d9890c99 Fix packager 2017-07-22 02:31:06 +02:00
Laurent Destailleur
e36911360b Update changelog 2017-07-22 02:22:16 +02:00