Commit Graph

42 Commits

Author SHA1 Message Date
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
2013-04-23 14:04:56 +02:00
Laurent Destailleur
624a039eaf Update debian doc 2013-04-23 12:58:58 +02:00
Laurent Destailleur
8f502b8cfc Prepare 3.3.2 2013-04-23 12:39:55 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
c8bc0a1ec9 New: Prepare to code to support jmobile. 2013-04-01 23:38:39 +02:00
Laurent Destailleur
e51c72f1e8 Merge 2013-03-04 00:10:09 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
5075e9c716 Update to 3.4 2013-03-01 09:55:04 +01:00
Laurent Destailleur
9106a74426 Fix: Package for launchpad 2013-03-01 09:48:03 +01:00
Laurent Destailleur
c222f39c76 Prepare 3.4 2013-01-17 10:22:26 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Laurent Destailleur
e4855e153b Fix: Comment 2012-12-20 11:38:26 +01:00
Laurent Destailleur
bee97a6b3b Restore another lost commit.
Fix: Restore compatibility with FPDF.

Conflicts:
	htdocs/core/lib/pdf.lib.php
2012-12-05 00:47:20 +01:00
Laurent Destailleur
09bb10b2a6 Restore lost commit 2012-12-01 15:50:39 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50
commits !
2012-12-01 15:45:05 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg.
Fix: Debian package
2012-10-07 20:04:07 +02:00
Laurent Destailleur
18da651975 Update logo 2012-10-07 15:21:52 +02:00
Laurent Destailleur
4a9db063c2 Fi: Uninstall not complete 2012-10-01 20:58:39 +02:00
Laurent Destailleur
2020d6ae00 Fix: debian rules must use tabs 2012-08-04 00:30:30 +02:00
Laurent Destailleur
71f3ff8e33 To match debian rules 2012-07-29 13:30:13 +02:00
Laurent Destailleur
5e2f846894 Missing fpdfi 2012-06-13 20:21:43 +02:00
Laurent Destailleur
a5702e150c Enable jflot lib 2012-06-12 00:55:09 +02:00
Laurent Destailleur
ebc9cc2ad7 Fix: Some bug into rpm and debian packaging. 2012-04-14 15:41:34 +02:00
Laurent Destailleur
74d5f5e295 Fix: Work on debian 6 2012-04-14 02:49:48 +02:00
Laurent Destailleur
e55d7d92cc Fix: plugin not into debian 2012-04-14 01:23:51 +02:00
Laurent Destailleur
716f9d8786 Fix: Avoid error when removing not correctly installed package 2012-04-13 20:16:48 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
9f9c2ef5ca Better test 2012-03-27 09:40:08 +02:00
Laurent Destailleur
260aa99904 Echo message 2012-03-23 09:47:53 +01:00
Laurent Destailleur
39332c56b7 Update doc 2012-03-19 11:51:34 +01:00
Laurent Destailleur
2e01888ce8 Work on debian package 2012-03-18 23:23:17 +01:00
Laurent Destailleur
9a3971d77f Update doc 2012-02-21 01:37:03 +01:00
Laurent Destailleur
17512cfc48 Work on deb/rpm package 2012-02-18 15:21:59 +01:00
Laurent Destailleur
61175c2543 Work on debian/rpm package 2012-02-18 14:55:41 +01:00
Laurent Destailleur
7b175e3b52 Work on rpm packages 2012-02-18 13:05:20 +01:00
Laurent Destailleur
7afcee03b9 Work on debian package 2012-02-18 03:29:43 +01:00
Laurent Destailleur
761def3cc0 Work on debian package 2012-01-30 23:57:55 +01:00
Laurent Destailleur
e5d564b40f Work on debian package 2012-01-30 00:42:47 +01:00
Laurent Destailleur
63c3cb2d48 Work on debian package 2012-01-29 20:57:40 +01:00
Laurent Destailleur
429ba54e3e Work on debian package 2012-01-28 16:04:48 +01:00