Laurent Destailleur
|
1dc8b44496
|
Merge branch '10.5' into 10.0p51
|
2020-10-17 18:51:25 +02:00 |
|
Laurent Destailleur
|
a0128786bd
|
Merge pull request #14786 from aspangaro/10.0p54
FIX Yogosha report 4483 (backport)
|
2020-09-20 17:42:02 +02:00 |
|
Alexandre SPANGARO
|
bacbe0b352
|
FIX Yogosha report 4483 (backport)
|
2020-09-19 04:15:33 +02:00 |
|
Alexandre SPANGARO
|
0943d3993b
|
FIX Yogosha report 4448 (backport)
|
2020-09-18 02:16:17 +02:00 |
|
Alexandre SPANGARO
|
8a84b245ca
|
FIX GETPOST on 'action' (backport)
|
2020-09-16 21:50:30 +02:00 |
|
Laurent Destailleur
|
5d2130a5ae
|
Fix SQL injection
|
2020-01-29 11:38:06 +01:00 |
|
Laurent Destailleur
|
e3edb37620
|
Fix escape db
|
2019-09-27 14:54:23 +02:00 |
|
Laurent Destailleur
|
73d60e6606
|
Look and feel v10
|
2019-06-05 12:16:55 +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
|
969e139d5c
|
Fix parameters of accessforbidden
|
2019-06-04 12:21: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
|
2b3c5902e6
|
Merge pull request #11281 from atm-maxime/fix_warning_resource
Fix : warnings in resource module
|
2019-06-02 12:17:19 +02:00 |
|
Laurent Destailleur
|
cb927847ab
|
Update dolresource.class.php
|
2019-06-02 12:16:12 +02:00 |
|
Maxime Kohlhaas
|
0372276a7b
|
Fix : warnings in resource module
|
2019-05-31 16:04:12 +02:00 |
|
Maxime Kohlhaas
|
6dd01e86e9
|
Fix : avoid warning and uniformize var use
|
2019-05-31 15:53:23 +02:00 |
|
Laurent Destailleur
|
5f23cf7e2a
|
CSS
|
2019-05-19 13:51:47 +02:00 |
|
Laurent Destailleur
|
11fea03074
|
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
|
2019-05-18 16:04:47 +02:00 |
|
florian HENRY
|
c519906c9e
|
fix scrunitizer
|
2019-05-18 15:46:49 +02:00 |
|
Laurent Destailleur
|
26d4875f8f
|
Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop
|
2019-05-18 02:27:23 +02:00 |
|
Maxime Kohlhaas
|
aed71be7f1
|
Fix resource delete with attached file
|
2019-05-18 00:47:32 +02:00 |
|
John BOTELLA
|
f296093f8d
|
fix travis
|
2019-05-10 15:52:46 +02:00 |
|
John BOTELLA
|
a60d4b3b52
|
Appli btn apply to links
|
2019-04-16 09:09:25 +02:00 |
|
Laurent Destailleur
|
a19cedfc13
|
Fix phpcs
|
2019-04-09 00:48:12 +02:00 |
|
Ion
|
b64cb4129f
|
Add resources tab for products/services
|
2019-04-07 23:52:49 +02:00 |
|
Laurent Destailleur
|
1b2826f476
|
Look and feel v10
|
2019-03-29 13:26:26 +01:00 |
|
Laurent Destailleur
|
f27f65e8bf
|
Responsive
|
2019-03-25 10:09:02 +01:00 |
|
Laurent Destailleur
|
b851911708
|
Dolibarize module ticket
|
2019-03-05 12:18:46 +01:00 |
|
Frédéric FRANCE
|
014f69850e
|
add visibility
|
2019-03-01 23:08:57 +01:00 |
|
Frédéric FRANCE
|
0022c4fe72
|
add visibility
|
2019-02-28 22:44:12 +01:00 |
|
Laurent Destailleur
|
3fa2680859
|
Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
|
2019-02-24 20:36:24 +01:00 |
|
Frédéric FRANCE
|
0ca5e6e275
|
replace html code by html5 in reception
|
2019-02-23 21:47:04 +01:00 |
|
Frédéric FRANCE
|
49c62a28a0
|
Update html.formresource.class.php
|
2019-02-23 18:58:23 +01:00 |
|
Laurent Destailleur
|
794e7302cd
|
FIX #10406
|
2019-02-15 16:39:21 +01:00 |
|
Laurent Destailleur
|
ced386fdca
|
Fix phpcs
|
2019-02-13 11:32:00 +01:00 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +01:00 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +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 |
|
Laurent Destailleur
|
a928f3a9d7
|
Update dolresource.class.php
|
2019-01-21 18:02:43 +01:00 |
|
florian HENRY
|
1da29fbed3
|
fix php warning
|
2019-01-21 10:12:13 +01:00 |
|
Laurent Destailleur
|
b9e544d291
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/functions.lib.php
htdocs/resource/list.php
|
2018-11-26 23:08:06 +01:00 |
|
Frédéric FRANCE
|
e8cac0df35
|
correct link and avoid warning in resource list
|
2018-11-21 14:06:06 +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 |
|
Laurent Destailleur
|
46db246273
|
Look and feel v9: Autofocus on create forms
|
2018-11-07 13:04:43 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
Regis Houssin
|
9589f69574
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_email
Conflicts:
htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
|
2018-10-30 18:29:28 +01:00 |
|