lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
100,555 Commits 43 Branches 150 Tags 886 MiB
c03958a867
Commit Graph

1943 Commits

Author SHA1 Message Date
Laurent Destailleur
c6e66d1651 Fixes 2020-09-19 16:05:55 +02:00
Laurent Destailleur
b1985950a6 Use POST to make the ajax set/del constant 2020-09-19 12:50:47 +02:00
Laurent Destailleur
4a5ee7f04d Better testSqlAndScriptInject (deal htmlentities encoded signatures) 
More phpunits on GETPOST
 2020-09-19 03:25:25 +02:00
Laurent Destailleur
4710fedda6 Try another fix for #yogosha4514 2020-09-18 23:06:08 +02:00
Laurent Destailleur
d75e1e5771 Fix #yogosha4525 2020-09-18 16:10:11 +02:00
Laurent Destailleur
4e56115d2d Fix No CSRF for install module using GET 2020-09-18 14:35:30 +02:00
Laurent Destailleur
cc5d648888 Enhance the anti injection layer 2020-09-18 13:41:50 +02:00
Laurent Destailleur
cddec2f4dc Fix XSS 2020-09-18 13:25:56 +02:00
Laurent Destailleur
234b9f1f57 Fix CSRF 2020-09-18 05:07:58 +02:00
Laurent Destailleur
534846c5c7 NEW Framework is ready for CSRF token protection on explicit GET URLs. 2020-09-18 04:30:24 +02:00
Laurent Destailleur
0f0e4feeaf Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modSociete.class.php
 2020-09-17 19:33:29 +02:00
Laurent Destailleur
09558d0ce9 Fix MAIN_OPTIMIZEFORTEXTBROWSER 2020-09-16 13:15:57 +02:00
Laurent Destailleur
bd54033975 Look and feel v13 2020-09-10 17:35:18 +02:00
Scrutinizer Auto-Fixer
b78ff67d7e Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-09-07 08:18:17 +00:00
Laurent Destailleur
7e629d7ef4 FIX Language visible just after login does not match user choice. 2020-08-07 14:39:49 +02:00
Laurent Destailleur
aaaf690006 FIX Language visible just after login does not match user choice. 2020-08-07 14:05:05 +02:00
Laurent Destailleur
8aa968a27c NEW Can use THEME_DARKMODEENABLED=2 for a preview of theme in dark mode 2020-08-02 00:41:26 +02:00
BENKE Charlene
b3396a6454
better look & feel icon on dropdown 2020-07-02 14:40:56 +02:00
Laurent Destailleur
26c6e2d92e Clean code 2020-07-02 03:34:28 +02:00
Laurent Destailleur
6c2d70d43b Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-17 19:27:39 +02:00
Laurent Destailleur
54596d2286 FIX #13967 2020-06-17 19:26:17 +02:00
Laurent Destailleur
5794b1abea Fix for use with text browser 
Conflicts:
	htdocs/main.inc.php
 2020-06-10 12:46:55 +02:00
Laurent Destailleur
bd22ad4174 Fix for use with text browser 2020-06-10 12:35:39 +02:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
 2020-05-31 00:31:14 +02:00
Laurent Destailleur
5a9d968a75 Fix MAIN_BUGTRACK_ENABLELINK and MAIN_HELP_DISABLELINK setting 2020-05-29 00:02:03 +02:00
Laurent Destailleur
91ecd3455f Fix CSS 2020-05-26 22:30:11 +02:00
Laurent Destailleur
da8bd7507e NEW Add mass action to set category on a list of website pages. 2020-05-26 22:29:46 +02:00
Laurent Destailleur
40816c02ce
Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
056206098b CSS 2020-05-25 12:51:17 +02:00
Laurent Destailleur
9e77dc0a26 CSS 2020-05-25 12:50:29 +02:00
Frédéric FRANCE
174ddc5fd4
prepare new rule 2020-05-23 21:07:47 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
394ea5075f
Merge pull request #13823 from aspangaro/12.0_a25 
NEW: Add quick dropdown menu in top right menu (MAIN_USE_TOP_MENU_QUICKADD_DROPDOWN)
 2020-05-23 15:07:27 +02:00
