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

365 Commits

Author SHA1 Message Date
Laurent Destailleur
a329f7dc75 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/accountancy/customer/list.php
	htdocs/accountancy/supplier/list.php
 2017-11-05 18:50:14 +01:00
Laurent Destailleur
52421406ce FIX #7751 2017-11-05 18:25:33 +01:00
Laurent Destailleur
eb4a5f6570 Fix link can't be a htm link in innosetup 2017-11-05 18:21:29 +01:00
Fabian Rodriguez
504219cedc Improved missing Windows component message, see #7751 2017-11-05 10:46:43 -05: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
ab9be29356 Fix installers 2017-06-24 21:36:51 +02:00
Laurent Destailleur
1b6da075f7 Fix new apache 2.4 directives 2016-07-31 02:26:06 +02:00
Laurent Destailleur
64fbff3abc Fix for 4.0 doliwamp 2016-07-31 02:18:48 +02:00
Laurent Destailleur
8961f1077a Detection of chrome to install correctly doliwamp when chrome is used 2016-07-09 12:19:58 +02:00
Laurent Destailleur
f47fc3c6ba Fix for apache 2.4 2016-07-08 00:20:26 +02:00
Laurent Destailleur
964001bda2 Fix for apache 2.4 2016-07-08 00:16:22 +02:00
Laurent Destailleur
e55ae1476a Fix innosetup install 2016-07-06 23:55:10 +02:00
Laurent Destailleur
d7bc30fc4e Prepare DoliWamp 4.0 2016-07-06 23:18:01 +02:00
Laurent Destailleur
16e3a3d294 Fix datadir not defined 
Fix can't use the cron script on cloud services since the admin user may
have different values.
 2016-07-06 22:49:08 +02:00
Laurent Destailleur
8e19b235f1 Code comment 2016-07-06 11:06:49 +02:00
Laurent Destailleur
9249a7c736 Add entry to run stop/start doliwamp as admin 2016-07-06 11:05:23 +02:00
Laurent Destailleur
a2e26e6ba0 Upgrade apache and php for DoliWamp but not Mysql 2016-07-06 10:49:19 +02:00
Laurent Destailleur
bad758f248 Fix syntax error 2016-07-03 19:10:52 +02:00
Laurent Destailleur
f3eb564d5f Some fix for mysql5.6.17 2016-07-03 15:24:01 +02:00
Laurent Destailleur
ce3f45c2a2 Debug of doliwamp for 4.0 2016-07-03 13:14:33 +02:00
Laurent Destailleur
a57a41a07d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2016-06-29 20:09:02 +02:00
Laurent Destailleur
383641e086 Test package vcredist is available 2016-06-29 20:08:47 +02:00
Laurent Destailleur
1a3bd97a55 Prepare 4.0 doliwamp 2016-06-28 02:07:39 +02:00
Laurent Destailleur
f9190b0940 Update doc 2016-06-08 18:32:42 +02:00
Laurent Destailleur
e5aa79364a Update cache example 2016-06-08 18:21:05 +02:00
Laurent Destailleur
f7bd2d16db Prepare upgrade of doliwamp 2016-05-04 20:48:49 +02:00
Laurent Destailleur
1af8ca458d Better image 
Conflicts:
	build/exe/doliwamp/doliwamp.bmp
 2016-05-04 20:34:25 +02:00
Laurent Destailleur
8b41970b2e Prepare upgrade of doliwamp 2016-05-04 20:19:53 +02:00
Laurent Destailleur
a2a5fa6f4f Update screenshots 2016-04-26 01:13:55 +02:00
Laurent Destailleur
8bb832d06b Fix Natural english 2015-09-17 00:48:10 +02:00
Laurent Destailleur
11d4a945b0 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	htdocs/adherents/liste.php
	htdocs/comm/propal.php
	htdocs/compta/facture.php
	htdocs/contact/list.php
	htdocs/contrat/liste.php
	htdocs/product/liste.php
 2015-05-25 18:08:23 +02:00
Laurent Destailleur
a4df49f6c8 Prepare packaging 2015-05-16 17:04:36 +02:00
Laurent Destailleur
e4aaff1de9 Merge remote-tracking branch 'origin/3.6' into 3.7 
Conflicts:
	build/debian/changelog
	build/makepack-dolibarr.pl
	build/makepack-howto.txt
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2015-05-16 17:01:40 +02:00
Laurent Destailleur
5b00ba11fd Prepare packaging 2015-05-16 16:54:54 +02:00
Laurent Destailleur
cabbb9e421 Merge remote-tracking branch 'origin/3.5' into 3.6 
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2015-05-16 16:49:03 +02:00
Laurent Destailleur
e8fb89f89f Prepare packaging 3.7 2015-05-16 16:38:47 +02:00
Laurent Destailleur
80943111cc Prepare 3.5.7 2015-05-16 15:26:34 +02:00
aspangaro
467a274f76 Typo 2015-01-22 21:12:20 +01:00
Laurent Destailleur
953e736a97 Prepare version 3.6.2 2014-12-27 02:21:37 +01:00
Laurent Destailleur
9e1b0d1abc Prepare 3.5.6 2014-12-04 15:09:47 +01:00
Laurent Destailleur
b8969edcc5 Prepare 3.6.1 2014-09-27 12:34:45 +02:00
Laurent Destailleur
a518a7256c maj copyright 2014-08-29 11:17:38 +02:00
Laurent Destailleur
6d49259999 Exclude nltechno dir 2014-08-06 23:57:25 +02:00
Laurent Destailleur
f1ca5b3eea Exclude vagrant dir 2014-08-06 23:55:07 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
b7f55ea99c Merge remote-tracking branch 'origin/3.5' into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/modules/modAgenda.class.php
	htdocs/core/modules/modProduct.class.php
	htdocs/fourn/commande/liste.php
 2014-05-18 11:52:52 +02:00
