Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
63,293 Commits 36 Branches 189 Tags
cad2fedf70a54dee93551a6be7807a2a3f9f2018
Commit Graph

219 Commits

Author SHA1 Message Date
Laurent Destailleur
f3c6442a93 Code comment 2017-10-22 14:44:50 +02:00
Laurent Destailleur
b7a6c7d049 Fix log file name not set during install 2017-07-17 16:23:24 +02:00
Laurent Destailleur
0482137620 Fix warning 2017-06-17 18:03:53 +02:00
Laurent Destailleur
b889db997a Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture.php
	htdocs/core/datepicker.php
	htdocs/core/get_menudiv.php
	htdocs/core/menus/standard/auguria.lib.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/core/search_page.php
	htdocs/main.inc.php
	htdocs/master.inc.php
	htdocs/product/list.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/card.php
	htdocs/user/index.php
 2017-06-14 10:48:34 +02:00
Laurent Destailleur
7939daa225 Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/theme/eldy/style.css.php
	htdocs/theme/md/style.css.php
	htdocs/user/index.php
 2017-06-14 10:18:24 +02:00
Laurent Destailleur
9c482b9f2a FIX CVE-2017-7886 2017-06-10 21:37:27 +02:00
Laurent Destailleur
b8b91db007 Use function top_httphead to include headers in pages. 2017-05-09 21:46:57 +02:00
Laurent Destailleur
749f8cf252 Fix translation 2017-01-12 00:15:00 +01:00
Laurent Destailleur
2bfbf0f6a7 Fix css 2016-12-23 00:37:32 +01:00
Gustavo Novaro
99c73cf11a HTML 5 doctype 
Improve install header to use html 5 doctype
 2016-12-17 04:48:41 -03:00
Laurent Destailleur
c11888bcde Fix responsive 2016-12-13 02:18:14 +01:00
Laurent Destailleur
d5c7151bc8 FIX #6102 2016-12-10 12:11:09 +01:00
Laurent Destailleur
bcd3a1a888 NEW Default collation for mysql is now utf8_unicode_ci 2016-11-07 01:53:34 +01:00
Laurent Destailleur
84ece61e0f Update doc 2016-11-07 01:34:46 +01:00
Laurent Destailleur
0e3ec5df38 Merge branch 'remove-mysql-driver' of 
https://github.com/marcosgdf/dolibarr into marcosgdf-remove-mysql-driver

Conflicts:
	htdocs/core/db/mysql.class.php
 2016-08-05 13:12:43 +02:00
Raphaël Doursenaud
f2a479695e New: Improved forced install process 
Tamper proofed the process by not relying on POST values for forced fields.
Disabled all fields set when $force_install_noedit is set.
Added a full-featured forced install config file template.

On the side:
Improved Dolibarr root and url detection.
Prevent install locking if install was not successful.
Added missing translation on failed administrator creation.
Better escaping of posted values.
 2016-07-20 14:22:35 +02:00
Laurent Destailleur
9d3ad36b78 NEW If error is reported during migration process, you can ignore it to 
avoid to be locked.
 2016-05-09 11:06:18 +02:00
Marcos García de La Fuente
257d9b2f8d NEW #4772 Removed support for Mysql deprecated driver. Please use Mysqli instead 2016-04-17 15:39:46 +02:00
Laurent Destailleur
7dac7c4f04 Merge remote-tracking branch 'origin/3.9' into develop 2016-03-11 11:00:53 +01:00
Laurent Destailleur
7a5353efb2 Make things clearer about option MAIN_ENABLE_LOG_TO_HTML 2016-03-10 18:36:09 +01:00
Laurent Destailleur
5ea9c6dd83 Merge remote-tracking branch 'origin/3.9' into develop 
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/core/class/html.formprojet.class.php
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/filefunc.inc.php
	htdocs/langs/en_US/accountancy.lang
 2016-02-09 14:40:25 +01:00
Laurent Destailleur
4c859999e8 Fix first install on debian. 2016-02-06 17:19:57 +01:00
Laurent Destailleur
c6fe8e5479 Fix first install on debian. 2016-02-06 17:13:24 +01:00
Laurent Destailleur
89fad007b4 Fix constant() need the string name of a constant to return value of 2016-01-14 11:17:47 +01:00
Laurent Destailleur
97e96bed87 Merge pull request #4360 from GPCsolutions/develop-morelock 
[Security] Detect lockfile even without configuration
 2016-01-12 23:24:34 +01:00
Raphaël Doursenaud
4d8a9abdbc [Security] Detect lockfile even without configuration 2016-01-11 11:10:04 +01:00
Laurent Destailleur
f9933aba0c Install style match application style 2016-01-08 22:23:57 +01:00
Laurent Destailleur
5a49b8ce53 Fix: error when running install twice 
Fix: a minor error was locking the full upgrade process.
 2015-12-31 12:02:22 +01:00
Laurent Destailleur
b3491ef4e5 Merge remote-tracking branch 'origin/3.8' into develop 
Conflicts:
	ChangeLog
	htdocs/comm/propal/class/propal.class.php
	htdocs/compta/facture/admin/facture_cust_extrafields.php
	htdocs/compta/facture/admin/facturedet_cust_extrafields.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/contrat/card.php
 2015-10-16 10:12:36 +02:00
Raphaël Doursenaud
ddb23eaf3b [Qual] Use default data root path if no conf 
Installation can be protected by an install.lock file in the
data root path. This protection was ineffective if no configuration
file was available. Whith this change, it still searches the default
path.
 2015-10-12 15:25:36 +02:00
Regis Houssin
f8f600828d Fix: wrong files name 2015-10-11 19:18:03 +02:00
Regis Houssin
45a70d7dc3 Fix: wrong test 2015-10-01 12:41:29 +02:00
Regis Houssin
1c023e291c Fix: avoid error during update if db port not defined 2015-10-01 12:35:38 +02:00
Laurent Destailleur
99c8a9211e Sync with transifex 2015-07-20 13:55:43 +02:00
Raphaël Doursenaud
c28e863e2f Fix: jquery path 2015-07-06 16:39:42 +02:00
Scrutinizer Auto-Fixer
b693ed3f51 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2015-03-16 23:21:17 +00:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +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
f4dfac045a Fix: Bad default mysql driver 2013-07-14 20:20:52 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
0beea6c23c Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/install/inc.php
 2013-01-28 12:58:16 +01:00
Laurent Destailleur
a8ccc0ab0b Fix: loghandler loaded twice. 2013-01-28 12:36:15 +01:00
Laurent Destailleur
b98151db94 Fix: A log handler can be loaded twice. 2013-01-28 12:22:12 +01:00
Laurent Destailleur
abd8aea06b Fix: Log not reported 
Fix: charset not correctly forced

Conflicts:
	htdocs/install/inc.php
 2013-01-28 11:56:45 +01:00
Laurent Destailleur
eeba48f9b0 Fix: Log not reported 
Fix: charset not correctly forced
 2013-01-28 11:43:49 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00