2
0
forked from Wavyzz/dolibarr
Commit Graph

1655 Commits

Author SHA1 Message Date
Frédéric FRANCE
ac4d72bb74 typo 2019-09-30 18:12:56 +02:00
Laurent Destailleur
add3abc73d Merge pull request #11905 from madx666/patch-1
Fix return to list on page 1
2019-09-27 14:51:06 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
2019-09-24 14:25:02 +02:00
Laurent Destailleur
19c78d42e9 Fix az09 -> aZ09 2019-09-24 14:20:29 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
2019-09-18 15:12:38 +02:00
Laurent Destailleur
00d5cff00d Fix XSS injection into textarea 2019-09-18 14:44:31 +02:00
Laurent Destailleur
345ac28c89 Fix js injection
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
2019-09-18 14:21:02 +02:00
madx666
8d7d14c730 Fix return to list on page 1
When are on page 1 on any list and we go on an object, when return to the list, we are back on page 0
2019-09-16 15:39:58 +02:00
Laurent Destailleur
ca997a4172 Comment 2019-09-12 11:56:42 +02:00
Laurent Destailleur
d2b2cc010b Update ckeditor 4.12 2019-09-10 17:50:55 +02:00
Laurent Destailleur
e7e663a27e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-05 17:57:41 +02:00
Laurent Destailleur
cabbdfc650 Fix injection in User-Agent 2019-09-04 10:30:05 +02:00
stickler-ci
b2cbad1a88 Fixing style errors. 2019-09-03 12:21:08 +00:00
dolibarr95
decf1d5a4b Use bug template 2019-09-03 14:18:14 +02:00
Laurent Destailleur
89160c4594 Merge pull request #11796 from hregis/develop_menu
FIX possibility to bypass captcha if it has been validated otherwise
2019-09-03 13:02:49 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
58643e5e96 Fix regression 2019-08-31 00:44:10 +02:00
Regis Houssin
abb0a681fc FIX possibility to bypass captcha if it has been validated otherwise 2019-08-30 20:20:54 +02:00
Laurent Destailleur
5e7fc06ab2 Fix js injection 2019-08-30 16:25:25 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
Laurent Destailleur
55f0051db2 Html tag <marquee are forbidden 2019-08-30 15:17:13 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
1463302bdd Add option to disable the anonymous ping 2019-08-23 16:23:31 +02:00
Laurent Destailleur
729340420f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-18 17:03:48 +02:00
Laurent Destailleur
2ddf7c1d1f Fix responsive 2019-08-18 17:03:20 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
1f2eb31e41 Set utf-8 in lowercase 2019-08-16 06:06:36 +02:00
Laurent Destailleur
0818571827 Work on the edit inline tool. 2019-08-14 19:48:52 +02:00
Laurent Destailleur
6df36866e1 Remove mentions to register_globals 2019-08-14 15:30:03 +02:00
Laurent Destailleur
7824731f17 NEW Add feature to search a string into containers 2019-08-13 00:34:42 +02:00
John Botella
401dc12b93 Add color blind option in body for css impact 2019-08-07 12:15:55 +02:00
Laurent Destailleur
f4dd345c7a Add version to telemetry 2019-08-03 11:32:12 +02:00
Laurent Destailleur
a6fdec5713 Fix ping 2019-08-02 20:11:55 +02:00
Laurent Destailleur
5ee9a88181 NEW Add anonymous telemetry 2019-08-02 19:21:25 +02:00
Laurent Destailleur
a46bfc7a29 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/project.lib.php
2019-07-25 17:54:14 +02:00
Laurent Destailleur
239b7d56b4 Fix compatibility with plugins using old jquery 2019-07-23 13:31:00 +02:00
Laurent Destailleur
2dccaef1cd Fix message 2019-07-23 03:39:07 +02:00
Laurent Destailleur
d6d1b29257 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-21 16:15:32 +02:00
Laurent Destailleur
932530bd37 FIX ajax call for line positioning when CSRFCHECK_WITH_TOKEN is on 2019-07-21 16:00:32 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Frédéric FRANCE
96723db86f Update main.inc.php 2019-07-09 15:20:43 +02:00
Regis Houssin
bfa7f22209 FIX missing "dropdown-icon" replacement 2019-07-04 14:55:41 +02:00
Laurent Destailleur
d76a4f1011 Merge pull request #11238 from hregis/develop_look
FIX missing "dropdown-icon" replacement
2019-07-04 14:53:12 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
3b0f1c733f Fix missing token 2019-07-02 15:00:17 +02:00
Laurent Destailleur
c1f6b76a6a Remove deprecated 2019-06-22 18:29:24 +02:00
Laurent Destailleur
0639313503 Merge branch 'develop' into develop_bug 2019-06-20 03:47:45 +02:00
Laurent Destailleur
a72e36cd01 Fix show version removed from left menu 2019-06-10 20:05:49 +02:00