Laurent Destailleur
fd271d7c92 Fix: Missing to set version to beta 2014-05-14 14:09:57 +02:00
Laurent Destailleur
8ab09d63a2 Fix: Rss features 2014-05-14 11:16:12 +02:00
Laurent Destailleur
1c6c79811d Prepare version 3.5.3 2014-05-06 16:09:13 +02:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
07ac9d3922 Add example for basic authent 2014-03-12 15:19:49 +01:00
Laurent Destailleur
38423b9ec9 Fix: bad version 2014-03-09 03:29:58 +01:00
Laurent Destailleur
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
247c49e094 Prepare 3.5.0 release 2013-12-31 15:17:10 +01:00
Laurent Destailleur
bec70d1f0e Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:09:38 +01:00
Laurent Destailleur
70ac6efcc2 Fix: Update doc and packager for doliwamp 2013-12-31 15:04:59 +01:00
Laurent Destailleur
436f585b69 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-29 00:48:31 +01:00
Laurent Destailleur
3e39cd279d Fix: avoid to include not desired directory 2013-12-29 00:42:53 +01:00
Laurent Destailleur
b8141ef2db Prepare 3.6 dev 2013-11-22 19:32:36 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
84b36d1230 Prepare for 3.4.2 2013-11-01 17:24:09 +01:00
Laurent Destailleur
b1add3f9df Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	htdocs/comm/propal/class/propal.class.php
	htdocs/contrat/class/contrat.class.php
 2013-09-13 09:32:41 +02:00
Laurent Destailleur
54976951a1 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-13 09:24:09 +02:00
Laurent Destailleur
86e827e3f7 Fix: Missing sources 
Fix: packager
 2013-09-12 23:47:36 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
Laurent Destailleur
82e8ac72a8 Fix: Bad url 2013-07-24 22:32:20 +02:00
Laurent Destailleur
58c3938fb0 Add link to cloud solutions 2013-07-24 17:31:03 +02:00
Laurent Destailleur
8f71e5fda2 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-07-07 23:25:03 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Raphaël Doursenaud
b9ff5188b3 Normalized EOL 2013-07-01 12:00:42 +02:00
Laurent Destailleur
11193dd9b8 Updates for cpp files 2013-06-30 22:00:04 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Cédric Salvador
b747b0349d merge 2013-06-06 18:31:33 +02:00
Laurent Destailleur
9e847884d1 Prepare dev branch 2013-05-03 18:41:14 +02:00
Laurent Destailleur
97de97de9d Prepare branch 3.4 2013-05-03 10:17:46 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
9134dfc896 Prepare 3.4 2013-01-17 10:25:40 +01:00
Laurent Destailleur
1d95c68a74 Update 2013 2013-01-13 14:38:05 +01:00
Laurent Destailleur
a415a988a3 Fix: Packaging of doliwamp 2013-01-09 15:19:00 +01:00
Laurent Destailleur
4099b98540 Prepare 3.3 release 2013-01-09 14:55:24 +01:00
Laurent Destailleur
19d5458ded Prepare freeze of 3.3 2012-12-18 14:21:56 +01:00
Laurent Destailleur
7e5f94d908 Update packagers 2012-10-18 23:33:22 +02:00
Laurent Destailleur
68ecc5eb89 Upgrade doliwamp 2012-10-08 02:38:30 +02:00
Laurent Destailleur
8613dcd26e Add specific README.md for DoliWamp directory of sourceforge. 2012-09-01 19:15:08 +02:00
Laurent Destailleur
22b0261bc7 Update DoliWamp packager 2012-08-05 01:06:37 +02:00
Laurent Destailleur
82744c0020 Update packager 2012-08-04 01:10:12 +02:00
Laurent Destailleur
c68476d93e Prepare 3.2 release 2012-07-07 20:21:58 +02:00
Laurent Destailleur
42c25a4c0c Update doc 2012-06-17 22:28:52 +02:00
Laurent Destailleur
956215fc0a Fix: Script to build package for doliwamp is now ok. 2012-04-18 17:19:53 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
cbe2e3c15c Preapre 3.2.0 2012-04-04 17:54:11 +02:00
Laurent Destailleur
0011b1dadd New: Trigger now have a priority to define sort execution order. 2012-01-31 20:32:26 +01:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Laurent Destailleur
eeba115584 Work on doliwamp package 2011-10-13 01:55:56 +02:00