Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-08 10:38:15 +01:00
Code Issues Packages Projects Releases Wiki Activity
69,068 Commits 36 Branches 190 Tags
cefaeb583ff12ad09c836fcbf6b39d01209e901b
Commit Graph

55 Commits

Author SHA1 Message Date
Laurent Destailleur
eab44f62b1 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_builddoc.inc.php
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/admin_extrafields_add.tpl.php
	htdocs/core/tpl/admin_extrafields_edit.tpl.php
	htdocs/core/tpl/admin_extrafields_view.tpl.php
	htdocs/core/tpl/notes.tpl.php
	htdocs/main.inc.php
	htdocs/product/inventory/tpl/inventory.tpl.php
	htdocs/societe/tpl/linesalesrepresentative.tpl.php
 2017-12-21 14:35:33 +01:00
Laurent Destailleur
6a62e13960 FIX security vulnerability reported by ADLab of Venustech 2017-12-21 13:32:16 +01:00
Laurent Destailleur
724817139d Start remove $GLOBALS 2017-09-12 19:49:07 +02:00
Laurent Destailleur
65f7de8f64 Fix css and look 5.0 2017-01-22 12:13:32 +01:00
Laurent Destailleur
91caea5707 Code was corrupted with very bad commits. I restore files manually. 2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db Missing changes from previous commits 2016-03-20 14:24:49 +01:00
Laurent Destailleur
62792c08eb Merge pull request #3591 from GPCsolutions/inherited 
[Qual] Cleanup of inherited class properties
 2015-09-26 11:23:59 +02:00
Raphaël Doursenaud
67ddb6c94e [Qual] Cleanup of inherited class properties 2015-09-24 20:12:55 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00
Laurent Destailleur
c35018be5f Fixed: Translations 2014-12-07 18:24:45 +01: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
e8b7c9c6bd Fix: doxygen 2014-09-27 16:00:11 +02:00
Marcos García de La Fuente
ec661d0c6c Removed index.php and replaced them with blank index.html as it is more appropriate 2014-07-12 23:18:57 +02: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
f7fe25e408 Uniformize code to prepare mass update 2014-02-27 10:37:23 +01:00
Laurent Destailleur
d802470aae I killed <td nowrap>. Hello <td class="nowrap"> ! 2013-07-19 14:23:42 +02:00
Grand Philippe
fb54bceafb english standardization 2013-02-22 16:53:50 +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
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Regis Houssin
ff0668e908 Fix: strict mode way 2012-07-10 22:10:12 +02:00
Regis Houssin
887f210618 Fix: avoid warning with php 5.4 and strict mode 2012-07-08 23:22:22 +02:00
Laurent Destailleur
3c98daaf09 More fix for canvas features 2012-05-30 03:46:06 +02:00
Laurent Destailleur
ed41e03589 Qual: Fix a ton of CheckStyle errors 2012-03-18 19:23:01 +01:00
Regis Houssin
551b9c619a Fix: different trad if addresses management 2012-03-14 15:32:48 +01:00
Laurent Destailleur
b5fc41fadc Fix: Removed a lot of checkstyle warnings 2012-03-11 22:08:46 +01:00
Laurent Destailleur
5e32fc70ad Fix: action must always be provided as value can be change during actions 2012-02-28 16:48:18 +01:00
Laurent Destailleur
1645ddbe47 Sec: Sanitize all input for ids. 2012-02-27 22:26:22 +01:00
Regis Houssin
96ed2fe994 Fix: broken canvas 2011-09-24 15:57:52 +00:00
Laurent Destailleur
3fca369e29 Qual: Uniformize code. Removed dead code. 2011-09-20 22:12:59 +00:00
Laurent Destailleur
bc25ed0834 Qual: Removed PHPCodesniffer error. 2011-09-16 17:57:09 +00:00
Laurent Destailleur
17c32809e8 Qual: Removed TODO and some useless code 2011-09-13 12:00:37 +00:00
Laurent Destailleur
d9408d1847 Doxygen 2011-09-12 18:15:11 +00:00
Laurent Destailleur
b75d19c264 Qual: Uniformize constructors 2011-09-11 18:35:38 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Regis Houssin
2ecc03104c Fix: remove obsolete tags (in progress) 2011-08-27 15:14:31 +00:00
Laurent Destailleur
540b228c27 Fix: Avoid errors into rpm packages 2011-07-31 23:54:11 +00:00
Laurent Destailleur
cc840ad66e Fix: Avoid errors into rpm packages 2011-07-31 21:24:20 +00:00
Laurent Destailleur
b550807090 Fix: Removed a conception error reported by eclipse validators. 2011-07-08 13:07:44 +00:00
Laurent Destailleur
31ff9bb739 Qual: All text for html output is inside display_canvas() 2011-05-31 22:31:38 +00:00
Laurent Destailleur
8d66d2da7e New: Can use canvas for create only with no need to have one for edit. 2011-05-29 17:34:07 +00:00
Laurent Destailleur
dc25891c60 Move all output into template 2011-04-11 07:35:15 +00:00
Laurent Destailleur
00a25e77c7 Move all output into template 2011-04-10 21:28:00 +00:00
Laurent Destailleur
d72f417868 Qual: Fix architecture problem with canvas 2011-04-06 16:21:43 +00:00
Laurent Destailleur
e05f0caf60 Qual: Make module system more simple. 
Change to prepare adding left menu entries by modules
 2011-04-06 14:26:43 +00:00
Regis Houssin
e469ef2a7d Works on contact canvas in relation to the thirdparty canvas module 2010-11-05 08:28:49 +00:00
Regis Houssin
017422dfee Works on contact canvas in relation to the thirdparty canvas module 2010-11-04 18:15:36 +00:00
Regis Houssin
05ed583cf1 Works on contact canvas in relation to the thirdparty canvas module 2010-11-04 17:50:01 +00:00
Regis Houssin
e2a4ad2c96 Works on contact canvas in relation to the thirdparty canvas module 
Fix: more simple
 2010-11-04 09:14:20 +00:00
Regis Houssin
6305c6c8fa Works on contact canvas in relation to the thirdparty canvas module 2010-11-04 07:48:28 +00:00