Laurent Destailleur
|
50df4e1ff1
|
Fix: Update doc and packager for doliwamp
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
|
2013-12-31 15:23:16 +01:00 |
|
Laurent Destailleur
|
13eff7d629
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 15:19:39 +01:00 |
|
Laurent Destailleur
|
6d40c10b95
|
Prepare 3.5.0 release
|
2013-12-31 15:18:11 +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
|
f0eb9b8a15
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 15:06:25 +01:00 |
|
Laurent Destailleur
|
70ac6efcc2
|
Fix: Update doc and packager for doliwamp
|
2013-12-31 15:04:59 +01:00 |
|
Laurent Destailleur
|
3ace6da1d5
|
More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
|
2013-12-31 14:24:01 +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
|
0e62d79ce2
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-12-26 19:43:31 +01:00 |
|
Laurent Destailleur
|
94a217bdc1
|
Merge remote-tracking branch 'origin/3.4' into 3.5
|
2013-12-26 19:41:59 +01:00 |
|
Laurent Destailleur
|
a7d0a7d663
|
Merge remote-tracking branch 'origin/3.3' into 3.4
|
2013-12-26 19:40:56 +01:00 |
|
Laurent Destailleur
|
fce34301f9
|
More test to avoid errors when env is not complete.
|
2013-12-26 19:39:29 +01:00 |
|
Laurent Destailleur
|
c34e50114a
|
Start to work on a basic print sticker tool
|
2013-12-15 03:23:10 +01:00 |
|
Laurent Destailleur
|
eaf151d7f5
|
Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
htdocs/.gitignore
htdocs/contact/fiche.php
|
2013-12-14 03:13:46 +01:00 |
|
Laurent Destailleur
|
684be44846
|
Merge remote-tracking branch 'origin/3.4' into 3.5
|
2013-12-14 02:57:43 +01:00 |
|
Laurent Destailleur
|
4d84fc46a4
|
Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
build/makepack-dolibarr.pl
|
2013-12-14 02:56:23 +01:00 |
|
Laurent Destailleur
|
1f3f6cc7b8
|
Fix: Avoid to have external package into standard distribution
|
2013-12-14 02:55:12 +01:00 |
|
Laurent Destailleur
|
88aa0ad4da
|
Fix: Doxygen problems
|
2013-12-14 01:28:59 +01:00 |
|
Laurent Destailleur
|
92d23b2735
|
Packaging rules
|
2013-12-12 15:37:54 +01:00 |
|
Laurent Destailleur
|
b96c977fa1
|
Fix: W3C
|
2013-12-05 00:45:44 +01:00 |
|
Laurent Destailleur
|
f86cf6c440
|
Check parameters of script
|
2013-12-01 15:22:47 +01:00 |
|
Laurent Destailleur
|
71a85464d5
|
Check parameters of script
|
2013-12-01 15:22:29 +01:00 |
|
Laurent Destailleur
|
a7c246cec1
|
Check parameters of script
|
2013-12-01 15:21:58 +01:00 |
|
Laurent Destailleur
|
8e51a4683f
|
Check parameters of script
|
2013-12-01 15:20:57 +01:00 |
|
Laurent Destailleur
|
e0dd3090c9
|
Remove hardcoded strings
|
2013-11-30 10:58:43 +01:00 |
|
Laurent Destailleur
|
5715e9c986
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-28 17:06:11 +01:00 |
|
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
|
89f32bf46e
|
Update doc
|
2013-11-27 18:45:04 +01:00 |
|
Laurent Destailleur
|
8981f506dc
|
Fix: typo
|
2013-11-27 13:28:06 +01:00 |
|
Laurent Destailleur
|
01f3ba81af
|
Update doc
|
2013-11-25 21:19:57 +01:00 |
|
Laurent Destailleur
|
1ddf9f6ac5
|
Fix: Not coherent filename
|
2013-11-24 19:34:25 +01:00 |
|
Laurent Destailleur
|
baebc7e91d
|
Fix: Not coherent filename
|
2013-11-24 19:33:22 +01:00 |
|
Laurent Destailleur
|
73408479ba
|
Merge remote-tracking branch 'origin/3.5' into develop
|
2013-11-24 13:19:41 +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
|
b8141ef2db
|
Prepare 3.6 dev
|
2013-11-22 19:32:36 +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 |
|