Commit Graph

269 Commits

Author SHA1 Message Date
Laurent Destailleur
04752dbfbe Doxygen: More comments 2013-09-18 17:59:57 +02:00
Laurent Destailleur
8c90ad8afa Merge remote-tracking branch 'origin/3.4' into develop
Conflicts:
	ChangeLog
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/html.formfile.class.php
	htdocs/core/modules/expedition/doc/pdf_expedition_rouget.modules.php
	htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
	htdocs/core/modules/modFacture.class.php
	htdocs/core/modules/modFournisseur.class.php
	htdocs/core/modules/supplier_invoice/mod_facture_fournisseur_tulip.php
	htdocs/expedition/fiche.php
	htdocs/fourn/fiche.php
	htdocs/langs/el_GR/admin.lang
	htdocs/langs/el_GR/agenda.lang
	htdocs/langs/el_GR/banks.lang
	htdocs/langs/el_GR/bills.lang
	htdocs/langs/el_GR/bookmarks.lang
	htdocs/langs/el_GR/boxes.lang
	htdocs/langs/el_GR/cashdesk.lang
	htdocs/langs/el_GR/categories.lang
	htdocs/langs/el_GR/commercial.lang
	htdocs/langs/el_GR/companies.lang
	htdocs/langs/el_GR/compta.lang
	htdocs/langs/el_GR/contracts.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/deliveries.lang
	htdocs/langs/el_GR/dict.lang
	htdocs/langs/el_GR/donations.lang
	htdocs/langs/el_GR/ecm.lang
	htdocs/langs/el_GR/errors.lang
	htdocs/langs/el_GR/exports.lang
	htdocs/langs/el_GR/externalsite.lang
	htdocs/langs/el_GR/ftp.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/holiday.lang
	htdocs/langs/el_GR/install.lang
	htdocs/langs/el_GR/interventions.lang
	htdocs/langs/el_GR/languages.lang
	htdocs/langs/el_GR/ldap.lang
	htdocs/langs/el_GR/mailmanspip.lang
	htdocs/langs/el_GR/mails.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/members.lang
	htdocs/langs/el_GR/opensurvey.lang
	htdocs/langs/el_GR/orders.lang
	htdocs/langs/el_GR/oscommerce.lang
	htdocs/langs/el_GR/other.lang
	htdocs/langs/el_GR/paybox.lang
	htdocs/langs/el_GR/paypal.lang
	htdocs/langs/el_GR/products.lang
	htdocs/langs/el_GR/projects.lang
	htdocs/langs/el_GR/propal.lang
	htdocs/langs/el_GR/sendings.lang
	htdocs/langs/el_GR/shop.lang
	htdocs/langs/el_GR/sms.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/el_GR/trips.lang
	htdocs/langs/el_GR/users.lang
	htdocs/langs/el_GR/withdrawals.lang
	htdocs/langs/el_GR/workflow.lang
	htdocs/margin/productMargins.php
2013-08-24 22:41:32 +02:00
Laurent Destailleur
34987d3e8b Exclude conf.php file from git 2013-08-10 13:02:13 +02:00
Laurent Destailleur
d637212dce Fix: alternative url were sometimes relative to server, sometimes to
DOL_URL_ROOT. Fix to be always relative to DOL_URL_ROOT.
2013-07-15 00:58:40 +02:00
Laurent Destailleur
f94f516a12 Clean code for managing alternate root dirs. 2013-07-09 23:46:31 +02:00
Laurent Destailleur
cbc0570bc3 Update exemple 2013-07-07 03:33:10 +02:00
Laurent Destailleur
7114ae33fe Fix: Doc not uptodate 2013-01-09 11:44:45 +01:00
Laurent Destailleur
5d370c7e96 Fix: force redirect to https could not work for some environments 2012-12-12 02:37:15 +01:00
Laurent Destailleur
ef7de86d7e Show more param on conf.php file 2012-09-05 10:38:48 +02:00
Laurent Destailleur
8627464596 Exclude file 2012-08-10 03:51:53 +02:00
Laurent Destailleur
3798067fb2 Update example file 2012-02-18 15:07:20 +01:00
Laurent Destailleur
61175c2543 Work on debian/rpm package 2012-02-18 14:55:41 +01:00
Laurent Destailleur
7afcee03b9 Work on debian package 2012-02-18 03:29:43 +01:00
Laurent Destailleur
382c6554b4 New: Work on debian packaging to use default ckeditor package 2012-01-14 02:06:05 +01:00
Laurent Destailleur
ad7aee9fc2 Fix: Checkstyle warnings 2012-01-07 23:57:42 +01:00
Laurent Destailleur
6c0f1b79ce Exclude files 2012-01-02 10:19:40 +01:00
Laurent Destailleur
d49780fb13 New: Add hook on index statistics array 2011-12-06 23:38:54 +01:00
Laurent Destailleur
8a498774bf Can choose nusoap library path.
Work on debian package.
2011-11-27 02:06:48 +01:00
Regis Houssin
d82a254e03 New: add prefix field in install form and in conf.php 2011-11-23 23:09:57 +01:00
Regis Houssin
6bbc1a1a77 Fix: move transverse mode parameters in conf.php 2011-11-04 09:09:53 +01:00
Regis Houssin
dea1210c2d Fix: edit in place datepicker more stable 2011-10-28 19:31:42 +02:00
Regis Houssin
3338649316 [task #217] Move core files in core directory 2011-10-24 14:11:49 +02:00
Laurent Destailleur
a5674a5098 Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
c5fb4af625 Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
0c7bd13c6e Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
abefb4e95c Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
6a913abc1e Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
12a8696999 Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
fea4c76191 Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
014f1845ba Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
5577f43d6c Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
5bebec9b82 Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
5478425f08 Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
40e9c63bc2 Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
0004a0a838 Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
347c07aff3 Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
a0be0eae63 Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
2bd49427ff Fix: duplicate message 2011-09-07 15:14:40 +00:00
Laurent Destailleur
263ab6eac8 Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
c6e44139a3 New: Show param to overwite lib path 2011-09-07 14:50:18 +00:00
Laurent Destailleur
bd0d3b939c Work on rpm package 2011-09-07 13:28:39 +00:00
Laurent Destailleur
911117f6ce New: Show param to overwite lib path 2011-09-07 15:08:49 +00:00
Laurent Destailleur
274214f82e Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Laurent Destailleur
c7518b456d Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
86ae2f4f22 New: Show param to overwite lib path 2011-09-07 14:50:18 +00:00
Laurent Destailleur
8942771d28 Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
1bae24fd0c Work on rpm package 2011-09-07 14:34:44 +00:00
Laurent Destailleur
170e4ba852 Work on rpm package 2011-09-07 13:28:39 +00:00
Laurent Destailleur
0e881e597d Work on rpm package 2011-09-07 14:34:15 +00:00
Laurent Destailleur
abde2eff49 Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00