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 |
|