Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
78,589 Commits 36 Branches 189 Tags
594d9e321e8c7753932ca8ee98491036a3b51ec9
Commit Graph

1621 Commits

Author SHA1 Message Date
Laurent Destailleur
d762766a56 Font awesome 5 by default 2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle 2019-03-12 09:24:42 +01:00
John BOTELLA
d8223bfe98 init dropdown 2019-03-11 18:03:39 +01:00
John BOTELLA
56a40c7de8 Fix sidebar collapse behavior 2019-03-08 14:06:37 +01:00
Frédéric FRANCE
784012a47e Update main.inc.php 2019-03-04 23:47:40 +01:00
Laurent Destailleur
359f2c6e81 NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE 
Removed migration files
 2019-03-02 12:16:37 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 
Reorganize levels of menu accountancy
 2019-02-20 04:55:35 +01:00
Laurent Destailleur
7e171c8750 FIX adding css by page if url is externam 
Conflicts:
	htdocs/main.inc.php
 2019-02-15 00:48:31 +01:00
Laurent Destailleur
44c1d30f6f FIX adding css by page if url is externam 2019-02-15 00:46:11 +01:00
Laurent Destailleur
62760bf1e2 Fix regression 2019-02-14 21:45:23 +01:00
Laurent Destailleur
2d5d2ccdc6 Merge pull request #10497 from wdammak/patch-26 
NEW: Add the current modulepart to the Conf class
 2019-02-13 16:43:46 +01:00
wdammak
32c48f0fa2 Update main.inc.php 
break ;)
 2019-02-12 19:56:55 +01:00
Laurent Destailleur
0bb59bf6cc Fix phpcs 2019-02-12 17:03:09 +01:00
Laurent Destailleur
74f468dc91 Merge pull request #10535 from atm-quentin/FIX_multiple_sending_form 
FIX on chrome you can send multiple form if you click more than once …
 2019-02-12 13:42:37 +01:00
Laurent Destailleur
e054b080a5 Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
Laurent Destailleur
0bd30b160a Fix picto logout with fontawesome 5 2019-02-11 11:55:48 +01:00
Frédéric FRANCE
580e5c42d2 GenericFunctionsFunctionCallArgumentSpacing 2019-02-09 12:00:49 +01:00
atm-quentin
300438b290 FIX on chrome you can send multiple form if you click more than once on button 2019-02-08 15:57:08 +01:00
wdammak
f1ffae3ac5 Update main.inc.php 
fix travis
 2019-02-04 18:27:47 +01:00
wdammak
01ba32efbc Update main.inc.php 
Set current modulepart
 2019-02-04 17:52:15 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css 
Removal of type="text/javascript"
 2019-01-20 23:36:39 +01:00
Laurent Destailleur
d814b66b36 Fix pb in token check 2019-01-15 15:04:15 +01:00
Laurent Destailleur
45a24df679 More complete message 2019-01-15 14:07:05 +01:00
Laurent Destailleur
ebf3ea39bf Fix missing token in POST 2019-01-15 13:55:14 +01:00
Laurent Destailleur
4b32e214de Fix phpcs 2019-01-12 18:53:50 +01:00
Laurent Destailleur
87609f3f57 NEW Add hook 'addHtmlHeader' 2019-01-12 14:35:51 +01:00
Laurent Destailleur
79e3fcc109 NEW Add constant XFRAMEOPTIONS_ALLOWALL 2019-01-11 17:03:29 +01:00
Laurent Destailleur
6e078105ab Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/journal/bankjournal.php
 2019-01-06 01:22:10 +01:00
Laurent Destailleur
59d6000e89 Code comment 2019-01-05 15:13:35 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
ldestailleur
bc00fb177a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-02 19:42:15 +01:00
Laurent Destailleur
3cd91d7c66 Fix look and feel v9 (autofocus) 2018-12-28 00:41:05 +01:00
Laurent Destailleur
5c516fdae2 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
 2018-12-26 19:43:01 +01:00
Laurent Destailleur
af6a7446ee Merge pull request #9871 from laudeco/feature/fontawesome_migration 
migrate font awesome to 5.4.1
 2018-12-22 19:52:39 +01:00
Laurent Destailleur
85375495e5 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/product/class/product.class.php
	htdocs/public/notice.php
	htdocs/user/card.php
 2018-12-22 19:06:58 +01:00
Laurent Destailleur
a5dccd1cc3 Enable by default the test on anti CSRF token 2018-12-22 18:09:26 +01:00
Laurent Destailleur
f8b0e535fa Code comment 2018-12-22 17:30:22 +01:00
Laurent Destailleur
718105ff86 FIX #10196 2018-12-15 16:20:36 +01:00
Laurent Destailleur
539e2c55cd FIX #9629 #9625 2018-12-14 10:33:07 +01:00
Laurent Destailleur
c1ce902f91 FIX #9629 #9625 2018-12-14 10:31:09 +01:00
Laurent Destailleur
b35a9c0e64 FIX Edition of menu fails (mainmenu required for top menu) 2018-12-10 17:50:58 +01:00
Laurent Destailleur
3f912ebfff FIX restore security event login/logout 2018-12-10 11:19:52 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
AXeL-dev
9dbb222a0a remove useless line of code 2018-11-07 18:27:41 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00