Frédéric FRANCE
d9f42f85d1
add new rule 2020-05-21 15:08:14 +02:00
Frédéric FRANCE
def53338de
add new rule 2020-05-21 09:07:10 +02:00
Frédéric FRANCE
4be4f975b0
add new rule 2020-05-21 01:03:03 +02:00
Laurent Destailleur
499c2ea30a FIX #13855 2020-05-14 16:52:21 +02:00
Laurent Destailleur
ab07330668 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2020-05-14 16:34:45 +02:00
Maxime Kohlhaas
48183b396a Fix top menu search method must be GET 2020-05-13 08:54:42 +02:00
Laurent Destailleur
501f1ba2c4 Fix look and feel v12 2020-05-10 15:45:07 +02:00
Alexandre SPANGARO
489a2cd0cc NEW: Add quick dropdown menu in top right menu 2020-05-05 21:35:03 +02:00
Scrutinizer Auto-Fixer
1bf5745286 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-25 11:52:07 +00:00
Laurent Destailleur
7e9fe20365
Merge pull request #13664 from indelog/socinfoonprint 
NEW possibility to show society info when print page
 2020-04-22 14:11:34 +02:00
Laurent Destailleur
4777c74366
Update main.inc.php 2020-04-22 14:11:03 +02:00
stickler-ci
f4d1ca94b3 Fixing style errors. 2020-04-20 14:49:18 +00:00
DEMAREST Maxime (Indelog)
66ad197fc5 NEW possibility to show society info when print page 
If global config key SHOW_SOCINFO_ON_PRINT is set, this add a block in
top of page which display basic society information when the layout for
printing is activated (print button in top bar is cliqued).
 2020-04-20 16:23:54 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Laurent Destailleur
23c48b83e4 Fix change position of session_set_cookie_param / session_name 2020-04-06 11:16:35 +02:00
Laurent Destailleur
93ce4e9e4b Fix phpcs 2020-04-05 15:47:34 +02:00
Laurent Destailleur
5583ad9c38 Fix 2020-04-04 23:39:44 +02:00
Laurent Destailleur
716e037761 Fix previous login if first login 2020-04-04 23:31:17 +02:00
Laurent Destailleur
84cda962c1 Clean dead code 2020-04-02 12:03:29 +02:00
Laurent Destailleur
c06655bc03 Fix regression of bookmarks for blind people 2020-03-25 15:40:02 +01:00
Laurent Destailleur
a0dfbaaea8 Fix: Clean header an non https redirect to avoid to have cookie session 
ID in non https answers.
 2020-03-22 02:16:33 +01:00
Laurent Destailleur
ba8ece525d NEW If $dolibarr_main_force_https is set, the flag 'secure' on session 
cookie is also set.
 2020-03-22 01:59:32 +01:00
Laurent Destailleur
f3996c0038 Code comment 2020-03-13 02:35:28 +01:00
Laurent Destailleur
fede6da5cf Move Chartjs into correct dir name 2020-03-13 02:17:15 +01:00
Laurent Destailleur
d0839350db NEW Move engine to build charts from jflot to chart.js 2020-03-04 23:30:41 +01:00
Laurent Destailleur
f357661745 Fix PHPCS 2020-03-04 02:14:40 +01:00
Laurent Destailleur
13fb5eda83 Fix for md theme 2020-03-03 15:11:14 +01:00
Laurent Destailleur
a3e56994b6 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	htdocs/admin/company.php
	htdocs/compta/tva/document.php
	htdocs/core/lib/files.lib.php
	htdocs/main.inc.php
 2020-02-27 18:35:32 +01:00
Laurent Destailleur
8b1fff202b FIX option MAIN_OPTIMIZEFORTEXTBROWSER 2020-02-26 20:11:42 +01:00
Laurent Destailleur
91e7ff3c8e FIX No js if javascript off 2020-02-26 15:43:09 +01:00
Laurent Destailleur
315b434a6e FIX No js if javascript off 2020-02-26 15:05:29 +01:00
Laurent Destailleur
32d74adf20 NEW Truncate columns names when too long and show full title as popup 2020-02-24 21:18:49 +01:00
Laurent Destailleur
2e377112b5 Enhanc top bar of TakePOS (more similar than backoffice) 2020-02-24 19:24:38 +01:00
Laurent Destailleur
76e33058a8 NEW Can select several fields to personalize list before submit. 2020-02-23 21:38:24 +01:00
Laurent Destailleur
7e4af04886 CSS For bookmark dropdown 2020-02-21 17:18:01 +01:00
Laurent Destailleur
6cd4d15245 Debug the new bookmark in top menu + support for MD theme 2020-02-20 17:05:28 +01:00
Laurent Destailleur
593091f399 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks

