Laurent Destailleur
75daddbbe2
Update ignore to secure
2015-09-22 15:40:49 +02:00
Laurent Destailleur
38d30b5590
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/fourn/facture/card.php
2015-07-21 00:17:11 +02:00
Laurent Destailleur
f0ed7dac09
Exclude tested module
2015-07-20 12:21:15 +02:00
Laurent Destailleur
205c5aba82
Clean packages
2015-07-13 16:23:41 +02:00
Laurent Destailleur
0542e43b71
Prepare 3.8
2015-07-13 00:23:46 +02:00
Laurent Destailleur
66ae756c72
Prepare 3.8
2015-07-12 23:47:39 +02:00
Laurent Destailleur
dc050d39eb
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/makepack-dolibarr.pl
htdocs/adherents/type.php
htdocs/core/boxes/box_task.php
htdocs/core/class/commonobject.class.php
htdocs/core/class/html.form.class.php
htdocs/core/js/lib_batch.js
htdocs/core/modules/modUser.class.php
htdocs/fichinter/card.php
htdocs/fourn/commande/card.php
htdocs/societe/consumption.php
htdocs/user/info.php
htdocs/user/note.php
htdocs/user/param_ihm.php
htdocs/user/perms.php
2015-06-29 00:09:28 +02:00
Laurent Destailleur
8f691138e8
NEW Can edit Background color for Top menu and Background color for
...
table title line (works only with theme menu eldy).
2015-06-26 16:21:09 +02:00
Laurent Destailleur
a6a027f5c4
Fix several pb with javascript
2015-06-20 17:24:34 +02:00
Laurent Destailleur
c023c078ae
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
2015-06-17 00:07:44 +02:00
Laurent Destailleur
844ca58096
Fix: custom dir is missing
2015-06-17 00:05:41 +02:00
Laurent Destailleur
43ed48896a
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
build/debian/changelog
htdocs/filefunc.inc.php
htdocs/install/mysql/migration/3.6.0-3.7.0.sql
2015-06-05 18:31:53 +02:00
Laurent Destailleur
1f92f542a6
NEW Hidden option THEME_ELDY_USE_HOVER is stable enough to become
...
officialy visible into setup.
2015-06-04 13:32:21 +02:00
Laurent Destailleur
227f2842c2
Prepare version 3.7.1
2015-05-31 18:03:24 +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
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
7419319c0f
Protection into packager
2015-04-29 22:39:42 +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
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
560b4541cd
Update packager.
2015-03-05 22:08:16 +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
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
577671e208
Exclude editorconfig from packages
2014-12-03 12:05:31 +01:00
Laurent Destailleur
0559e29c92
Prepare freeze
2014-11-07 21:52:50 +01:00
Laurent Destailleur
2f5c7e5f9d
Prepare version 3.7 beta
2014-10-30 19:28:22 +01:00
jfefe
a32817db9d
Update makepack-dolibarr.pl : indentation
2014-10-28 23:49:54 +01:00
Laurent Destailleur
9768550696
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
ChangeLog
htdocs/categories/fiche.php
htdocs/comm/action/index.php
htdocs/comm/propal.php
htdocs/commande/fiche.php
htdocs/compta/facture.php
htdocs/compta/facture/class/facture.class.php
htdocs/contrat/class/contrat.class.php
htdocs/core/class/commonobject.class.php
htdocs/core/tpl/objectline_create.tpl.php
htdocs/fourn/fiche.php
htdocs/product/composition/fiche.php
htdocs/product/price.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
2014-10-12 02:54:34 +02:00
Laurent Destailleur
d518278166
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
htdocs/comm/propal.php
htdocs/comm/propal/class/propal.class.php
htdocs/commande/fiche.php
htdocs/compta/facture/class/facture.class.php
2014-10-03 19:17:28 +02:00
Laurent Destailleur
05fe8e45b3
Exclude module dire from package
2014-10-03 19:07:49 +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
05f83dddf0
Fix: packager
2014-09-27 15:23:40 +02:00
Laurent Destailleur
c2be3364e0
Merge remote-tracking branch 'origin/3.6' into develop
2014-08-04 22:19:53 +02:00
Laurent Destailleur
8167f30833
Fix: Exclude dev dir from bin package.
2014-08-04 01:25:38 +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
a2760aeacb
Typo
2014-07-23 10:26:43 +02:00
Laurent Destailleur
2cf9a7511b
Add date of file so we know if file was correctly build before
...
publishing it.
2014-07-14 23:47:46 +02:00
Laurent Destailleur
baa573435b
Fix: Exclude files from package with missing sources.
2014-05-27 00:58:00 +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
53a1e7d09a
Fix: Script can be ran from non root user, even from a directory with no
...
write permissions.
2014-05-06 16:26:58 +02:00
