Laurent Destailleur
0542e43b71
Prepare 3.8
2015-07-13 00:23:46 +02:00
Laurent Destailleur
6fb53ecb97
Update doc
2015-06-28 23:33:03 +02:00
Laurent Destailleur
f8085c8ae6
Update doc
2015-06-28 12:34:21 +02:00
Laurent Destailleur
4f75ab79db
Prepare 3.7.2
2015-06-01 16:32:33 +02:00
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
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
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
896d95cf1c
Add doc to build when ony changelog change
2015-05-05 10:23:47 +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
b5690142aa
Prepare 3.6.3
2015-03-29 16:26:31 +02:00
Laurent Destailleur
560b4541cd
Update packager.
2015-03-05 22:08:16 +01:00
Laurent Destailleur
16fa19be87
Doc to send unblock requests
2015-01-28 23:06:05 +01:00
Laurent Destailleur
e379b2f802
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/product/stock/product.php
2015-01-13 15:34:08 +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
344aa40858
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
.travis.yml
dev/codesniffer/ruleset.xml
htdocs/core/class/conf.class.php
htdocs/langs/en_US/productbatch.lang
2014-12-05 20:21:40 +01:00
Laurent Destailleur
17c6f84061
Update doc
2014-12-05 19:18:53 +01:00
Laurent Destailleur
ed5b89f7f1
Update doc
2014-12-05 17:55:18 +01:00
Laurent Destailleur
8d405a147f
Merge remote-tracking branch 'origin/3.6' into 3.7
...
Conflicts:
build/debian/changelog
htdocs/core/tpl/objectline_create.tpl.php
2014-12-04 15:29:45 +01:00
Laurent Destailleur
a07852c699
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2014-12-04 15:22:08 +01:00
Laurent Destailleur
9e1b0d1abc
Prepare 3.5.6
2014-12-04 15:09:47 +01:00
Laurent Destailleur
7868d286d3
Update debian tuto
2014-12-02 14:42:21 +01:00
Laurent Destailleur
2f5c7e5f9d
Prepare version 3.7 beta
2014-10-30 19:28:22 +01:00
Laurent Destailleur
8821fbac76
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/product/fiche.php
htdocs/user/class/user.class.php
2014-10-30 11:19:29 +01:00
Laurent Destailleur
41f0920656
Fix for debian
2014-10-24 23:50:10 +02:00
Laurent Destailleur
14ab409ca9
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
2014-09-28 02:14:32 +02:00
Laurent Destailleur
b8969edcc5
Prepare 3.6.1
2014-09-27 12:34:45 +02:00
Laurent Destailleur
2a9275d0de
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/societe/consumption.php
2014-09-19 11:09:51 +02:00
Laurent Destailleur
d288b19f4d
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-09-19 11:07:15 +02:00
Laurent Destailleur
3a38153889
Typo error
2014-09-18 22:42:43 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Laurent Destailleur
76ba3301c3
Fix: Syntax for license key
2014-09-14 22:34:17 +02:00
Laurent Destailleur
20bec865fd
Fix: checkstyle
2014-09-14 00:27:36 +02:00
Laurent Destailleur
ba70c1a08a
Fix: typo on debian files
2014-09-13 20:47:34 +02:00
Laurent Destailleur
2c46613f4a
New: View per user into agenda.
2014-09-07 19:56:17 +02:00
Laurent Destailleur
9d2d165cfc
Fix: debian key dfsg and not dsfg
2014-09-07 11:21:04 +02:00
Laurent Destailleur
f64cb085a7
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/fourn/class/fournisseur.commande.class.php
2014-08-30 18:27:34 +02:00
Laurent Destailleur
711e7e6fc6
Fix: phpunit test
...
Fix: debian readme to upgrade tcpdf lib.
2014-08-28 16:59:10 +02:00
Laurent Destailleur
4d506d29d9
Removed log output (log too long)
2014-08-28 16:14:35 +02:00
Laurent Destailleur
1e28fd3541
Fix: syntax error
2014-08-26 15:24:32 +02:00
Laurent Destailleur
7d3c266a1d
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
htdocs/admin/agenda_other.php
htdocs/core/triggers/interface_50_modAgenda_ActionsAuto.class.php
htdocs/install/mysql/migration/repair.sql
2014-08-04 00:02:00 +02:00
Laurent Destailleur
a5a7fb4967
Merge remote-tracking branch 'origin/3.5' into 3.6
2014-08-01 11:15:45 +02:00
Laurent Destailleur
cf72c05a99
Fix: debian package provided by dolibarr team use embedded libraries.
2014-08-01 02:11:37 +02:00
Laurent Destailleur
c895c892a5
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/filefunc.inc.php
2014-07-29 01:17:00 +02:00
Laurent Destailleur
db091896a5
Prepare 3.6.
...
Use google adsense tag of foundation for doxygen doc pages.
Version is no more encoded int odoxygen.
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
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/compta/facture/impayees.php
htdocs/filefunc.inc.php
2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d
Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne
...
s'appliquent pas
2014-07-26 17:30:10 +02:00
Laurent Destailleur
289a2c6312
Maj readme
2014-07-26 13:23:22 +02:00
Laurent Destailleur
5fd6bb94b9
Version beta
2014-06-20 20:31:57 +02:00
Laurent Destailleur
47c982c506
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
htdocs/filefunc.inc.php
2014-06-10 08:45:08 +02:00
Laurent Destailleur
5853b9eb30
Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into
...
marcosgdf-bug-1416
Conflicts:
ChangeLog
2014-06-10 01:37:43 +02:00
Laurent Destailleur
c1431bdf93
Fix: Typo
2014-05-31 14:22:19 +02:00
Laurent Destailleur
cbd080f6cb
Fix: Typo
2014-05-31 14:02:36 +02:00
Laurent Destailleur
6137d7ed45
Update doc
2014-05-25 11:15:26 +02:00
Laurent Destailleur
936adfd0f5
Typo
2014-05-25 03:08:02 +02:00
Laurent Destailleur
3a29d7dac1
Update doc
2014-05-12 19:35:46 +02:00
Laurent Destailleur
801d99b947
Update doc
2014-05-10 02:10:13 +02:00
Laurent Destailleur
9f795331f5
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
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/compta/paiement_charge.php
htdocs/compta/sociales/charges.php
htdocs/core/db/mysql.class.php
htdocs/filefunc.inc.php
htdocs/societe/class/societe.class.php
2014-05-06 23:58:17 +02:00
Laurent Destailleur
1c6c79811d
Prepare version 3.5.3
2014-05-06 16:09:13 +02:00
Laurent Destailleur
50c10d3d1e
Fix: Can disable features with PHPEXCEL (no DLSF compatible).
...
Fix: Can disable features with CKEDITOR.
2014-05-03 02:20:26 +02:00
Laurent Destailleur
bb2c829997
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
2014-04-18 12:34:32 +02:00
Laurent Destailleur
80f1100bf9
Fix: Removed warning
2014-04-12 01:32:46 +02:00
Laurent Destailleur
1b02cdd352
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
dev/initdata/mysqldump_dolibarr_3.5.0.sql
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/product/index.php
htdocs/user/fiche.php
2014-04-12 00:53:25 +02:00
Laurent Destailleur
89dca04720
Update doc
2014-04-08 23:06:58 +02:00
Laurent Destailleur
eb0d98d406
Comment
2014-04-07 20:41:33 +02:00
Laurent Destailleur
f9c1b590d0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/changelog
build/doxygen/dolibarr-doxygen.doxyfile
build/exe/doliwamp/doliwamp.iss
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/compta/facture.php
htdocs/core/modules/import/import_csv.modules.php
htdocs/filefunc.inc.php
2014-03-19 22:29:18 +01:00
Laurent Destailleur
2bc63a86a9
Alignement of debian packaging files
2014-03-19 18:05:52 +01:00
Raphaël Doursenaud
0d511f9659
Readme: default to markdown version
2014-03-16 15:01:06 +01:00
Laurent Destailleur
c8f63d6160
Fix: Prepare for 3.5.2
2014-03-14 00:17:39 +01:00
Laurent Destailleur
fad9ba6130
Merge remote-tracking branch 'origin/3.5' into develop
2014-03-09 02:49:39 +01:00
Laurent Destailleur
b2116c37d8
Enhance packager:
...
- No need to be root to run script
- create git tag of version
- debian package do not use the deprecated dpatch command
- debian package is a quilt package (not native)
- debian package was missing file watch
- clean exclusion for zip and tgz package (exclusion must be done into
makepack-dolibarr.pl, not into specific package code)
- can publish files to sourceforge
2014-03-09 01:37:08 +01:00
Laurent Destailleur
ce8d13ead0
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
ChangeLog
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/comm/action/fiche.php
htdocs/filefunc.inc.php
htdocs/install/check.php
2014-02-10 00:38:10 +01:00
Laurent Destailleur
6a84a7f935
Prepare version 3.5.1
2014-02-08 13:56:28 +01:00
Laurent Destailleur
efcff80a28
Merge remote-tracking branch 'origin/3.5' into develop
...
Conflicts:
build/debian/control
htdocs/fourn/facture/paiement.php
2014-02-03 18:44:48 +01:00
Laurent Destailleur
70c262a99f
Avoid duplicate a2en.
...
No pass into log.
2014-02-02 19:19:41 +01:00
Laurent Destailleur
ad0e78a56a
Fix: debian and ubuntu package
2014-02-02 16:29:56 +01:00
Laurent Destailleur
8768ece9f7
Fix for ubuntu compatibility
2014-02-02 15:46:22 +01:00
Laurent Destailleur
4c60873d06
Fix: not dependencies by default to be compatible with all distrib.
2014-02-02 14:57:55 +01:00
Laurent Destailleur
18f8c80b98
Fix: lintian warning in date
2014-02-02 13:59:38 +01:00
Laurent Destailleur
923ff008c2
Update doc
2014-01-07 19:16:44 +01:00
Laurent Destailleur
ddde3339f8
Merge remote-tracking branch 'origin/3.5' 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/filefunc.inc.php
2013-12-31 16:33:36 +01:00
Laurent Destailleur
0bdcda50c6
Merge remote-tracking branch 'origin/3.4' into 3.5
...
Conflicts:
ChangeLog
build/exe/doliwamp/doliwamp.iss
build/pad/pad_dolibarr.xml
build/rpm/dolibarr_fedora.spec
build/rpm/dolibarr_generic.spec
build/rpm/dolibarr_mandriva.spec
build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1
Merge remote-tracking branch 'origin/3.3' into 3.4
...
Conflicts:
ChangeLog
build/debian/changelog
build/exe/doliwamp/doliwamp.iss
build/makepack-dolibarr.pl
build/pad/pad_dolibarr.xml
build/pad/pad_doliwamp.xml
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-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377
Fix: Update doc and packager for doliwamp
...
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
Conflicts:
build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094
Prepare 3.5.0 release
2013-12-31 15:17:10 +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
b8141ef2db
Prepare 3.6 dev
2013-11-22 19:32:36 +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
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