Conflicts:
	htdocs/theme/eldy/global.inc.php
 2020-02-20 15:29:59 +01:00
Laurent Destailleur
a3fce650d9 FIX etrafield with visibilty=5 were not in read only 
FIX CSS
FIX option for topbar search and bookmarks
 2020-02-20 15:25:32 +01:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
9b6179850a CSS 2020-02-15 18:07:49 +01:00
Laurent Destailleur
f47966a25a NEW Restore version of application on main screen for screenshot 2020-02-15 17:20:11 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
 2020-02-11 16:52:58 +01:00
Laurent Destailleur
342d55a7db Test 2020-02-10 11:50:37 +01:00
Laurent Destailleur
07fbaa02d1 FIX #13050 2020-02-09 19:36:12 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744 FIX Log of authentication ko or ko + CVE-2020-7996 2020-02-02 19:05:38 +01:00
Laurent Destailleur
b83c90e348 Fix phpcs 2020-01-31 18:02:18 +01:00
Laurent Destailleur
b81d223ab3 Do no retry ping after error the same month 2020-01-31 17:27:48 +01:00
Norbert Penel
33a4888341
Protocol is not anymore used in url 
Since https expension, people do not specify protocol, so browsers propage the protocol used in parent page
 2020-01-29 14:25:23 +01:00
Laurent Destailleur
de4183ea65 Update logos 2020-01-24 17:30:46 +01:00
Laurent Destailleur
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Laurent Destailleur
c6c321b004 Fix website when ckeditor is off 2020-01-09 17:28:08 +01:00
Laurent Destailleur
2ac6a8a3db Fix ping after update 2020-01-01 14:30:16 +01:00
Laurent Destailleur
0ea5df36c1 Disable ping for alpha versions 2019-12-23 13:55:58 +01:00
Laurent Destailleur
39737c7c4b Fix opacity on text with a href links inside 
Fix var not defined
 2019-12-22 13:19:14 +01:00
Laurent Destailleur
cb5b573c50 Fix Too many try of ping 2019-12-20 11:31:40 +01:00
Laurent Destailleur
bf1533e7c1 Fix HTML5 2019-12-12 11:33:07 +01:00
Laurent Destailleur
652e99600a Look and feel v11 2019-12-09 09:43:38 +01:00
Laurent Destailleur
0e063a3bb3 Fix hreflang tag (must include itself) 2019-12-07 15:46:14 +01:00
Laurent Destailleur
7a1a932755 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/list.php
	htdocs/main.inc.php
 2019-12-03 15:03:10 +01:00
Laurent Destailleur
78acf07e4c Fix bad side effect of debugbar with android 2019-12-03 14:59:05 +01:00
ATM John BOTELLA
773f823748 factoring token usage 2019-12-01 10:20:11 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-28 11:36:20 +00:00
Laurent Destailleur
c22fea52e5 Fix do not ping name of server 2019-11-27 11:38:30 +01:00
Scrutinizer Auto-Fixer
e36ee63ab6 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-22 13:16:38 +00:00
Laurent Destailleur
00ad95c01e Figth against useless dependencies: Remove library the core never use. 2019-11-22 14:06:43 +01:00
Laurent Destailleur
58c38912ab Fix action into actionlogin to avoid conflict 2019-11-20 16:42:18 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-13 18:37:08 +00:00
Laurent Destailleur
df03041dba Fix phpcs 2019-11-12 09:47:39 +01:00
Laurent Destailleur
197bf61cfd Fix security. Login check must be done if action=login only. 2019-11-10 14:01:59 +01:00
Laurent Destailleur
7cd8d82636 Fix log 2019-11-10 13:56:56 +01:00
Laurent Destailleur
2bbeecea2f Fix missing the action= into log of login 2019-11-10 13:53:41 +01:00
Laurent Destailleur
db614159c0 Add php version 2019-11-09 18:37:07 +01:00
Laurent Destailleur
35c7e36790 Add country 2019-11-09 18:27:16 +01:00
Laurent Destailleur
917c8df225 Add type of db driver in stats 2019-11-09 12:24:18 +01:00
Laurent Destailleur
0ef249ea52 Debug module BOM 2019-11-05 18:06:33 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid 
replace deprecated user->societe_id by user->socid
 2019-11-02 13:34:21 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
