Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
68,347 Commits 36 Branches 189 Tags
b8c88a214449d5129fd4c479249cfa7c2373d10d
Commit Graph

43 Commits

Author SHA1 Message Date
ATM-Nicolas
5bc9799bf1 FIX : Drag and drop lines with extrafields 2018-05-07 16:30:22 +02:00
Laurent Destailleur
c3970f1a52 Code comment 2018-04-17 09:44:57 +02:00
Laurent Destailleur
7743f88e98 Fix bad escaping 2018-02-13 14:03:11 +01:00
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
fappels
14bc066454 Update for new tablednd compatibility 2017-11-07 16:25:57 +01:00
Laurent Destailleur
86a6a83647 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/admin/tools/index.php
	htdocs/bookmarks/bookmarks.lib.php
	htdocs/compta/facture.php
	htdocs/core/tpl/passwordforgotten.tpl.php
	htdocs/fourn/ajax/getSupplierPrices.php
	htdocs/main.inc.php
	htdocs/product/stats/card.php
	htdocs/public/paypal/paymentko.php
 2017-06-18 21:13:48 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
4c056d68d8 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/dict.php
	htdocs/commande/list.php
	htdocs/core/class/html.form.class.php
	htdocs/langs/en_US/bills.lang
	htdocs/societe/list.php
 2017-04-15 17:02:05 +02:00
Laurent Destailleur
df59a595de Fix link to files 2017-03-25 01:29:19 +01:00
Laurent Destailleur
6b33a755ba Add more log on tableDnD 2017-03-24 23:52:06 +01:00
Laurent Destailleur
26098082d0 NEW Uploaded files are indexed into database 2016-12-20 22:14:27 +01:00
Laurent Destailleur
ed0ffd6f5a NEW Uploaded files are indexed into database 2016-12-20 19:42:25 +01:00
Laurent Destailleur
e59edca855 Fix Responsive design 2016-11-27 20:55:59 +01:00
Laurent Destailleur
1a1959b52c Fix: Solve conflict with imgup and imgdown class use for sort fields and 
to drag and drop lines.
 2015-03-22 21:18:25 +01:00
Laurent Destailleur
45aac81b71 Doc: More comments 2013-11-16 18:12:13 +01:00
Laurent Destailleur
ec576c91cc Enhance prototype for tables 2013-10-21 13:43:31 +02:00
Laurent Destailleur
26f3e920cf Fix: Removed warning. 
Fix: Missing doxygen
 2013-05-02 13:10:39 +02: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
Laurent Destailleur
d48f294531 New: [ task #289 ] Reorder tasks 2012-09-15 15:33:00 +02:00
Laurent Destailleur
9147911ae4 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
 2012-09-15 13:53:19 +02:00
Regis Houssin
4291db4a93 Fix: strict mode 2012-07-10 18:57:27 +02:00
Regis Houssin
1f5a103851 Fix: use POST instead GET for bypass GET limit 2012-02-13 12:40:43 +01:00
Regis Houssin
7e5c347bb8 Fix: correct reorder childrens of lines 2012-01-24 05:31:49 +08:00
Regis Houssin
5fe088334c Qual: move ajax response in /core/ajax directory 2011-10-25 19:03:12 +02:00
Regis Houssin
b6a2f13673 Fix: avoid jenkins warning 
Fix: SpaceAfterOpenBracket, SpaceAfterCloseBracket, SpaceBeforeCloseBracket, SpaceBeforeOpenBracket
 2011-09-20 09:40:27 +00:00
Regis Houssin
03711cf6f2 Fix: remove obsolete tags 2011-08-27 19:15:14 +00:00
Laurent Destailleur
be771c9d44 Fix: Avoid errors into rpm packages 2011-07-31 23:45:11 +00:00
Regis Houssin
be9c6d2d66 Fix: code is better 2011-04-12 08:15:45 +00:00
Regis Houssin
51473444a3 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 08:00:24 +00:00
Regis Houssin
a55aaae6b8 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:59:37 +00:00
Regis Houssin
65a8511a36 New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:58:15 +00:00
Regis Houssin
272ec2779f New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:56:15 +00:00
Regis Houssin
99d2185d9a New: add constant MAIN_FORCE_RELOAD_PAGE 2011-04-12 07:48:07 +00:00
Regis Houssin
1c89213caf Fix: reorder the lines correctly 2011-04-11 09:00:13 +00:00
Laurent Destailleur
cfe7215288 New: Use ajax to change order of lines. 2010-10-02 20:47:55 +00:00
Regis Houssin
4950775197 Fix: hide arrows if edit line 2010-10-01 16:19:53 +00:00
Laurent Destailleur
7c890a0daa Same but using style instead of hard coded cell 2010-09-28 18:00:59 +00:00
Regis Houssin
ca85e8b577 Test: reorder line with jquery 2010-09-27 16:23:58 +00:00
Laurent Destailleur
9e93042302 Add style dragHandle 2010-09-18 15:34:06 +00:00
Regis Houssin
27a930a606 Qual: uniformize code 2010-09-18 09:40:24 +00:00
Regis Houssin
481ecd6a87 Test: reorder lines with jquery 2010-09-18 07:52:17 +00:00