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

298 Commits

Author SHA1 Message Date
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
1838d45197 Update doc 2013-11-06 23:58:36 +01:00
Laurent Destailleur
469dd03673 Merge remote-tracking branch 'origin/3.4' into develop 
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/core/class/commonobject.class.php
	htdocs/core/tpl/objectline_view.tpl.php
	htdocs/filefunc.inc.php
	htdocs/langs/nl_NL/margins.lang
 2013-11-01 17:58:38 +01:00
Laurent Destailleur
e8a80e2365 Now comments in changelog are concatenated 2013-11-01 17:46:57 +01:00
Laurent Destailleur
84b36d1230 Prepare for 3.4.2 2013-11-01 17:24:09 +01:00
Laurent Destailleur
10cd9619f9 Update doc 2013-10-30 19:09:02 +01:00
Laurent Destailleur
f71b47b282 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2013-10-29 23:46:15 +01:00
Laurent Destailleur
277fc1a274 Update doc 2013-10-29 23:38:39 +01:00
Laurent Destailleur
43fd4d0784 Complete debian packager tuto 2013-10-09 16:04:06 +02:00
Laurent Destailleur
44d2fbcb1a A better tag command 2013-09-22 19:41:14 +02:00
Laurent Destailleur
0315cfdac6 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/get-orig-source.sh
 2013-09-20 11:51:01 +02:00
Laurent Destailleur
7a1efdbab6 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-20 11:06:09 +02:00
Laurent Destailleur
bd0e328d5b Use official package directly to build debian. 2013-09-19 23:51:47 +02:00
Laurent Destailleur
9ee9079d78 update doc 2013-09-19 23:05:48 +02:00
Laurent Destailleur
3d62303d59 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	build/debian/get-orig-source.sh
	build/debian/watch
	htdocs/fourn/ajax/getSupplierPrices.php
 2013-09-19 01:02:53 +02:00
Laurent Destailleur
a86e8f8fac Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-19 01:00:05 +02:00
Laurent Destailleur
848c693822 Fix: Error in url 2013-09-19 00:59:02 +02:00
Laurent Destailleur
847b0234c7 Change for debian 2013-09-19 00:49:51 +02:00
Laurent Destailleur
30c4d5dedb Fix for debian package 2013-09-19 00:39:13 +02:00
Laurent Destailleur
e0ec92c843 Merge remote-tracking branch 'origin/3.4' into develop 2013-09-14 20:54:33 +02:00
Laurent Destailleur
d7f9e91955 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-14 20:53:39 +02:00
Laurent Destailleur
9adbb0e973 Fix: update copyright file 2013-09-14 20:51:21 +02:00
Laurent Destailleur
443eba900a Fix: Bad translation 2013-09-14 12:52:04 +02:00
Laurent Destailleur
5344aadc2e Fix: Bad translation 2013-09-14 12:51:01 +02:00
Laurent Destailleur
181f16543d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	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/filefunc.inc.php
 2013-09-06 01:42:40 +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
a9c14c80f0 Fix: debian files 2013-09-06 01:27:11 +02:00
Laurent Destailleur
c40f3df269 Update doc 2013-09-06 01:26:31 +02:00
Laurent Destailleur
38e4b0f9ac Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	build/debian/watch
 2013-09-05 23:57:30 +02:00
Laurent Destailleur
10779baadd Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 23:55:14 +02:00
Laurent Destailleur
c71c4e86f6 Fix: watch file for debian package. 2013-09-05 23:52:13 +02:00
Laurent Destailleur
556827c818 Fix: wash file 2013-09-05 22:58:11 +02:00
Laurent Destailleur
b1e8b9c02f Merge remote-tracking branch 'origin/3.3' into 3.4 2013-09-05 17:56:23 +02:00
Laurent Destailleur
7afb1aef14 Fix: Image was not correctly generated. Bad licence into it. 2013-09-05 17:53:07 +02:00
Laurent Destailleur
7229b728a3 Update doc 2013-09-04 23:02:02 +02:00
Laurent Destailleur
4298e5466a Removed nmu 2013-08-07 16:57:00 +02:00
Laurent Destailleur
386958c4d6 Update with last changes 2013-08-06 22:56:13 +02:00
Laurent Destailleur
521da839ba Update doc 2013-08-06 16:21:37 +02:00
Laurent Destailleur
80e04e967c Start to uniformize default debian package with current official 
package on work.
 2013-08-06 03:10:51 +02:00
Laurent Destailleur
827faed39b Update doc 2013-08-05 23:27:51 +02:00
Laurent Destailleur
6a998b202d Update doc 2013-07-31 15:21:48 +02:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
Laurent Destailleur
09fd904e76 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/ecm/index.php
 2013-07-19 14:01:47 +02:00
Laurent Destailleur
442c2cab8f Update doc 2013-07-19 13:42:19 +02:00
Laurent Destailleur
306f6dd839 Updrage to tcpdf 6.0.021 2013-07-19 00:14:30 +02:00
Laurent Destailleur
f6f14a6227 Update readme to explain how to update tcpdf debian package. 2013-07-17 21:45:05 +02:00
Laurent Destailleur
cc124e03c1 Fix: Missing comma 2013-07-14 03:38:07 +02:00
Laurent Destailleur
2c0a01fc8c Merge remote-tracking branch 'origin/3.4' into develop 2013-07-11 17:57:06 +02:00
Laurent Destailleur
5385d87995 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/langs/ca_ES/admin.lang
	htdocs/langs/ca_ES/errors.lang
	htdocs/langs/ca_ES/main.lang
	htdocs/langs/ca_ES/opensurvey.lang
	htdocs/langs/ca_ES/paybox.lang
	htdocs/langs/ca_ES/products.lang
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/errors.lang
	htdocs/langs/es_ES/main.lang
	htdocs/langs/es_ES/products.lang
 2013-07-05 21:56:54 +02:00
Laurent Destailleur
99210a1501 Merge branch '3.4' of git@github.com:Dolibarr/dolibarr.git into 3.4 
Conflicts:
	build/debian/control
 2013-07-03 16:29:05 +02:00
Laurent Destailleur
c1abd26a60 Fix: Package name for wheezy 2013-07-03 16:12:17 +02:00
Laurent Destailleur
b52dd70229 Fix: Missing dependency 2013-07-02 14:21:05 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
3cba6e71cc Fix: bad name file 2013-05-29 11:42:24 +02:00
Laurent Destailleur
02facd0a7e Update doc 2013-05-23 22:37:07 +02:00
Laurent Destailleur
9e847884d1 Prepare dev branch 2013-05-03 18:41:14 +02:00
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