2
0
forked from Wavyzz/dolibarr
Commit Graph

120 Commits

Author SHA1 Message Date
Laurent Destailleur
97ed94fbda NEW Support html content for multiselect component. 2022-02-21 16:54:07 +01:00
Laurent Destailleur
c3bfd5caa4 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0
Conflicts:
	htdocs/adherents/type.php
	htdocs/asset/type.php
	htdocs/categories/edit.php
	htdocs/comm/action/card.php
	htdocs/compta/bank/card.php
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/class/extrafields.class.php
	htdocs/don/card.php
	htdocs/product/stock/card.php
	htdocs/projet/card.php
	htdocs/projet/tasks/task.php
	htdocs/user/group/card.php
2021-12-08 18:21:20 +01:00
Laurent Destailleur
f1dac82a53 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
	htdocs/adherents/card.php
	htdocs/categories/edit.php
	htdocs/contact/card.php
	htdocs/core/class/extrafields.class.php
	htdocs/product/stock/card.php
2021-12-08 17:56:05 +01:00
Quentin VIAL-GOUTEYRON
826bde0656 FIX set optional from post 2021-12-06 11:19:12 +01:00
Laurent Destailleur
cc54b7fe29 Fix dol_string_onlythesehtmlattributes 2021-03-25 00:03:09 +01:00
Frédéric FRANCE
6fcb7a96a1 code syntax categorie collab directory 2021-02-23 18:04:37 +01:00
Laurent Destailleur
00c284794c Merge pull request #15478 from StephaneLesage/catlist-icons-edit-delete
NEW: Add edit/delete action icons on categories list pages
2020-12-27 15:10:09 +01:00
StephaneLesage
7749138a81 Fix /categories/edit.php which used type parameter instead of object's type
Do not read type parameter
Security check, display error and exit
Get type from category object
2020-12-15 20:17:13 +01:00
StephaneLesage
574f1f0336 Add edit/delete action icons on categories list pages
+ classes for icons
+ format color as in latest commits
2020-12-15 19:50:27 +01:00
Laurent Destailleur
f56b46bd3e Debug v13 2020-12-09 17:14:35 +01:00
Laurent Destailleur
574919de52 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	htdocs/accountancy/bookkeeping/balance.php
	htdocs/adherents/class/subscription.class.php
	htdocs/compta/bank/categ.php
	htdocs/compta/facture/class/facture.class.php
	htdocs/core/boxes/box_task.php
	htdocs/core/class/commondocgenerator.class.php
	htdocs/core/class/interfaces.class.php
	htdocs/core/lib/project.lib.php
	htdocs/core/modules/modCategorie.class.php
	htdocs/expensereport/class/expensereport.class.php
	htdocs/fichinter/class/fichinterrec.class.php
	htdocs/fourn/class/fournisseur.commande.class.php
	htdocs/fourn/class/fournisseur.facture.class.php
	htdocs/install/repair.php
	htdocs/main.inc.php
	htdocs/product/price.php
	htdocs/projet/tasks/time.php
	htdocs/reception/card.php
2020-11-27 15:45:12 +01:00
Laurent Destailleur
ac3c129735 Clean code 2020-11-27 14:24:15 +01:00
Givriz
dca4cf5987 Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
2020-11-23 15:12:52 +01:00
Frédéric FRANCE
e9a9e9bbc2 Update edit.php 2020-10-31 18:55:24 +01:00
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-10-31 13:32:18 +00:00
Laurent Destailleur
f670f71df9 Fix scrutinizer 2020-10-27 19:14:03 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
772661c6ba clean code 2020-10-25 19:44:01 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
00e9a9a509 Sanitize color 2020-10-06 17:10:00 +02:00
Frédéric FRANCE
b41ac00b98 add new rule 2020-05-21 15:05:19 +02:00
Frédéric FRANCE
ae06b35c63 add new rule 2020-05-21 02:06:40 +02:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
2689f7515c Fix pb with colspan and extrafields.
Fix remove empty id
2019-11-16 14:38:05 +01:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
2b66282b61 NEW Code for extrafields uses the new array $extrafields->attributes 2019-10-06 14:41:52 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Frédéric FRANCE
8743b43fdb add oldcopy of category before updating 2019-03-06 18:01:18 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
84983140b6 Merge pull request #9896 from hregis/develop_email
FIX change my deprecated email
2018-11-11 17:35:35 +01:00
Laurent Destailleur
ad7ae76cd3 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-10 15:51:49 +01:00
Regis Houssin
5d1d77a966 FIX missing action "edit" for the hook 2018-11-09 10:32:08 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Philippe GRAND
de70bf983e standardize 2018-07-29 13:40:35 +02:00
Frédéric FRANCE
a0055174c4 loadlangs 2018-05-27 09:58:23 +02:00
Laurent Destailleur
be965bdbab Clean code 2018-04-13 13:28:48 +02:00
Laurent Destailleur
1521b0595b Clean code 2018-04-13 11:03:03 +02:00
Laurent Destailleur
0873260b8a USe second parameter in GETPOST 2017-09-15 10:50:50 +02:00
Laurent Destailleur
e93cefbbf0 FIX #6985 2017-06-11 10:37:58 +02:00
Laurent Destailleur
1820649175 Maxi debug of v6 2017-06-07 19:28:31 +02:00
Laurent Destailleur
68e333879f Fix var not sanitized 2017-05-16 13:27:32 +02:00
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
13f61f2a63 Fix css 2016-08-29 17:36:18 +02:00
Laurent Destailleur
d7e9c92144 Fix bad link on category
Fix cancel button on categories
Css enhancement.
2015-12-19 13:55:27 +01:00
philippe grand
67c9db6a51 [Qual] Uniformize code 2015-11-06 09:36:16 +01:00
philippe grand
f31ddc23aa [Qual] Uniformize code 2015-10-17 16:18:33 +02:00
Juanjo Menent
2fc0852492 Merge pull request #3594 from GPCsolutions/select_color
[Qual] Replaced deprecated select_color()
2015-09-26 08:45:24 +02:00
Raphaël Doursenaud
c0570a7f84 [Qual] Replaced deprecated select_color() 2015-09-24 20:40:40 +02:00
Raphaël Doursenaud
631ee83745 [Qual] Replaced deprecated print_fiche_titre() 2015-09-24 18:34:58 +02:00