2
0
forked from Wavyzz/dolibarr
Commit Graph

1364 Commits

Author SHA1 Message Date
Laurent Destailleur
a7496c16cb Doc 2020-01-12 22:00:23 +01:00
Laurent Destailleur
a6bae97826 Sync from transifex 2020-01-12 21:28:09 +01:00
Laurent Destailleur
6508ee03bf Fix for en_US 2020-01-12 21:27:43 +01:00
Laurent Destailleur
e52ca6f1b5 Fix script 2020-01-08 13:35:38 +01:00
Laurent Destailleur
027d88d3ce Fix purge script 2020-01-08 13:35:17 +01:00
Laurent Destailleur
c6d50ff786 Update demo sql file 2019-12-21 17:48:29 +01:00
Laurent Destailleur
2e2c9562e8 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-05 18:30:37 +01:00
Laurent Destailleur
4ae26be878 Work whatever is running dir 2019-12-05 18:30:26 +01:00
Laurent Destailleur
599ca6cae2 Demo 2019-12-05 13:01:02 +01:00
Laurent Destailleur
25546f64b8 Update demo 2019-12-05 12:09:52 +01:00
Laurent Destailleur
590d2cda17 Complete #12556 2019-12-01 18:56:34 +01:00
Laurent Destailleur
fc2fc81bb0 Fix image 2019-12-01 18:22:08 +01:00
Laurent Destailleur
958ffa6ec8 FIX Images in TCPDF are removed by TCPDF when it should not 2019-11-30 17:19:25 +01:00
Laurent Destailleur
cb2bf00ef8 Add sql 2019-11-30 11:50:49 +01:00
Laurent Destailleur
268535a320 Update demo 2019-11-29 10:05:46 +01:00
Laurent Destailleur
3148f6a9fa Add file for demo v11 2019-11-28 16:44:05 +01:00
Laurent Destailleur
1636d341c7 Debug module BOM
Enhance demo data for TakePOS
2019-11-28 15:18:14 +01:00
Frédéric FRANCE
8f6d38ee82 clean indent 2019-10-27 17:01:23 +01:00
Frédéric FRANCE
5006001753 clean indent 2019-10-27 08:50:32 +01:00
Frédéric FRANCE
7f3f48be0f clean indent in theme directory 2019-10-26 21:11:36 +02:00
Frédéric FRANCE
a7797ba1da clean indent in variants directory 2019-10-26 20:53:39 +02:00
Frédéric FRANCE
635306c084 restore original rules to be mergeable without errors 2019-10-26 18:23:51 +02:00
Frédéric FRANCE
a1f0245c79 clean indent in compta, contact directory 2019-10-26 18:13:20 +02:00
Frédéric FRANCE
79825e2193 start clean indent in compta directory 2019-10-26 14:42:25 +02:00
Frédéric FRANCE
1a10b30a76 clean indent in comm directory 2019-10-26 14:28:40 +02:00
Frédéric FRANCE
86f22c4563 do not ignore lines with mix od tabs and spaces 2019-10-20 17:17:22 +02:00
Frédéric FRANCE
0ede817588 do not ignore lines with mix od tabs and spaces 2019-10-20 16:56:47 +02:00
Frédéric FRANCE
e75f7d448c Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Frédéric FRANCE
9f59656589 fix typo inspired by grandoc 2019-10-11 23:08:33 +02:00
Laurent Destailleur
5d64cec354 Exclude medias from fixdosfiles 2019-10-10 10:52:06 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
1c105718b9 Update demo 2019-10-08 21:06:09 +02:00
Laurent Destailleur
0cf014b01f Update Restler to 3.0RC6 (last bug fixes of branch v3) 2019-10-08 11:14:53 +02:00
Laurent Destailleur
44025ce4c2 Update TCPDF to 6.3.2 2019-10-08 09:59:17 +02:00
Laurent Destailleur
539f4355c3 Try to fix stickler 2019-10-07 20:48:44 +02:00
Laurent Destailleur
8904ce5732 Removed warning we don't want 2019-10-03 16:57:12 +02:00
stickler-ci
3cad71f2c1 Fixing style errors. 2019-10-03 08:00:38 +00:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
258424416e Merge remote-tracking branch 'upstream/develop' into zapier 2019-09-30 07:49:52 +02:00
Laurent Destailleur
f3bc319a78 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/expedition/class/expedition.class.php
	htdocs/takepos/takepos.php
2019-09-27 14:11:14 +02:00
Laurent Destailleur
33754f1951 Update demo 2019-09-26 14:36:23 +02:00
Laurent Destailleur
24e5b6ab79 Fix default filename of dump 2019-09-26 14:35:50 +02:00
Laurent Destailleur
0e5d0a7784 Add data for tickets 2019-09-26 14:14:01 +02:00
Laurent Destailleur
b0615d477e Update demo 2019-09-26 13:58:43 +02:00
Laurent Destailleur
280219843e Update demo 2019-09-26 13:58:30 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
9e18f5243a jshint 2019-09-11 18:21:59 +02:00
Frédéric FRANCE
638362f373 jshint 2019-09-11 18:17:12 +02:00
Frédéric FRANCE
d37dd4ed3c jshint 2019-09-11 18:07:21 +02:00