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

1126 Commits

Author SHA1 Message Date
Laurent Destailleur
bdf8100d84 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	htdocs/core/lib/agenda.lib.php
	htdocs/product/stats/commande_fournisseur.php
 2013-11-28 15:54:12 +01:00
Laurent Destailleur
baebc7e91d Fix: Not coherent filename 2013-11-24 19:33:22 +01:00
Laurent Destailleur
b75137d4ff Fix files that should not mix tab and spaces indent. 2013-11-24 13:02:20 +01:00
Laurent Destailleur
03006db5a7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-11-20 23:10:59 +01:00
Laurent Destailleur
1ef08a88a4 Update packager 2013-11-20 23:10:38 +01:00
Laurent Destailleur
a26e337550 Update doc 2013-11-20 23:05:27 +01:00
Laurent Destailleur
040e3eec78 Update doc 2013-11-20 15:10:54 +01:00
Laurent Destailleur
0e743d5024 Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	ChangeLog
	htdocs/adherents/admin/adherent.php
	htdocs/comm/propal/class/propal.class.php
	htdocs/commande/document.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/compta/facture/list.php
	htdocs/cron/card.php
	htdocs/expedition/class/expedition.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/fourn/commande/document.php
	htdocs/langs/fr_FR/admin.lang
	htdocs/langs/fr_FR/cron.lang
	htdocs/langs/fr_FR/projects.lang
	htdocs/langs/nl_NL/admin.lang
	htdocs/langs/nl_NL/categories.lang
	htdocs/langs/nl_NL/commercial.lang
	htdocs/langs/nl_NL/companies.lang
	htdocs/langs/nl_NL/dict.lang
	htdocs/langs/nl_NL/main.lang
	htdocs/langs/nl_NL/margins.lang
	htdocs/langs/nl_NL/products.lang
	htdocs/societe/class/societe.class.php
	htdocs/societe/rib.php
 2013-11-19 21:08:02 +01:00
Laurent Destailleur
0f4ceca8ec Fix: tons of bugs into ecm module 2013-11-17 02:59:01 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +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
8045f6091f Merge remote-tracking branch 'origin/3.4' into develop 2013-10-29 23:55:20 +01:00
Laurent Destailleur
d6b2d44350 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-10-29 23:51:46 +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
5fbb967941 Fix: restart of mysql for opensuse 2013-10-29 22:57:51 +01:00
Laurent Destailleur
0a11bf1769 Update doc 2013-10-29 15:14:36 +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
78210d951d Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-09-20 21:57:56 +02:00
Laurent Destailleur
bb2404c16d Remove duplicate file for distributions to avoid warnings 2013-09-20 21:57:33 +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
2a1dae78ca Fix: We must not remove sources from packages 2013-09-19 19:49:41 +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
Cédric Salvador
d9a26d0aa9 natural search in list pages 2013-09-16 14:17:53 +02:00
Laurent Destailleur
c98c8d5007 Fix: url 2013-09-15 22:48:42 +02:00
Laurent Destailleur
85da57ce1b Add some files for sitemap build 2013-09-15 22:39:39 +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
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
239cb02613 Doc 2013-09-11 23:10:19 +02:00
Laurent Destailleur
376a7e2e3c Remove checkstyle outpout that is too verbose. 
USe instead option -s
Disable a rule
 2013-09-10 11:59:15 +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
17fcceb872 Fix: typo 2013-09-06 01:38:13 +02:00