Laurent Destailleur
|
fe3f701928
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
htdocs/expedition/list.php
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/user/class/user.class.php
|
2015-05-16 17:09:42 +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
|
e46a8b3b54
|
Enhance packaging
|
2015-05-16 16:41:55 +02:00 |
|
Laurent Destailleur
|
e8fb89f89f
|
Prepare packaging 3.7
|
2015-05-16 16:38:47 +02:00 |
|
Laurent Destailleur
|
4dcdea5219
|
Prepare package 3.5.7
Removed hardcoded version from rpm spec files, so it will not be
necessary to update this files when making a new release.
|
2015-05-16 16:08:05 +02:00 |
|
Laurent Destailleur
|
80943111cc
|
Prepare 3.5.7
|
2015-05-16 15:26:34 +02:00 |
|
Laurent Destailleur
|
92a25e3d4c
|
Prepare 3.7.1
|
2015-05-12 00:11:51 +02:00 |
|
Laurent Destailleur
|
83e4fe5d95
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/makepack-dolibarr.pl
htdocs/fourn/facture/list.php
|
2015-05-12 00:09:03 +02:00 |
|
Laurent Destailleur
|
c2b31a37ba
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/contrat/fiche.php
htdocs/core/modules/expedition/modules_expedition.php
htdocs/expedition/class/expedition.class.php
htdocs/expedition/fiche.php
htdocs/user/fiche.php
|
2015-05-11 23:53:38 +02:00 |
|
Laurent Destailleur
|
896d95cf1c
|
Add doc to build when ony changelog change
|
2015-05-05 10:23:47 +02:00 |
|
Laurent Destailleur
|
7419319c0f
|
Protection into packager
|
2015-04-29 22:39:42 +02:00 |
|
Laurent Destailleur
|
53bf90a3e2
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
ChangeLog
|
2015-04-28 21:54:13 +02:00 |
|
Laurent Destailleur
|
60a56da370
|
Some change into css. Tabs background are now white so main content is
black on white (better contrast).
Fix editfieldval for date.
|
2015-04-25 22:20:10 +02:00 |
|
Laurent Destailleur
|
100fa1067e
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/compta/bank/virement.php
htdocs/compta/facture/impayees.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/core/modules/modProjet.class.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/langs/en_GB/admin.lang
htdocs/langs/es_AR/orders.lang
htdocs/langs/es_AR/trips.lang
htdocs/langs/es_CO/admin.lang
htdocs/langs/es_CO/orders.lang
htdocs/langs/es_CO/trips.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/main.lang
htdocs/langs/pl_PL/interventions.lang
htdocs/langs/pt_BR/trips.lang
htdocs/langs/ro_RO/productbatch.lang
htdocs/langs/ro_RO/trips.lang
htdocs/main.inc.php
htdocs/projet/element.php
|
2015-04-22 17:57:57 +02:00 |
|
Laurent Destailleur
|
3d609d5fd0
|
Sync transifex
|
2015-04-22 14:58:06 +02:00 |
|
Laurent Destailleur
|
ae103e34b8
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
build/debian/changelog
htdocs/compta/facture.php
htdocs/core/lib/price.lib.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
htdocs/opensurvey/public/studs.php
htdocs/projet/element.php
|
2015-04-13 13:08:46 +02:00 |
|
Laurent Destailleur
|
1272b03e5e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/debian/changelog
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/core/menus/standard/eldy.lib.php
htdocs/fourn/facture/fiche.php
htdocs/product/stock/mouvement.php
htdocs/projet/element.php
htdocs/societe/rib.php
htdocs/theme/bureau2crea/img/statut4.png
|
2015-04-12 12:03:59 +02:00 |
|
Laurent Destailleur
|
8e9c1c4747
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/commande/card.php
htdocs/commande/class/commande.class.php
htdocs/commande/list.php
htdocs/core/class/notify.class.php
htdocs/core/login/functions_dolibarr.php
htdocs/exports/export.php
htdocs/langs/en_US/admin.lang
|
2015-04-01 16:33:39 +02:00 |
|
Laurent Destailleur
|
b5690142aa
|
Prepare 3.6.3
|
2015-03-29 16:26:31 +02:00 |
|
Laurent Destailleur
|
3cc4358e72
|
Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
build/makepack-dolibarr.pl
htdocs/commande/liste.php
htdocs/product/stock/product.php
|
2015-03-29 15:24:17 +02:00 |
|
Laurent Destailleur
|
ffe1ee0d84
|
Target 98 to publish of dolibarr sevrer is now working
|
2015-03-28 17:12:31 +01:00 |
|
Laurent Destailleur
|
5e33068e29
|
Update doc
|
2015-03-28 16:51:25 +01:00 |
|
aspangaro
|
2b2b43afb6
|
Dir "Don"
|
2015-03-25 22:37:14 +01:00 |
|
aspangaro
|
f778f47049
|
Add dirs
|
2015-03-25 21:46:08 +01:00 |
|
Laurent Destailleur
|
b884b28991
|
Include module loan
|
2015-03-23 23:39:14 +01:00 |
|
Laurent Destailleur
|
560b4541cd
|
Update packager.
|
2015-03-05 22:08:16 +01:00 |
|
Laurent Destailleur
|
3e853b4129
|
Bad comment char
|
2015-02-24 16:17:52 +01:00 |
|
Laurent Destailleur
|
cae82104ca
|
Clean tool to generate checksum file
|
2015-02-24 12:44:12 +01:00 |
|
frederic34
|
ad3e91dc9f
|
WIP
|
2015-02-21 14:06:33 +01:00 |
|
Laurent Destailleur
|
e5b401c8f2
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/langs/es_ES/agenda.lang
htdocs/langs/fr_FR/admin.lang
htdocs/langs/fr_FR/bills.lang
htdocs/langs/fr_FR/errors.lang
htdocs/langs/fr_FR/projects.lang
htdocs/langs/fr_FR/stocks.lang
htdocs/langs/fr_FR/suppliers.lang
|
2015-02-15 19:51:49 +01:00 |
|
Laurent Destailleur
|
11ae661303
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2015-02-14 14:01:18 +01:00 |
|
Laurent Destailleur
|
6189db677d
|
Fix package .exe
|
2015-02-14 11:25:26 +01:00 |
|
Laurent Destailleur
|
6adfc6f6f4
|
Work on batch module. Add batch, eatby and sellby into movement table.
Clean language files for direct print module.
|
2015-02-12 15:23:31 +01:00 |
|
Laurent Destailleur
|
4fdc287717
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/accountancy/customer/card.php
htdocs/accountancy/journal/sellsjournal.php
htdocs/admin/menus.php
htdocs/fourn/commande/card.php
htdocs/install/check.php
|
2015-01-30 15:53:06 +01:00 |
|
Laurent Destailleur
|
16fa19be87
|
Doc to send unblock requests
|
2015-01-28 23:06:05 +01:00 |
|
aspangaro
|
467a274f76
|
Typo
|
2015-01-22 21:12:20 +01:00 |
|
Laurent Destailleur
|
e220ce5a82
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/comm/card.php
htdocs/comm/propal.php
htdocs/commande/card.php
htdocs/compta/facture.php
htdocs/compta/prelevement/class/bonprelevement.class.php
htdocs/core/class/html.formcompany.class.php
htdocs/custom/.gitignore
htdocs/expedition/card.php
htdocs/fourn/card.php
htdocs/product/fournisseurs.php
|
2015-01-18 18:44:22 +01:00 |
|
Laurent Destailleur
|
839f73d568
|
Update doc
|
2015-01-18 14:57:25 +01:00 |
|
Laurent Destailleur
|
033e77c04a
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/product/stock/product.php
|
2015-01-13 15:41:45 +01:00 |
|
Laurent Destailleur
|
6414f415a8
|
Files compatible with apache 2.4
|
2015-01-11 15:30:34 +01:00 |
|
Laurent Destailleur
|
c7b311349e
|
Files compatible with apache 2.4
|
2015-01-11 15:16:55 +01:00 |
|
Laurent Destailleur
|
9662879e52
|
Fixed: Permissions
|
2015-01-11 15:15:51 +01:00 |
|
Laurent Destailleur
|
8abbac564b
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
htdocs/filefunc.inc.php
htdocs/main.inc.php
|
2014-12-30 04:28:09 +01:00 |
|
Laurent Destailleur
|
3848daeab8
|
Merge remote-tracking branch 'origin/3.6' into 3.7
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
htdocs/product/stats/facture.php
|
2014-12-30 04:20:50 +01:00 |
|
Laurent Destailleur
|
953e736a97
|
Prepare version 3.6.2
|
2014-12-27 02:21:37 +01:00 |
|
Laurent Destailleur
|
71683d20cf
|
Update doc
|
2014-12-06 14:05:51 +01:00 |
|
Laurent Destailleur
|
72c3954f36
|
Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
.travis.yml
|
2014-12-05 21:12:35 +01:00 |
|
Laurent Destailleur
|
f261e1736c
|
Update doc
|
2014-12-05 21:10:38 +01:00 |
|