John Botella
5658065296 Fix fatal error missing global 2019-10-30 15:25:37 +01:00
Laurent Destailleur
41303006f3 Rename constant 2019-10-23 17:48:55 +02:00
Frédéric FRANCE
acef3fb169
clean top menu xxx 2019-10-17 20:59:42 +02:00
Laurent Destailleur
41dd53170e Code comment 2019-10-16 19:07:17 +02:00
Laurent Destailleur
992b92978e NEW Use the squarre logo as favicon of pages 2019-10-11 12:38:01 +02:00
Laurent Destailleur
5801d09dbe NEW Use the squarre logo as favicon of pages 2019-10-11 12:28:13 +02:00
Laurent Destailleur
1b72a4d45b
Merge pull request #10960 from atm-john/New_look_and_feel_appli 
NEW: look and feel appli
 2019-10-09 13:29:39 +02:00
Laurent Destailleur
ad4aa39ec5
Merge pull request #11986 from atm-john/develop_dropdown_bookmark 
NEW :  dropdown bookmark and search
 2019-10-03 18:18:31 +02:00
Laurent Destailleur
5bf9b5116f Clean code 2019-10-03 10:13:07 +02:00
John Botella
135621c02b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-03 08:51:22 +02:00
Laurent Destailleur
9a28da5fdb Align search inputs 2019-10-01 23:40:56 +02:00
John Botella
2edc3ffe4b Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark 2019-10-01 08:50:34 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Frédéric FRANCE
ac4d72bb74
typo 2019-09-30 18:12:56 +02:00
stickler-ci
c8ab03432b Fixing style errors. 2019-09-29 17:59:12 +00:00
ATM john
455dd279e3 Add hidden conf 2019-09-29 19:54:25 +02:00
ATM john
cd821261e8 Add global search dropdown 2019-09-29 18:56:28 +02:00
ATM john
37f476bd8f Add shortcut , searchable items and list 2019-09-29 12:51:27 +02:00
ATM john
cc1d490135 Prepare dropdown bookmark menu 2019-09-29 11:47:34 +02:00
madx666
4b3430a1dc 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-27 14:53:11 +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
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +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
Laurent Destailleur
21a1e0d7b3 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/categories/index.php
	htdocs/comm/action/list.php
	htdocs/comm/action/rapport/index.php
	htdocs/compta/paiement.php
	htdocs/compta/sociales/document.php
	htdocs/compta/tva/document.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/class/commonobject.class.php
	htdocs/fourn/facture/paiement.php
	htdocs/loan/document.php
	htdocs/main.inc.php
 2019-06-04 19:03:27 +02:00
Laurent Destailleur
57cfb4b007 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/class/website.class.php
 2019-06-02 12:36:07 +02:00
Laurent Destailleur
912e29a746 FIX #11244 2019-05-29 11:06:01 +02:00
Regis Houssin
69e4420772 FIX missing "dropdown-icon" replacement 2019-05-22 11:53:36 +02:00
Laurent Destailleur
bfa4483722 More robust test against sql injections 2019-05-21 17:41:41 +02:00
Laurent Destailleur
54441a1abd Fix css 2019-05-21 12:36:18 +02:00
ATM John BOTELLA
d993d80a13 FIX url 2019-05-18 16:27:57 +02:00
ATM John BOTELLA
584100807a Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_look_and_feel_appli 2019-05-18 16:18:21 +02:00
ATM John BOTELLA
f714b45efb FIX scrutinizer feedback 2019-05-18 15:53:07 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
John BOTELLA
65252cd035 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_look_and_feel_appli 2019-05-10 15:58:28 +02:00
Regis Houssin
a91b462a89 FIX wrong parameter 2019-05-10 12:28:27 +02:00
Regis Houssin
3dbfc08a13 NEW add "printBucktrackInfo" hook, an external module can add info 2019-05-10 12:25:39 +02:00
ptibogxiv
d7504bb3f6
Fix variable error php with constant main.inc.php 2019-05-04 12:00:14 +02:00
Laurent Destailleur
15d57df177 CSS 2019-04-27 13:03:11 +02:00
Laurent Destailleur
7451838615 Fix scrutinizer 2019-04-11 18:39:12 +02:00
ATM john
f245247db6 Fix crtl+z and frenetic commit 2019-04-10 22:43:06 +02:00