3112 Commits

Author	SHA1	Message	Date
Laurent Destailleur	dacf896f80	FIX Can read salary if permission + user under hierarchy	2020-02-18 23:44:36 +01:00
oscim	b0016764c4	Update bank.php ... For authorize line manager to see wages paid	2020-02-18 22:59:56 +01:00
Laurent Destailleur	b9e522114e	Merge pull request #13123 from oscim/patch-21 ... Update bank.php	2020-02-18 22:56:45 +01:00
Laurent Destailleur	97b4f68e48	Update bank.php	2020-02-18 22:56:37 +01:00
Laurent Destailleur	a6b0fec90b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/exports/class/export.class.php	2020-02-17 12:35:34 +01:00
Laurent Destailleur	504a67daee	FIX duplicate class name into some log lines	2020-02-17 12:34:00 +01:00
oscim	d1652ee9e3	Update bank.php ... For authorize line manager to see wages paid	2020-02-17 11:18:34 +01:00
Laurent Destailleur	52aebce789	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-16 18:16:05 +01:00
Laurent Destailleur	7cdfc3ca65	FIX HTML Injection	2020-02-16 12:55:32 +01:00
Scrutinizer Auto-Fixer	17010478ba	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-13 09:44:08 +00:00
Laurent Destailleur	7931734ecb	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/modUser.class.php	2020-02-12 20:30:20 +01:00
Laurent Destailleur	e74df397eb	FIX #13094	2020-02-12 17:28:18 +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	8645fd8946	FIX CVE-2019–17223 FIX #13053	2020-02-09 18:28:57 +01:00
Laurent Destailleur	716f765ce1	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/expedition/doc/pdf_espadon.modules.php	2020-02-08 16:00:06 +01:00
Laurent Destailleur	85c4013a0d	Update card.php	2020-02-08 14:52:02 +01:00
Regis Houssin	45ba23da3e	FIX #13028	2020-02-07 08:53:05 +01:00
Laurent Destailleur	8ab96447c7	Page of permissions is cleaner now	2020-02-05 21:31:28 +01:00
Laurent Destailleur	1875b6a49b	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/lib/company.lib.php htdocs/core/lib/security2.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/expedition/doc/pdf_espadon.modules.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/livraison/doc/pdf_typhon.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php htdocs/core/modules/supplier_order/pdf/pdf_cornas.modules.php htdocs/core/modules/supplier_order/pdf/pdf_muscadet.modules.php htdocs/core/modules/supplier_payment/doc/pdf_standard.modules.php htdocs/core/modules/supplier_proposal/doc/pdf_aurore.modules.php	2020-02-05 14:53:47 +01:00
Laurent Destailleur	c015707cbc	Fix Only dolibarr logos are in root of theme	2020-02-05 14:14:59 +01:00
Laurent Destailleur	37617bbce8	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-03 03:48:27 +01:00
Laurent Destailleur	b3a50bd4b0	FIX #12874	2020-02-03 03:47:45 +01:00
Laurent Destailleur	fc47fa5ec3	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/projet/element.php	2020-02-03 02:58:45 +01:00
Laurent Destailleur	8098456f67	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-02-03 02:52:46 +01:00
Laurent Destailleur	90cde17bdb	FIX #12986	2020-02-03 02:48:05 +01:00
Scrutinizer Auto-Fixer	9781c20f84	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-02-02 18:34:09 +00:00
Scrutinizer Auto-Fixer	5fda829023	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2020-01-30 00:48:28 +00:00
Laurent Destailleur	be2d6494a7	FIX #12908	2020-01-28 21:23:05 +01:00
Laurent Destailleur	d3411a79ef	Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop	2020-01-22 14:11:44 +01:00
Laurent Destailleur	0c666ee73b	Fix reponsive	2020-01-22 12:46:01 +01:00
Laurent Destailleur	7a0bff06b9	Fix reponsive	2020-01-22 12:44:10 +01:00
Laurent Destailleur	3f79c00542	Merge branch 'develop' into actioncomm_category	2020-01-15 14:21:06 +01:00
Laurent Destailleur	9e6fb7b2f1	Look and feel v11	2020-01-07 14:55:31 +01:00
Frédéric FRANCE	90235d0528	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-31 13:57:40 +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	e8db3a2aa0	Fix look and feel v11	2019-12-19 10:17:20 +01:00
Laurent Destailleur	f44b85f557	Fix $_SESSION['newtoken'] must be newToken()	2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer	455178ff73	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-18 14:20:36 +00:00
Laurent Destailleur	838633d0de	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/system/filecheck.php htdocs/api/class/api_setup.class.php htdocs/compta/facture/card.php htdocs/compta/stats/index.php htdocs/core/actions_massactions.inc.php htdocs/install/upgrade2.php htdocs/loan/card.php htdocs/loan/document.php htdocs/loan/info.php htdocs/loan/note.php htdocs/loan/schedule.php htdocs/product/list.php htdocs/ticket/card.php htdocs/user/class/user.class.php	2019-12-14 14:53:49 +01:00
Laurent Destailleur	8b57e9fcf0	Merge pull request #12697 from bb2a/patch-7 ... Full name in uppercase on creation and modification	2019-12-14 14:00:09 +01:00
Frédéric FRANCE	57055bad03	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-13 14:36:00 +01:00
stickler-ci	31b09f433f	Fixing style errors.	2019-12-12 16:29:11 +00:00
Anthony Berton	68a1b12fba	Update user.class.php	2019-12-12 17:27:24 +01:00
Frédéric FRANCE	12f84d8254	doxygen	2019-12-11 23:04:27 +01:00
Frédéric FRANCE	66805a502a	doxygen	2019-12-11 22:53:57 +01:00
Frédéric FRANCE	307bad1d2a	doxygen todo	2019-12-11 19:11:13 +01:00
Laurent Destailleur	2fd6c690c0	Merge pull request #12632 from atm-florianm/FIX_10.0_restore_filter_values_when_returning_to_list_from_card ... FIX 10.0: add URL param "restore_last_search_values=1" to all backlinks pointing to lists	2019-12-09 15:59:55 +01:00
Frédéric FRANCE	6366a2a606	doxygen	2019-12-06 18:05:16 +01:00
Laurent Destailleur	22f575dad0	Merge pull request #12633 from atm-lena/FIX_getrights_request ... FIX getrights() request	2019-12-06 16:22:47 +01:00
Frédéric FRANCE	d9bfa62367	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-05 21:47:42 +01:00
atm-lena	486f598067	FIX getrights() request	2019-12-05 16:11:12 +01:00
Florian Mortgat	3f6715a377	FIX: add URL param "restore_last_search_values=1" to all backlinks that point to a list	2019-12-05 15:34:41 +01:00
Laurent Destailleur	06de7f968f	Fix class not found	2019-12-05 14:06:03 +01:00
Frédéric FRANCE	4c5c6b6ff1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-03 17:56:43 +01:00
Laurent Destailleur	41a176ce72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/remx.php htdocs/core/modules/modStripe.class.php htdocs/product/stock/replenish.php htdocs/stripe/payout.php	2019-12-03 13:58:15 +01:00
Laurent Destailleur	eb5a2bd1a5	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/expensereport/card.php htdocs/user/card.php	2019-12-03 13:52:42 +01:00
Scrutinizer Auto-Fixer	36a74cd160	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-12-03 10:17:29 +00:00
John Botella	4a33ee60f8	Fix user card : use comma in amounts inputs	2019-12-02 10:34:14 +01:00
Laurent Destailleur	92070fa491	Fix name of variable $trigger_name into $triggersendname	2019-12-02 09:38:16 +01:00
Frédéric FRANCE	25ed2b930f	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-12-01 16:10:37 +01:00
ATM John BOTELLA	773f823748	factoring token usage	2019-12-01 10:20:11 +01:00
Laurent Destailleur	d58bb5f66b	Fix link to user	2019-11-28 16:16:55 +01:00
ptibogxiv	825349e07e	Update api_users.class.php	2019-11-27 16:04:52 +01:00
stickler-ci	bba4ed02d2	Fixing style errors.	2019-11-26 20:36:30 +00:00
ptibogxiv	bc1f9f5aaa	Update api_users.class.php	2019-11-26 21:34:45 +01:00
ptibogxiv	27d6071a73	NEW add list of group and object group API	2019-11-26 21:33:42 +01:00
Frédéric FRANCE	4c4ae5b6e1	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-26 08:10:40 +01:00
Laurent Destailleur	14450d8b79	psr	2019-11-22 15:21:21 +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
Frédéric FRANCE	d182eee4bf	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-19 23:26:00 +01:00
Laurent Destailleur	5d7a1f1265	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/contact/card.php htdocs/core/class/extrafields.class.php htdocs/langs/en_US/stocks.lang	2019-11-19 19:02:14 +01:00
florian HENRY	010219bf09	fix title pasge linked files user	2019-11-18 19:47:34 +01:00
Frédéric FRANCE	2e5f539b2a	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-18 17:45:52 +01:00
Scrutinizer Auto-Fixer	1648fc142e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-16 22:24:29 +00:00
Laurent Destailleur	e7276f9044	Fix scrutinizer error	2019-11-16 23:22:28 +01:00
Laurent Destailleur	2689f7515c	Fix pb with colspan and extrafields. ... Fix remove empty id	2019-11-16 14:38:05 +01:00
Frédéric FRANCE	6784ea9fae	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-16 09:21:57 +01:00
Laurent Destailleur	07be51c2fc	Merge pull request #12447 from hregis/develop_mc ... FIX better look compatibility with Multicompany	2019-11-16 00:49:37 +01:00
Laurent Destailleur	8a5e1a5a36	Merge pull request #12440 from OPEN-DSI/new-api-users-get-info ... NEW get user connected informations in REST API	2019-11-16 00:44:41 +01:00
Laurent Destailleur	81aed6a1f7	Merge pull request #12442 from frederic34/patch-7 ... doxygen	2019-11-16 00:39:40 +01:00
Regis Houssin	bb8a4e9efc	FIX better look compatibility with Multicompany	2019-11-15 09:02:21 +01:00
Laurent Destailleur	1f5bea01f5	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/core/lib/functions.lib.php htdocs/core/modules/commande/doc/pdf_einstein.modules.php htdocs/core/modules/commande/doc/pdf_eratosthene.modules.php htdocs/core/modules/facture/doc/pdf_crabe.modules.php htdocs/core/modules/facture/doc/pdf_sponge.modules.php htdocs/core/modules/propale/doc/pdf_azur.modules.php htdocs/core/modules/propale/doc/pdf_cyan.modules.php htdocs/fourn/class/fournisseur.product.class.php htdocs/product/fournisseurs.php htdocs/user/card.php	2019-11-14 21:30:16 +01:00
Frédéric FRANCE	e73202c2af	Update user.class.php	2019-11-14 18:47:16 +01:00
Frédéric FRANCE	91eb6eb7d7	Update user.class.php	2019-11-14 18:44:18 +01:00
Frédéric FRANCE	1936b11db8	doxygen	2019-11-14 18:40:30 +01:00
VESSILLER	4ea3fe7609	NEW get user connected informations in REST API	2019-11-14 17:57:29 +01:00
Laurent Destailleur	f7ab1498a7	FIX Advisory ID: usd20190053	2019-11-14 17:00:02 +01:00
Scrutinizer Auto-Fixer	ddcc14dc16	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-14 11:09:15 +00:00
Frédéric FRANCE	a3e092b227	Merge remote-tracking branch 'upstream/develop' into actioncomm_category	2019-11-14 09:21:26 +01:00
Laurent Destailleur	171b94fc5c	Merge pull request #12429 from Dolibarr/scrutinizer-patch-5 ... Scrutinizer Auto-Fixes	2019-11-14 08:50:24 +01:00
Frédéric FRANCE	446c66da62	use class CONST	2019-11-14 08:15:39 +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
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
Scrutinizer Auto-Fixer	df664e790b	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-11 23:15:34 +00:00
Scrutinizer Auto-Fixer	2ecfe41810	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-08 09:53:31 +00:00
Scrutinizer Auto-Fixer	0b406172fd	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2019-11-07 11:59:59 +00:00
Frédéric FRANCE	35751a80ab	100% centpercent	2019-11-05 21:24:41 +01:00
Laurent Destailleur	94bd0f71d9	Fix pb with permission	2019-11-05 19:41:30 +01:00
Laurent Destailleur	1aef1c60dd	Merge pull request #11867 from frederic34/socialnetworks ... NEW add socialnetworks dictionary	2019-11-04 21:10:22 +01:00
Laurent Destailleur	aeb2361d2d	Merge pull request #12324 from frederic34/patch-13 ... replace societe_id by socid	2019-11-04 20:57:43 +01:00
Frédéric FRANCE	88ad997eec	Update home.php	2019-11-04 20:29:33 +01:00
Frédéric FRANCE	f6aa9bf220	Update hierarchy.php	2019-11-04 20:28:10 +01:00
Frédéric FRANCE	d59b0a33f3	Fix external/internal status in user tooltip list	2019-11-04 20:16:34 +01:00
Laurent Destailleur	ec8bd6327d	Fix css	2019-11-04 18:53:46 +01:00
Frédéric FRANCE	872f58f261	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-11-03 21:48:24 +01:00
Laurent Destailleur	13c42913d9	Trans	2019-11-02 15:20:35 +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
Laurent Destailleur	58ffb73627	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-11-02 12:59:49 +01:00
Laurent Destailleur	45c77b4560	Renaming some libelle into label	2019-11-02 12:59:38 +01:00
Laurent Destailleur	25e64b0610	Merge branch 'develop' into socid	2019-11-02 12:01:06 +01:00
Laurent Destailleur	68691ddd8a	Merge pull request #12265 from grandoc/new_branch_30_10_2019 ... add comment	2019-11-02 11:49:28 +01:00
Laurent Destailleur	f9031cdbfd	Clean code	2019-11-02 11:36:48 +01:00
Frédéric FRANCE	77d4ca81dc	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-02 09:14:15 +01:00
Laurent Destailleur	cea2c3a9f4	Look and feel v11	2019-11-01 23:58:14 +01:00
Frédéric FRANCE	dbed10a701	Merge remote-tracking branch 'upstream/develop' into socid	2019-11-01 21:39:20 +01:00
Laurent Destailleur	e3b5be7475	All properties 'libstatut', 'labelstatut', 'labelstatus' were renamed ... into 'labelStatus'. All properties 'labelstatusshort' and 'labelstatut_short' were renamed into 'labelStatusShort'.	2019-11-01 12:52:03 +01:00
Laurent Destailleur	68a4ddceed	Look and feel v11	2019-10-31 23:29:17 +01:00
Frédéric FRANCE	e93aaa2a75	replace deprecated user->societe_id by user->socid	2019-10-31 20:46:31 +01:00
Frédéric FRANCE	f7747ed00a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-30 20:06:43 +01:00
Philippe GRAND	1a0723c1cd	add some comment	2019-10-30 10:13:57 +01:00
Laurent Destailleur	488edec3a8	Merge pull request #12226 from ptibogxiv/patch-271 ... NEW add office phone & job on user tooltips	2019-10-30 03:11:28 +01:00
Frédéric FRANCE	16f58f1eee	clean indent	2019-10-27 10:38:52 +01:00
ptibogxiv	6f52ae80fe	Update user.class.php	2019-10-26 15:01:40 +02:00
ptibogxiv	49f5e54a8b	Update user.class.php	2019-10-25 18:10:04 +02:00
ptibogxiv	7c8efc741e	Update user.class.php	2019-10-25 17:20:09 +02:00
Frédéric FRANCE	a43e6f96b5	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-25 08:12:54 +02:00
Laurent Destailleur	8858c3e769	Look and feel v11	2019-10-23 21:27:29 +02:00
Laurent Destailleur	b88968520b	Move code of extrafields to the new architecture	2019-10-22 17:08:37 +02:00
Frédéric FRANCE	f4540dddb8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-17 20:24:04 +02:00
Laurent Destailleur	005b1b12c4	Work on sort of permission per family+module	2019-10-17 19:33:06 +02:00
Laurent Destailleur	de396dc9b3	Clean code for order of modules	2019-10-17 19:21:30 +02:00
Laurent Destailleur	87ec1de78e	Start to work on solution to sort permissions by module	2019-10-17 18:43:07 +02:00
Frédéric FRANCE	e75f7d448c	Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen	2019-10-16 20:00:01 +02:00
Laurent Destailleur	e07e01580d	Replace deprecated code with new one	2019-10-16 03:34:32 +02:00
Frédéric FRANCE	d1d9b1ed85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-15 09:39:57 +02:00
Frédéric FRANCE	0ae1e8c2a9	Update api_users.class.php	2019-10-13 06:17:57 +02:00
Frédéric FRANCE	f6a2fd6eb8	Update card.php	2019-10-13 06:08:32 +02:00
Frédéric FRANCE	d9ba09bec1	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-12 19:02:24 +02:00
Laurent Destailleur	51383ce6af	FIX Reset of password can use email like the login.	2019-10-11 18:42:07 +02:00
Frédéric FRANCE	03bbfc6ad9	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-10 23:24:50 +02:00
Laurent Destailleur	aebae5ff83	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/margins.lang htdocs/user/class/user.class.php	2019-10-10 10:37:17 +02:00
Frédéric FRANCE	f253315c8d	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 18:30:58 +02:00
Laurent Destailleur	43a70e5548	Clean code to use the new $extrafields->attributes array	2019-10-08 09:28:50 +02:00
Laurent De Coninck	091df082fc	fix the access of the bank account of one user ... There are 3 ways to access this tab : 1. If the module holiday is enabled 2. If the module holidays is enabled 3. If the module expense report is enabled More over that, the application checks if the user can access the bank account of the selected user. The application does that twice (logical ^^), first to know if the tab has to be displayed or not. Second time, when you arrive on the page /user/bank.php to know if you have access (eg. if you type the url directly). In this second check, the check of the expense report module was missing (added by this PR). This caused the following issue: the tab was visible but when the user clicked on itn, he received an error as he cannot access the page.	2019-10-08 08:11:29 +02:00
Frédéric FRANCE	b78187c1eb	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-08 00:07:27 +02:00
Laurent Destailleur	839929f764	FIX #12026	2019-10-07 14:16:47 +02:00
Laurent Destailleur	0bd545e1ca	Merge pull request #12026 from oscim/patch-6 ... Fix error in triggers process	2019-10-07 14:14:36 +02:00
Laurent Destailleur	2bb55200f7	Clean user card	2019-10-07 13:46:13 +02:00
Laurent Destailleur	76aef85ee4	Merge pull request #12015 from atm-maxime/new_validators ... NEW expense request and holiday validator fields	2019-10-07 13:31:20 +02:00
Laurent Destailleur	6c1c008d09	FIX Look and feel v10	2019-10-06 16:28:10 +02:00
Frédéric FRANCE	ec8569dd85	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-06 15:56:21 +02:00
Laurent Destailleur	866dcf18fe	Look and feel v11	2019-10-06 15:34:22 +02:00
Laurent Destailleur	b83d4eb936	FIX Look and feel v10	2019-10-06 14:57:34 +02:00
Laurent Destailleur	2b66282b61	NEW Code for extrafields uses the new array $extrafields->attributes	2019-10-06 14:41:52 +02:00
stickler-ci	1047a8ea0f	Fixing style errors.	2019-10-05 20:25:17 +00:00
Maxime Kohlhaas	2068692f40	Merge branch 'develop' of github.com:atm-maxime/dolibarr into new_validators	2019-10-05 22:25:06 +02:00
Maxime Kohlhaas	e70b487c34	Add info about validators saying default is supervisor	2019-10-05 22:22:55 +02:00
Frédéric FRANCE	98023353fe	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-03 17:21:31 +02:00
oscim	d368bc1b6a	Update user.class.php ... actually the create_from_member method does not require this change	2019-10-03 15:58:40 +02:00
Laurent Destailleur	b60ee4c18c	css	2019-10-03 09:58:49 +02:00
oscim	9f2ac7cae3	Fix error in triggers process ... If methode create_from_contact is called; In process this method containt call create methode, but trigger by action USER_CREATE is called twice. the call to the create method should not trigger triggers same for the create_from_members method	2019-10-03 09:47:06 +02:00
Frédéric FRANCE	3afb4355a8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-02 18:59:18 +02:00
Laurent Destailleur	d8a8c4fbe6	Look and feel v11. Picto are fontawesome.	2019-10-02 18:36:36 +02:00
Maxime Kohlhaas	6d4f3f308e	NEW expense request and holiday validator fields	2019-10-02 08:43:40 +02:00
Frédéric FRANCE	aca9d92db8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 22:03:33 +02:00
Frédéric FRANCE	2ac908ffcf	work on migration script	2019-10-01 19:59:49 +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	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Alexandre SPANGARO	aec50d3ac9	NEW Add fa_icon on load_fiche_titre	2019-09-30 10:14:55 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
Laurent Destailleur	6858dce344	Rename table for categorie of warehouses	2019-09-27 13:28:28 +02:00
Frédéric FRANCE	03086026b8	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-27 08:06:13 +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	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	e52788eb75	Fix xss	2019-09-18 14:31:03 +02:00
Laurent Destailleur	771104bc68	Fix XSS	2019-09-18 14:25:53 +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
Laurent Destailleur	421631f2be	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-15 15:53:45 +02:00
Laurent Destailleur	27e3a2cb1d	Update perms.php	2019-09-15 15:32:43 +02:00
Frédéric FRANCE	6444c7378f	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-14 16:40:23 +02:00
Laurent Destailleur	d380ef1812	Update usergroup.class.php	2019-09-14 16:37:07 +02:00
Frédéric FRANCE	5731f74025	work on user	2019-09-14 12:00:39 +02:00
Frédéric FRANCE	1cd59cc16a	work on user	2019-09-14 11:26:31 +02:00
Frédéric FRANCE	cd109d04cd	add function	2019-09-12 20:44:24 +02:00
Frédéric FRANCE	fa44af1df8	work on user	2019-09-12 20:03:28 +02:00
Frédéric FRANCE	e4a0de245a	work on user	2019-09-12 18:41:26 +02:00
Frédéric FRANCE	34f928556d	work on user	2019-09-12 18:32:47 +02:00
Frédéric FRANCE	62922884fe	specimens	2019-09-12 18:12:28 +02:00
Frédéric FRANCE	9f3c54e5a5	definitions	2019-09-12 18:04:24 +02:00
Abbes Bahfir	4098ecfe17	Merge branch 'abb100077' of github.com:bafbes/dolibarr into abb100077	2019-09-12 11:30:14 +01:00
Abbes Bahfir	195ac8e8f6	fix : Tests for attributes exsitence in Use of posixAccount and posixGroup objectclass for users and groups in LDAP	2019-09-12 11:24:30 +01:00
Regis Houssin	60e85136df	FIX an admin can not access his own permissions after enabling advanced ... permissions	2019-09-12 08:48:55 +02:00
stickler-ci	e5878c105a	Fixing style errors.	2019-09-11 21:48:17 +00:00
Abbes Bahfir	5183a1ec7a	New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP	2019-09-11 22:45:52 +01:00
Laurent Destailleur	529dd05226	Replace deprecated code	2019-09-06 10:53:05 +02:00
Laurent Destailleur	da3d230182	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .stickler.yml htdocs/takepos/invoice.php	2019-09-03 17:34:49 +02:00
Laurent Destailleur	9c6cbfeb7f	Merge pull request #11774 from ptibogxiv/patch-250 ... FIX logout redirect to takepos.php	2019-09-03 15:10:28 +02:00
Laurent Destailleur	a040d7eccc	Fix bad link	2019-09-02 04:39:45 +02:00
Laurent Destailleur	621dd83a7f	Fix bad link	2019-09-02 04:38:36 +02:00
Laurent Destailleur	ac7d0b5eb6	Fix scrutinizer	2019-09-02 04:12:48 +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	7942c5edf7	Fix js injection	2019-08-30 16:22:24 +02:00
ptibogxiv	4cf2c835c6	Update logout.php	2019-08-28 19:48:45 +02:00
Laurent Destailleur	54203dda1f	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/modules.php	2019-08-21 16:25:48 +02:00
Laurent Destailleur	15a765a79a	Fix responsive	2019-08-19 13:28:24 +02:00
Laurent Destailleur	d21e557100	FIX #11671 CVE-2019-15062	2019-08-17 22:16:27 +02:00
Laurent Destailleur	a746075dbe	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2019-08-16 17:04:28 +02:00
Laurent Destailleur	9692ea5faf	FIX #11671 CVE-2019-15062	2019-08-16 16:41:53 +02:00
Laurent Destailleur	8ad2081555	NEW Can select website templates from available default templates	2019-08-12 22:19:24 +02:00
John Botella	4aeaa580ea	Add color blind option	2019-08-07 11:11:47 +02:00
Laurent Destailleur	d7a41c6b72	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/langs/en_US/admin.lang	2019-08-01 12:54:27 +02:00
Laurent Destailleur	5eb8f05061	FIX #11584	2019-08-01 12:23:02 +02:00
Alexandre SPANGARO	0af1206892	Merge branch 'develop' into 11.0_salaries	2019-07-19 23:11:06 +02:00
Alexandre SPANGARO	9ab0734415	NEW Extrafields on salaries	2019-07-19 23:08:24 +02:00
Laurent Destailleur	50480bf517	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/opensurvey/index.php	2019-07-18 18:23:24 +02:00
Laurent Destailleur	e976195777	Fix missing key for api	2019-07-18 14:08:15 +02:00
Laurent Destailleur	ee109ac568	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-07-05 17:44:50 +02:00
Laurent Destailleur	575dce2dff	Fix css	2019-07-05 12:17:36 +02:00
Laurent Destailleur	fa476b4994	Properties ->libelle_incoterms were renamed into ->label_incoterms	2019-06-25 13:00:02 +02:00
Laurent Destailleur	609eefaf08	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:36:08 +02:00
Laurent Destailleur	28024d5cd1	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 ... Conflicts: htdocs/core/actions_massactions.inc.php	2019-06-24 16:28:48 +02:00
Laurent Destailleur	22b91f3693	Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-06-22 13:28:44 +02:00
Laurent Destailleur	0f808114e5	Sync transifex ... Fix CSS for Left To Right Languages	2019-06-22 13:18:33 +02:00
John Botella	e5298d0666	Fix send mail ancor	2019-06-21 11:20:04 +02:00
Laurent Destailleur	4308f48cad	Merge branch 'develop' into MissingHook	2019-06-20 03:04:32 +02:00
Laurent Destailleur	b4e47d289b	Code comment	2019-06-20 02:43:56 +02:00
Nicolas ZABOURI	2e4db8c83c	Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook	2019-06-19 08:39:05 +02:00
Laurent Destailleur	663998bab1	Fix scrutinizer errors	2019-06-18 20:15:04 +02:00
Laurent Destailleur	525598f6aa	Fix scrutinizer warnings	2019-06-18 20:01:28 +02:00
Laurent Destailleur	8835b49f3f	Debug the accounting-file tool	2019-06-18 14:30:13 +02:00
ICstage	820c420ae5	FIX Missing hooks	2019-06-18 14:07:52 +02:00
Laurent Destailleur	969e139d5c	Fix parameters of accessforbidden	2019-06-04 12:21:27 +02:00
Laurent Destailleur	2900f8828a	Merge branch 'develop' of https://github.com/dolibarr/dolibarr into develop	2019-05-19 13:52:28 +02:00
Laurent Destailleur	5f23cf7e2a	CSS	2019-05-19 13:51:47 +02:00
Laurent Destailleur	3109f8e07a	Merge pull request #11217 from inoveaconseil/FIX11135 ... FIX #11135	2019-05-19 02:23:49 +02:00
Laurent Destailleur	4b3d0ed50c	Update user.class.php	2019-05-19 02:21:42 +02:00
Nicolas ZABOURI	61c17f8d0f	FIX #11135	2019-05-19 02:06:37 +02:00
Laurent Destailleur	c6ccb92a51	Fix table shown when there is no perm ... Fix edit admin status of another admin	2019-05-19 01:41:42 +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	fcfabd40af	fix missing cell into perms screen	2019-05-17 18:10:40 +02:00
Laurent Destailleur	a664cd6461	Fix check when uploading a non image as user photo	2019-05-10 20:09:41 +02:00
Laurent Destailleur	3def11d5c9	Standardize translation	2019-05-10 19:32:46 +02:00
Regis Houssin	10da976b93	FIX try to fix phpcs error	2019-05-10 16:37:03 +02:00
Regis Houssin	9a6029b1d9	FIX disable phpcs	2019-05-10 16:12:16 +02:00
Regis Houssin	2ce96290eb	FIX broken feature !!	2019-05-10 11:50:01 +02:00
Regis Houssin	de84f12b24	FIX broken feature with ldap trigger !!!	2019-05-10 11:47:44 +02:00
Laurent Destailleur	68d438b697	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/fourn/commande/card.php htdocs/user/class/user.class.php	2019-04-25 01:50:48 +02:00
Regis Houssin	740fddcd42	FIX missing global $user	2019-04-24 08:22:00 +02:00
Regis Houssin	41a82023e3	FIX missing compatibility with multicompany	2019-04-24 08:17:10 +02:00
ATM john	292d9c38a5	Appli function to links	2019-04-15 00:21:58 +02:00
Laurent Destailleur	fae2983c2a	Merge branch 'develop' into new_user_hr_fields	2019-04-11 18:27:58 +02:00
Laurent Destailleur	05c14e4f2f	Look and feel v10	2019-04-10 15:54:29 +02:00
Laurent Destailleur	7b01e76d2b	Fix doxygen	2019-04-08 16:04:15 +02:00
Laurent Destailleur	fad2fa48dd	NEW Introduce a config parameter $dolibarr_main_instance_unique_id	2019-04-07 15:44:17 +02:00
Laurent Destailleur	fff9b7db9d	Fix doxygen	2019-04-04 18:33:12 +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	c1df84a165	Fix phpcs	2019-03-22 13:17:26 +01:00
Philippe GRAND	69906b9888	translation	2019-03-22 09:38:04 +01:00
Laurent Destailleur	6e4d6c94dd	FIX phpcs	2019-03-21 20:17:31 +01:00
Laurent Destailleur	ee4150665e	Fix phpcs	2019-03-21 20:15:19 +01:00
Laurent Destailleur	5693fbfe97	Merge pull request #10898 from grandoc/new_branch_21_03_2019 ... add some comments	2019-03-21 18:29:11 +01:00
Mathieu Pellegrin	e0d89101df	#9480 Password link broken if login contains space	2019-03-21 18:25:00 +01:00
Laurent Destailleur	6c2bd13b58	Merge pull request #10895 from mpellegrin/develop ... #9480 Password link broken if login contains space	2019-03-21 18:24:21 +01:00
Philippe GRAND	efc393e13c	add some comments	2019-03-21 15:19:01 +01:00
Philippe GRAND	2ad649eaea	add some comments	2019-03-21 15:18:05 +01:00
Laurent Destailleur	5d21547854	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/product/price.php htdocs/user/perms.php	2019-03-21 12:20:24 +01:00
Mathieu Pellegrin	e971018c71	#9480 Password link broken if login contains space	2019-03-21 12:06:43 +01:00
Laurent Destailleur	3c1d7bfbf0	FIX counter of permissions in badge was wrong	2019-03-19 16:30:40 +01:00
Laurent Destailleur	0c101f3d1b	Fix translation	2019-03-18 11:21:51 +01:00
Philippe GRAND	60e8c3d7e3	update with html5 compliant code	2019-03-17 10:30:16 +01:00
Philippe GRAND	ee675645c1	update with html5 compliant code	2019-03-17 10:29:00 +01:00
Philippe GRAND	e8c98f91cf	update with html5 compliant code	2019-03-17 10:27:54 +01:00
Maxime Kohlhaas	0a0e29a089	New fields on user object for hrm purpose	2019-03-16 08:53:06 +01:00
Frédéric FRANCE	f283782445	change visibility	2019-03-04 19:57:46 +01:00
Laurent Destailleur	8fce6e5e31	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/comm/card.php htdocs/core/modules/mailings/xinputfile.modules.php htdocs/fourn/facture/card.php	2019-03-02 19:13:37 +01:00
Laurent Destailleur	40e923ec85	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/core/modules/modAgenda.class.php	2019-03-02 19:07:14 +01:00
Frédéric FRANCE	bd2e541fd6	add visibility	2019-03-01 18:28:51 +01:00
Frédéric FRANCE	c5d252fa2e	Merge remote-tracking branch 'origin/Squiz.Scope.MethodScope.Missing' into Squiz.Scope.MethodScope.Missing	2019-02-27 17:56:13 +01:00
Laurent Destailleur	b3fb0eaf5b	Merge branch 'develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 15:48:31 +01:00
Laurent Destailleur	ee3dd016e7	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-02-27 14:47:23 +01:00
Frédéric FRANCE	49cbaed569	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 14:21:15 +01:00
Laurent Destailleur	c4e96e9f74	Fix language	2019-02-27 13:48:13 +01:00
Laurent Destailleur	727c4b787b	Merge pull request #10617 from wdammak/patch-29 ... NEW Add Default Warehouse to user record (if module stock is on)	2019-02-27 13:38:55 +01:00
Laurent Destailleur	e873608d84	Update card.php	2019-02-27 13:37:53 +01:00
Frédéric FRANCE	5a4ac82880	Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing	2019-02-27 08:23:29 +01:00
Frédéric FRANCE	1c07006015	wip	2019-02-25 21:36:27 +01:00
Regis Houssin	6fa016dc85	FIX wrong feature2 when user rights "group_advance" is used	2019-02-25 10:44:22 +01:00
Alexandre SPANGARO	2da1447a0b	Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin	2019-02-25 09:12:04 +01:00
Alexandre SPANGARO	acb9cfe07a	NEW: Add LinkedIn field	2019-02-25 09:07:58 +01:00
Regis Houssin	0ea7bf3b0b	FIX could not create several superadmin in transversal mode	2019-02-24 08:21:56 +01:00
Frédéric FRANCE	0255336549	fix html5 user	2019-02-16 10:29:15 +01:00
wdammak	8390ed346b	Hidden for users not using the stock module	2019-02-15 17:12:39 +01:00
wdammak	63ffb7a873	Fix backtopage url	2019-02-15 06:04:58 +01:00
wdammak	03c5e040c5	Fix backtopage url	2019-02-15 05:48:56 +01:00
wdammak	fd4f82b1b7	Fix conflict	2019-02-15 05:32:01 +01:00
wdammak	4dc4a25bb5	Add Default Warehouse to user card	2019-02-15 05:24:25 +01:00
wdammak	d31aadf5da	Add Default Warehouse to user	2019-02-15 05:20:33 +01:00
Laurent Destailleur	f1500281ef	Fix phpcs	2019-02-12 19:00:50 +01:00
Frédéric FRANCE	1e43f8e54a	PEAR FunctionCallSignature	2019-02-10 10:45:49 +01:00
Frédéric FRANCE	970392adb8	Merge remote-tracking branch 'upstream/develop' into psr2squizwhite	2019-02-03 22:41:57 +01:00
Laurent Destailleur	57f81217ee	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/localtax/index.php htdocs/compta/tva/index.php	2019-02-03 21:14:44 +01:00
Laurent Destailleur	4d41b1b33c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-02-03 19:45:45 +01:00
Laurent Destailleur	a6dde3d6bd	Merge branch 'develop' into nospaceaftercomma	2019-02-03 19:27:16 +01:00
Laurent Destailleur	bd2c7092a4	Update user.class.php	2019-02-03 19:25:11 +01:00
Frédéric FRANCE	e3a5d2b839	get return array not int	2019-02-03 16:39:48 +01:00
Frédéric FRANCE	80a12fcd1c	psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent	2019-02-03 14:29:45 +01:00
gauthier	bfc7265cbc	FIX : better test on fetch	2019-01-31 11:53:10 +01:00
gauthier	0c4e5a6487	FIX : better test	2019-01-31 09:30:07 +01:00
Laurent Destailleur	648eea3a70	Merge branch 'develop' into nospaceaftercomma	2019-01-30 16:00:11 +01:00
gauthier	3477cf6bd3	FIX : must fetch member in current entity	2019-01-29 18:01:28 +01:00
Alexandre SPANGARO	cc88c4f8ff	Move my email to the new one	2019-01-28 21:39:22 +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	ecc30b8ffe	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/card.php	2019-01-27 18:27:58 +01:00
Laurent Destailleur	7a7fd657ed	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2019-01-27 18:13:20 +01:00
Laurent Destailleur	a78db45178	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-27 18:12:36 +01:00
Laurent Destailleur	d1befcb1ba	Merge pull request #10427 from EuskalMoneta/develop ... NEW Get the list of groups of a user with the REST API.	2019-01-27 17:58:09 +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
Xebax	0aa98297f5	NEW Get the list of groups of a user with the REST API.	2019-01-27 13:52:08 +01:00
Xebax	94d3f038eb	FIX 'statut' is ignored when updating a user with the REST API.	2019-01-27 13:20:33 +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	fd192f10c4	Merge pull request #10341 from hregis/8.0_bug ... FIX security broken with Multicompany	2019-01-26 14:28:13 +01:00
Philippe GRAND	4bf5a52f4b	update with html5 compliant code	2019-01-21 10:12:28 +01:00
Regis Houssin	f7703235c7	FIX broken feature (better check)	2019-01-16 19:39:57 +01:00
Regis Houssin	ffeeb782b0	FIX check is moved to restrictedArea() function	2019-01-16 19:25:19 +01:00
Regis Houssin	45a7e03562	FIX a user can always read its own card	2019-01-16 19:13:21 +01:00
Laurent Destailleur	e7943ae844	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2019-01-16 16:48:52 +01:00
Laurent Destailleur	d3828130ab	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/class/adherent.class.php	2019-01-16 16:48:21 +01:00
Regis Houssin	24128ac28d	TODO security broken with Multicompany	2019-01-16 11:07:58 +01:00
Laurent Destailleur	adc4422323	Update card.php	2019-01-15 17:57:30 +01:00
Regis Houssin	7c9d85d091	FIX problem with multicompany transverse mode ... Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>	2019-01-15 12:18:04 +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
ldestailleur	a9e8e13bb6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: ChangeLog htdocs/user/param_ihm.php	2019-01-02 19:41:39 +01:00
ldestailleur	3d8479291d	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2019-01-02 19:39:35 +01:00
ldestailleur	8645a7f524	FIX Interface regression for bind people. Fix option ... MAIN_OPTIMIZEFORTEXTBROWSER	2019-01-02 18:58:45 +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	35debd06fb	List of events show user firstname by default	2018-12-23 01:28:36 +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	b3b7a12a16	FIX Look and feel v9	2018-12-22 18:56:29 +01:00
Laurent Destailleur	a5dccd1cc3	Enable by default the test on anti CSRF token	2018-12-22 18:09:26 +01:00
Laurent Destailleur	3fee4c3309	The delete of a user need the parameter $user	2018-12-22 17:34:27 +01:00
Laurent Destailleur	2b088a73c1	FIX CVE-2018-19998	2018-12-22 17:16:08 +01:00
Laurent Destailleur	bacd5110fb	FIX CVE-2018-19995 and CVE-2018-19998	2018-12-22 17:12:38 +01:00
Laurent Destailleur	44a6644969	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-12-18 21:55:53 +01:00
Laurent Destailleur	89068ffef1	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 ... Conflicts: htdocs/adherents/subscription.php htdocs/core/class/commonobject.class.php htdocs/core/modules/expensereport/doc/pdf_standard.modules.php htdocs/langs/es_ES/companies.lang htdocs/langs/es_ES/errors.lang htdocs/product/stock/product.php htdocs/user/card.php	2018-12-18 21:55:14 +01:00
Laurent Destailleur	4b7f373802	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-12-18 21:37:34 +01:00
Laurent Destailleur	fb8c3f01a4	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/modules/project/doc/pdf_baleine.modules.php htdocs/core/modules/project/doc/pdf_beluga.modules.php	2018-12-18 21:35:30 +01:00
atm-ph	1aadcc50f1	Fix attached files from user mail form don't work	2018-12-17 15:48:27 +01:00
Laurent Destailleur	527ad04ae8	FIX Mandatory field feature should works on textarea ... Conflicts: htdocs/core/lib/functions.lib.php	2018-12-15 18:13:30 +01:00
Laurent Destailleur	6188156c52	FIX Mandatory field feature should works on textarea	2018-12-15 18:11:40 +01:00
Laurent Destailleur	f55db6dd84	Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/resources/dbmodel/dolibarr_schema.mwb	2018-12-15 14:09:16 +01:00
Laurent Destailleur	2011afe6fb	Merge branch 'develop' into actionrefused	2018-12-14 15:48:24 +01:00
Laurent Destailleur	611ccc4a9a	Merge branch 'develop' into fieldlabel	2018-12-14 15:42:01 +01:00
Laurent Destailleur	5dabefe227	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0	2018-12-13 20:49:55 +01:00
Juanjo Menent	d1eed14488	FIX: #10218 Bad redirection after deleting a user or group	2018-12-11 13:25:33 +01:00
Laurent Destailleur	3f912ebfff	FIX restore security event login/logout	2018-12-10 11:19:52 +01:00
Maxime Kohlhaas	42c97cf7d5	Fix #6610	2018-12-02 17:59:11 +01:00
Maxime Kohlhaas	8c13c87429	Fix path for user photo	2018-12-01 16:55:42 +01:00
Laurent Destailleur	ef3a280f40	Merge pull request #10082 from grandoc/new_branch_26_11_2018 ... fix typo error	2018-11-29 10:57:48 +01:00
Laurent Destailleur	d59c81cfe4	Fix missing or	2018-11-28 11:47:24 +01:00
Laurent Destailleur	bb565d33f9	FIX Several fixes in fetchAll	2018-11-27 16:39:08 +01:00
Philippe GRAND	a59a4c60e0	FIX : Typo errors	2018-11-26 16:09:05 +01:00
Frédéric FRANCE	ce6b7adaa0	Merge remote-tracking branch 'upstream/develop' into actionrefused	2018-11-15 22:15:45 +01:00
Frédéric FRANCE	12dcda7e02	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-15 22:01:36 +01:00
Laurent Destailleur	b51004e809	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-11-15 17:34:36 +01:00
Laurent Destailleur	2d6f7f926c	FIX xss injection on user address	2018-11-15 17:34:11 +01:00
Laurent Destailleur	e1407c8289	Merge pull request #10012 from hregis/develop_mc ... FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-15 17:19:28 +01:00
Laurent Destailleur	8a97ba4ba9	Update card.php	2018-11-15 16:56:12 +01:00
David Beniamine	01947288fb	Fix issue #9956 User can edit some of their data without permissons	2018-11-14 18:29:15 +01:00
Regis Houssin	2bc25fc008	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2018-11-14 15:24:41 +01:00
Laurent Destailleur	df2aa2e2f6	Fix column balance	2018-11-14 13:52:43 +01:00
Laurent Destailleur	ba22ae45e7	Fix column balance	2018-11-14 13:45:20 +01:00
Laurent Destailleur	0201939ebe	Fix column balance	2018-11-14 13:43:39 +01:00
Frédéric FRANCE	731d19a29b	add tooltip to butActionRefused	2018-11-13 21:40:17 +01:00
Regis Houssin	04edcaa89c	FIX compatibility between proposal sharing and proposalnumber sharing	2018-11-13 20:20:46 +01:00
Frédéric FRANCE	09efde4901	Merge remote-tracking branch 'upstream/develop' into fieldlabel	2018-11-09 18:13:59 +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	c74ad61365	Fix look and feel v8	2018-11-08 10:04:25 +01:00
Laurent Destailleur	66ffcf287a	Fix filter on extrafields	2018-11-07 12:49:17 +01:00
Laurent Destailleur	4a25317f10	Fix security on GETPOST('action'). Param must be sanitized.	2018-11-05 20:29:07 +01:00
Laurent Destailleur	c0f4ec5a3e	FIX sanitize param $action	2018-11-05 17:53:31 +01:00
Frédéric FRANCE	42a9abad56	remove fieldlabel and add fieldeditkey	2018-10-27 17:45:29 +02:00
Regis Houssin	569d59d251	FIX change my deprecated email	2018-10-27 14:43:12 +02:00
Frédéric FRANCE	86d854f3f4	Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose	2018-10-24 23:04:26 +02:00
Laurent Destailleur	3ef32a24a4	Look and feel	2018-10-17 00:34:39 +02:00
Laurent Destailleur	00dc78dd01	Fix responsive	2018-10-16 21:58:33 +02:00
Philippe GRAND	ba40ad4aab	Standardize and update code	2018-10-12 12:23:45 +02:00
Laurent Destailleur	82c89f739d	social network module	2018-10-12 11:29:47 +02:00
Laurent Destailleur	cb53e18aa4	Social network module	2018-10-12 11:19:18 +02:00
Laurent Destailleur	ded5c4c3dd	Social network module	2018-10-12 11:02:03 +02:00
Laurent Destailleur	46ad7de5dd	Merge pull request #9709 from bafbes/abb80031 ... NEW Category filter on user list	2018-10-09 15:38:00 +02:00
Laurent Destailleur	0938ac4afa	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into ... develop Conflicts: htdocs/user/list.php	2018-10-09 14:54:18 +02:00
Laurent Destailleur	3c8b365c3e	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-09 14:53:39 +02:00
Abbes Bahfir	073914572c	Fix: users categories type is Categorie::TYPE_USER	2018-10-09 14:24:41 +02:00
Laurent Destailleur	966e97617d	Merge pull request #9708 from bafbes/abb80030 ... FIX users categories type is Categorie::TYPE_USER	2018-10-09 14:24:21 +02:00
Laurent Destailleur	f365a987c4	FIX restore last seach criteria ... FIX filter on employee	2018-10-09 14:20:53 +02:00
Abbes Bahfir	603c70ffc7	Fix: Searching on employee field disables employee mode	2018-10-09 14:10:04 +02:00
Laurent Destailleur	362c226ad6	Merge pull request #9710 from bafbes/abb80032 ... Fix: Searching on employee field disables employee mode	2018-10-09 14:09:23 +02:00
Philippe GRAND	bba6669f03	Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018	2018-10-09 08:47:26 +02:00
Abbes Bahfir	34da7cc731	Fix: Searching on employee field disables employee mode	2018-10-09 00:25:55 +01:00
Abbes Bahfir	06a943fc80	Fix: Category filter on user list	2018-10-09 00:02:14 +01:00
Abbes Bahfir	1e706c2e6b	Fix: users categories type is Categorie::TYPE_USER	2018-10-08 23:50:14 +01:00
gauthier	021f9552dd	FIX : when we're just admin and not super admin, if we create new user with transverse mode, we don't see it then we can't add him in usergroup	2018-10-08 15:41:31 +02:00
Laurent Destailleur	506ba30d5a	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-10-06 20:54:14 +02:00
Laurent Destailleur	fef40439be	responsive	2018-10-06 20:05:41 +02:00
Philippe GRAND	956c7b21e2	Standardize code	2018-10-06 12:18:03 +02:00
Philippe GRAND	5890647afd	Standardize code	2018-10-06 12:04:17 +02:00
Philippe GRAND	74c86f477c	Standardize code	2018-10-06 12:01:00 +02:00
Frédéric FRANCE	4d72812129	Create index.html	2018-09-30 14:56:12 +02:00
Frédéric FRANCE	3f0162789b	Create index.html	2018-09-30 14:55:55 +02:00
Frédéric FRANCE	877184638c	add index.html in user directory	2018-09-30 14:55:15 +02:00
Laurent Destailleur	79ade6a1af	Work on website	2018-09-26 15:20:37 +02:00
Philippe GRAND	9c9f5bd3c3	Standardize and update code	2018-09-20 17:26:39 +02:00
Philippe GRAND	83871468ba	Standardize and update code	2018-09-18 17:37:08 +02:00
Frédéric FRANCE	4120d0f92c	reduce complexity of user class	2018-09-16 13:49:22 +02:00
Laurent Destailleur	80fb1e0657	NEW Each user can set its prefered default calendar	2018-09-14 11:23:15 +02:00
Frédéric FRANCE	987fdbe73c	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 21:29:41 +02:00
Laurent Destailleur	963d5eeddf	Merge pull request #9387 from frederic34/camelCaps2 ... start changing phpcs:ignore	2018-09-12 21:14:34 +02:00
Laurent Destailleur	9d9e2bc3e3	Merge pull request #9405 from fmarcet/develop ... NEW: Highlight lines on lists when they are checked	2018-09-12 20:50:42 +02:00
Frédéric FRANCE	3e71f4e6b0	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-12 18:36:49 +02:00
Frédéric FRANCE	998b67fa98	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-12 18:32:15 +02:00
Laurent Destailleur	3bf296c9cf	Merge pull request #9448 from frederic34/loadfichetitre ... remove deprecated	2018-09-12 18:23:24 +02:00
Laurent Destailleur	fcabe67e4b	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-12 13:30:28 +02:00
Frédéric FRANCE	aab617aeb3	remove deprecated	2018-09-09 18:38:48 +02:00
Frédéric FRANCE	7e0b1055db	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-09 13:36:53 +02:00
Frédéric FRANCE	f02b2f0239	Merge remote-tracking branch 'upstream/develop' into patch-6	2018-09-09 13:35:58 +02:00
Laurent Destailleur	700e3b9748	Standardize code for modulepart=mycompany like others modulepart.	2018-09-09 12:53:30 +02:00
Frédéric FRANCE	a3fa13994b	replace select_date	2018-09-09 09:36:12 +02:00
Frédéric FRANCE	4a7ea33008	replace select_date	2018-09-09 08:02:26 +02:00
Laurent Destailleur	0ef17fe581	FIX Problems with permissions of module to record payment of salaries	2018-09-07 13:32:56 +02:00
Frédéric FRANCE	4cbfa2073a	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-05 21:02:16 +02:00
Laurent Destailleur	4ac67e6409	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-09-05 20:31:10 +02:00
Laurent Destailleur	0bd4bc39dd	Fix responsive	2018-09-05 16:03:43 +02:00
Frédéric FRANCE	65b74ad30f	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-04 20:48:35 +02:00
Philippe GRAND	0492492df1	fix merge	2018-09-04 12:30:06 +02:00
Ferran Marcet	b658626e21	NEW: Highlight lines on lists when they are checked	2018-09-04 11:54:13 +02:00
Frédéric FRANCE	7288335c6d	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-03 19:01:11 +02:00
Philippe GRAND	7a0c19485e	fix merge	2018-09-03 09:34:08 +02:00
Regis Houssin	912c05774b	FIX remove deprecated triggers USER_LOG*	2018-09-03 09:30:36 +02:00
Frédéric FRANCE	35232b753a	move phpcs:ignore	2018-09-02 20:37:12 +02:00
Frédéric FRANCE	e13a8ec572	Merge remote-tracking branch 'upstream/develop' into camelCaps2	2018-09-02 18:19:45 +02:00
Laurent Destailleur	887a40cf1d	Remove TODO	2018-09-02 16:46:01 +02:00
Frédéric FRANCE	47879d44bc	move phpcs:ignore	2018-09-02 09:57:19 +02:00
Philippe GRAND	5d273960dc	fix conflict	2018-09-01 22:40:38 +02:00
Frédéric FRANCE	10200374ef	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 14:06:23 +02:00
Frédéric FRANCE	57fb3dc2f4	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-09-01 13:52:51 +02:00
Philippe GRAND	d8e6492e93	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop	2018-09-01 13:07:30 +02:00
Laurent Destailleur	5604f3b0c3	Merge pull request #9376 from frederic34/functionCommentMissing ... function Comment Missing	2018-09-01 12:59:32 +02:00
Philippe GRAND	1944ef0dc3	conflict resolution	2018-09-01 12:38:22 +02:00
Laurent Destailleur	482ddd548a	Merge pull request #9332 from frederic34/functionClosingBrace ... PSR2 FunctionClosingBrace	2018-09-01 12:06:08 +02:00
Laurent Destailleur	28fe74bf13	FIX #9371	2018-09-01 11:57:18 +02:00
Frédéric FRANCE	c2e49c82f8	function Comment Missing	2018-08-31 22:34:02 +02:00
Philippe GRAND	70ae8c6081	Standardize and update code	2018-08-31 18:27:16 +02:00
Philippe GRAND	9e880d3e72	Standardize and update code	2018-08-31 17:55:31 +02:00
Frédéric FRANCE	5100b8b7b0	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-30 10:42:47 +02:00
Frédéric FRANCE	6aee680a4f	PSR2 ClassDeclaration	2018-08-29 22:06:05 +02:00
Frédéric FRANCE	b03f4004ea	PSR2 FunctionClosingBrace	2018-08-29 21:25:22 +02:00
Laurent Destailleur	3ebfb23407	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: .travis.yml htdocs/fourn/class/fournisseur.facture.class.php htdocs/product/fournisseurs.php htdocs/ticket/class/ticket.class.php	2018-08-29 20:22:50 +02:00
Laurent Destailleur	34ceec7067	FIX #9328	2018-08-29 18:40:12 +02:00
Laurent Destailleur	4e7e290624	FIX #9328	2018-08-29 18:38:58 +02:00
Laurent Destailleur	428354303c	FIX #9328	2018-08-29 18:29:42 +02:00
Laurent Destailleur	d8bd76b8ce	FIX #9328	2018-08-29 18:27:39 +02:00
Frédéric FRANCE	fe4260a014	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-28 09:34:53 +02:00
Laurent Destailleur	1842a4bb41	Merge pull request #9278 from grandoc/new_branch_21_08_2018 ... Update and standardize code	2018-08-28 02:13:28 +02:00
ptibogxiv	6556ace2bc	Fix sync user->member ... add more fields	2018-08-28 01:35:05 +02:00
Philippe GRAND	30992f2730	Standardize and update code	2018-08-23 18:52:47 +02:00
ptibogxiv	bcd7833af0	Fix sync user->member ... add more fields	2018-08-23 10:16:33 +02:00
Philippe GRAND	0c75c41e7b	Update and standardize code	2018-08-22 19:56:24 +02:00
Frédéric FRANCE	6b6daf178f	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-21 20:57:58 +02:00
Laurent Destailleur	0799970804	Merge pull request #9248 from frederic34/FunctionDeclaration ... function declaration	2018-08-21 13:41:56 +02:00
Laurent Destailleur	0f1e5a78c6	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-21 13:17:11 +02:00
Laurent Destailleur	27e2810e10	Fix date format	2018-08-20 17:14:03 +02:00
Laurent Destailleur	26d34422b0	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-19 03:01:26 +02:00
Laurent Destailleur	547a0aaac7	FIX Look and feel v8	2018-08-19 02:43:45 +02:00
Frédéric FRANCE	39462742e2	Merge remote-tracking branch 'upstream/develop' into camelCaps	2018-08-16 08:17:55 +02:00
Laurent Destailleur	b515511ad6	Merge branch 'develop' into FunctionDeclaration	2018-08-16 00:52:55 +02:00
Frédéric FRANCE	7bb781eea8	function declaration	2018-08-15 14:28:34 +02:00
Frédéric FRANCE	a0a6afc224	return comment	2018-08-14 12:23:10 +02:00
Frédéric FRANCE	3210181a3d	rule for private function is different	2018-08-14 10:21:34 +02:00
Frédéric FRANCE	850ac34020	mark non camelCaps function	2018-08-13 17:26:32 +02:00
Laurent Destailleur	9fc5d39d07	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:36 +02:00
Laurent Destailleur	dc8c4402ee	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-08-12 20:09:22 +02:00
Laurent Destailleur	3d4d42462c	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0	2018-08-12 16:30:21 +02:00
Laurent Destailleur	12e21b4886	FIX update extrafields	2018-08-12 16:29:26 +02:00
Laurent Destailleur	39f4eae07e	Fix look and feel v8	2018-08-09 23:11:49 +02:00
Philippe GRAND	59cd0a5e5e	uniformize	2018-08-04 15:58:05 +02:00
Philippe GRAND	948647f3f9	comment translation	2018-08-04 14:17:51 +02:00
Juanjo Menent	37a9a2df56	Merge pull request #9167 from frederic34/include ... Include and co are statements	2018-08-02 11:03:44 +02:00
Juanjo Menent	738caa605f	Merge pull request #9160 from hregis/develop_api ... FIX compatibility with multicompany transverse mode	2018-08-02 10:57:27 +02:00
Philippe GRAND	541e919ae0	Clean and update code	2018-07-27 14:49:33 +02:00
Regis Houssin	e1877625a0	FIX clean code	2018-07-27 13:42:44 +02:00
Frédéric FRANCE	a0a5d33641	test include	2018-07-26 17:30:53 +02:00
Regis Houssin	e48eec583d	FIX compatibility with multicompany transverse mode	2018-07-25 17:00:49 +02:00
Regis Houssin	ff733c5ad7	FIX clean code	2018-07-24 20:10:27 +02:00
Laurent Destailleur	dc2fec8f57	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-24 19:37:04 +02:00
Laurent Destailleur	438cdfc004	FIX #9141	2018-07-24 17:16:21 +02:00
Philippe GRAND	010c5af245	Clean and update code	2018-07-19 16:48:20 +02:00
Laurent Destailleur	387abf2da8	Merge pull request #9057 from inoveaconseil/checkRightOnLink ... ADD Check right on link	2018-07-16 09:31:21 +02:00
Laurent Destailleur	d968a61445	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-15 20:17:17 +02:00
Laurent Destailleur	f3b7bc53bd	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 ... Conflicts: htdocs/core/tpl/extrafields_list_print_fields.tpl.php	2018-07-15 20:16:08 +02:00
atm-ph	0c252d9778	Fix user rights overrided by user group rights	2018-07-11 18:09:29 +02:00
Laurent Destailleur	31d5b739e7	Merge pull request #9048 from hregis/8.0_rights ... NEW possibility to add all rights of all modules in one time	2018-07-10 10:38:17 +02:00
Laurent Destailleur	fb84211714	Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-07-06 12:45:44 +02:00
Laurent Destailleur	af3ab84ebb	Fix backward compatibility with old multicompany module	2018-07-05 22:15:55 +02:00
Inovea Conseil	30cff2bb36	ADD check user's rights	2018-07-05 11:52:41 +02:00
Regis Houssin	d796199ed0	Fix: avoid warning with multicompany tranverse mode	2018-07-04 14:48:00 +02:00
Regis Houssin	ca13d7b560	NEW possibility to add all rights of all modules in one time	2018-07-03 21:46:20 +02:00
Laurent Destailleur	fec9a96ad1	Fix travis	2018-07-02 09:34:34 +02:00
Laurent Destailleur	982a1ffbaf	NEW Automatic position of scroll when creating an extrafield	2018-06-30 14:22:05 +02:00
Laurent Destailleur	a9e78f27d9	Merge branch 'develop' into patch-115	2018-06-30 01:21:58 +02:00
Laurent Destailleur	eb88f1e5c9	Fix look and feel v8	2018-06-23 12:41:03 +02:00
Laurent Destailleur	27a27e02a1	Fix css	2018-06-22 22:53:53 +02:00
Laurent Destailleur	ad2df304b4	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/accountancy/customer/lines.php htdocs/fourn/commande/card.php htdocs/societe/class/societe.class.php	2018-06-18 13:31:29 +02:00
atm-ph	3c80ce501b	Fix missing hook on usercard (addMoreActionsButtons)	2018-06-15 16:05:50 +02:00
Inovea Conseil	d5a3e63e05	Fix missing paramater for generateDocument	2018-06-15 09:47:28 +02:00
Laurent Destailleur	4a5fd35e11	Look and feel v8	2018-06-13 22:57:41 +02:00
Laurent Destailleur	916424943e	Merge pull request #8942 from grandoc/new_branch_10_06_2018 ... New branch 10 06 2018	2018-06-13 20:48:22 +02:00
Laurent Destailleur	e983566422	Merge pull request #8947 from glu000/develop ... Fix for Bug #8946	2018-06-13 20:41:54 +02:00
Günter Lukas	fcbf50467e	Update user.class.php	2018-06-12 09:52:55 +02:00
Günter Lukas	3c42a282f5	Fix for Bug #8946 ... Add element fields to class user	2018-06-12 09:48:03 +02:00
Philippe GRAND	9a44a433b8	clean code	2018-06-07 18:32:00 +02:00
Philippe GRAND	4fd2468b6f	clean code	2018-06-07 18:13:00 +02:00
Laurent Destailleur	6e62727c37	Fix scrutinizer bug	2018-06-06 18:18:50 +02:00
Laurent Destailleur	29ee5dffc4	Clean code	2018-06-04 12:55:55 +02:00
Frédéric FRANCE	812b182680	loadlangs	2018-05-26 17:04:23 +02:00
Frédéric FRANCE	e87ff4d9b0	loadlangs	2018-05-26 16:24:54 +02:00
Laurent Destailleur	e51aa68284	Fix link to warehouses for events	2018-05-24 12:16:04 +02:00
BENKE Charlene	0dad083cb5	Update card.php	2018-05-12 18:05:06 +02:00
BENKE Charlene	caa35e0359	Update user.class.php	2018-05-12 17:59:43 +02:00
Laurent Destailleur	a9c7f90512	Missing hook after deprecated trigger	2018-05-05 13:36:20 +02:00
Laurent Destailleur	461ae46cc4	FIX When on a high page and searching for a small result, list was not ... visible.	2018-04-24 11:37:57 +02:00
Laurent Destailleur	bbfc4a3e17	NEW Look and feel v8 - Show Picto "+" on all links "Add record"	2018-04-18 03:26:15 +02:00
Laurent Destailleur	0d0da234b1	Lowercase NULL, TRUE, FALSE according to PSR2	2018-04-16 13:51:16 +02:00
Laurent Destailleur	8fbde88872	Look and feel v8	2018-04-15 17:37:49 +02:00
Laurent Destailleur	f84b74f4cc	Merge pull request #8583 from hregis/develop_ldap ... NEW add "printUserPasswordField" hooks	2018-04-13 23:36:20 +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
Regis Houssin	a317c54b66	Fix: missing right parameter	2018-04-13 09:39:02 +02:00
Regis Houssin	7c3f0be83d	Fix: missing parameters	2018-04-13 09:09:26 +02:00
Regis Houssin	7d1292d838	NEW add "printUserPasswordField" hooks	2018-04-13 09:05:17 +02:00
Laurent Destailleur	6e288fca75	Merge pull request #8575 from all3kcis/develop-patch-16 ... NEW Add files management on products lot	2018-04-13 00:57:13 +02:00
Regis Houssin	ee61324caf	Fix: show \r\n if description contain <br>	2018-04-12 18:57:51 +02:00
Regis Houssin	bd95e5265e	Fix: wrong permissions	2018-04-12 18:05:12 +02:00
All-3kcis	880fa55dd5	display user-friendly filesize	2018-04-12 15:29:22 +02:00
Laurent Destailleur	a8878c3f7e	FIX #6295	2018-04-12 15:17:15 +02:00
Laurent Destailleur	698f5c165a	Merge pull request #8430 from atm-florian/dev_mailtouser ... NEW : Can select from the user list into send form email (For field to and CC)	2018-04-11 17:55:40 +02:00
Laurent Destailleur	1feee6378f	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-04-11 14:45:52 +02:00
Laurent Destailleur	0d15d8e0ad	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/user/card.php	2018-04-11 14:45:11 +02:00
Marc de Lima Lucio	307ede8b22	FIX: weird password autocompletion in Goocle Chrome (issue #8479)	2018-04-10 15:03:50 +02:00
Laurent Destailleur	7108f68db9	Remove old deprecated hook insertExtraFields. Triggers must be used for ... action on CRUD events.	2018-04-10 12:03:01 +02:00
Laurent Destailleur	4d94327ead	Look and feel v8	2018-04-07 16:17:40 +02:00
Laurent Destailleur	d46a8eb8f0	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/company.php	2018-04-07 12:30:30 +02:00
Laurent Destailleur	84426c69e3	Fix not not saved	2018-04-06 19:26:24 +02:00
Laurent Destailleur	77f2b137b5	FIX XSS	2018-04-06 19:23:41 +02:00
Laurent Destailleur	956fc2376d	FIX #8483	2018-04-06 12:27:55 +02:00
Regis Houssin	b43aca0f8d	Fix: use dol_string_nohtmltag instead (with strip_tags)	2018-04-06 08:52:02 +02:00
Regis Houssin	c5cf2e4d50	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2018-04-06 08:13:37 +02:00
Laurent Destailleur	2524a699eb	Standardize file name of lists	2018-04-06 00:36:52 +02:00
Laurent Destailleur	3dbe200163	Merge pull request #8497 from ruistrecht-alt/FIX_missing_closing_parentheses ... FIX: missing closing parentheses	2018-04-05 16:18:12 +02:00
Laurent Destailleur	28b00fc021	Merge pull request #8486 from hregis/develop_email ... Fix: avoid space in email address	2018-04-05 13:12:03 +02:00
florian HENRY	cc0fb830b8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-04-05 10:53:17 +02:00
Rui Strecht	09f8a21773	Argument should be array	2018-04-02 15:30:19 +01:00
Rui Strecht	b39f617863	Added missing parentheses	2018-04-02 15:29:58 +01:00
Regis Houssin	edaa558ef7	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2018-04-01 11:50:16 +02:00
Laurent Destailleur	43f8834b28	Uniformize code with the new module builder framework	2018-03-31 18:48:27 +02:00
Regis Houssin	8c610904ac	Fix: remove multi spaces	2018-03-30 07:36:23 +02:00
Regis Houssin	546f3f8b96	Fix: avoid space in email address	2018-03-30 07:19:42 +02:00
Regis Houssin	0e4d796f88	Fix: more complete	2018-03-29 18:47:53 +02:00
Regis Houssin	443ffe3150	Fix: remove html tags and decode html entities	2018-03-29 17:51:23 +02:00
Laurent Destailleur	ff505ba148	Work on a page dedicated for external frontend (mobile, ...)	2018-03-29 11:34:01 +02:00
Laurent Destailleur	26e2d3c4f0	Clean permissions tables	2018-03-26 16:35:50 +02:00
Laurent Destailleur	9f11cf77df	Merge ticket css in main css	2018-03-26 15:45:56 +02:00
florian HENRY	ffbeb17ec2	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_mailtouser	2018-03-25 17:19:27 +02:00
Laurent Destailleur	852191010a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2018-03-25 15:29:11 +02:00
Regis Houssin	f330c5ad32	Fix: better compatibility	2018-03-23 10:52:10 +01:00
Regis Houssin	715852569b	NEW add printUserListWhere hook	2018-03-23 10:42:36 +01:00
Regis Houssin	9cf66e53f6	Fix: wrong module name	2018-03-22 16:39:47 +01:00
florian HENRY	4ebb138533	last ones	2018-03-21 23:03:22 +01:00
florian HENRY	487ef3b7c9	cealn again	2018-03-21 23:01:20 +01:00
florian HENRY	c8d309e599	clean	2018-03-21 23:00:33 +01:00
florian HENRY	dc6f4c1f4d	NEW : option to send email to salaries	2018-03-21 11:48:30 +01:00
Laurent Destailleur	7948359bf7	Unlink picto differs from delete picto	2018-03-19 19:08:35 +01:00
Laurent Destailleur	c962b89495	NEW hook getnomurltooltip is replaced with hook getNomUrl more powerfull	2018-03-15 20:46:55 +01:00
Laurent Destailleur	7e6ba51780	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/projet/tasks/comment.php	2018-03-07 13:06:29 +01:00
Laurent Destailleur	ee1a2c49fd	Merge pull request #8287 from hregis/7.0_bug3 ... Fix: problem to see users with transverse mode	2018-03-07 12:38:00 +01:00
Laurent Destailleur	1ca5c7083a	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.formother.class.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2018-03-07 11:54:48 +01:00
Laurent Destailleur	a0a9e12178	Fix css	2018-03-07 11:29:50 +01:00
Regis Houssin	bf4402eb89	Fix: missing superadmin	2018-03-06 19:22:59 +01:00
Regis Houssin	175971bfc1	Fix: syntax error	2018-03-06 19:12:18 +01:00
Regis Houssin	d406b28911	Fix: problem to see users with transverse mode	2018-03-06 19:08:39 +01:00
BENKE Charlene	76d8bd517d	Optimise SQL squery ... Just a suppress a table and fields not needed	2018-03-05 08:45:40 +01:00
Laurent Destailleur	75962f5ed1	Merge pull request #8234 from hregis/7.0_entity ... Fix: multicompany transverse mode is managed by the module	2018-03-02 17:43:47 +01:00
Laurent Destailleur	04934cc4aa	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture/class/facture.class.php htdocs/contrat/class/contrat.class.php htdocs/core/lib/functions.lib.php htdocs/projet/tasks/time.php	2018-02-27 19:18:43 +01:00
Laurent Destailleur	0cc84ab92f	FIX Missing restore_lastsearch_values	2018-02-26 21:21:28 +01:00
Laurent Destailleur	3c552cec15	FIX Missing restore_lastsearch_values	2018-02-26 21:16:40 +01:00
Laurent Destailleur	41638e6dff	Fix back link of look and feel v7	2018-02-26 09:20:05 +01:00
Regis Houssin	60525b9c18	Fix: multicompany transverse mode is managed by the module	2018-02-25 15:35:41 +01:00
Laurent Destailleur	003827eb06	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop	2018-02-25 15:01:19 +01:00
Laurent Destailleur	0262b64eb1	Merge pull request #8230 from hregis/7.0_bug4 ... Fix: missing hook parameters	2018-02-25 12:56:43 +01:00
Laurent Destailleur	8dceb8930f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 ... Conflicts: htdocs/core/class/html.formactions.class.php htdocs/user/card.php	2018-02-25 12:41:17 +01:00
Regis Houssin	b216249214	Fix: missing hook parameters	2018-02-24 15:01:29 +01:00
Marc de Lima Lucio	36cc1c6ca9	FIX: solve column mismatch in user card's usergroup list + code cleanup	2018-02-23 11:59:22 +01:00
Laurent Destailleur	b4446764f8	Clean code of deprecated usage	2018-02-21 14:48:25 +01:00
Laurent Destailleur	c4130730cb	Clean code around fetch_optionals()	2018-02-20 19:38:18 +01:00
Laurent Destailleur	eccdc9a075	Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php htdocs/langs/pt_PT/companies.lang	2018-02-08 15:20:24 +01:00
Regis Houssin	70a65b89eb	Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_bug	2018-02-08 08:52:45 +01:00
Laurent Destailleur	413331c7dd	Fix travis	2018-02-07 15:54:58 +01:00
Laurent Destailleur	852c4fc033	Fix context of filter not lost	2018-02-07 12:08:25 +01:00
Regis Houssin	8b7f40e15b	Fix: wrong id name	2018-02-06 19:29:16 +01:00
Laurent Destailleur	5e7d172a58	Fix look and feel v7 on ref popup	2018-02-06 19:16:15 +01:00
Laurent Destailleur	ae1641f4b9	Merge pull request #8063 from Alabate/develop ... NEW : Add password_hash as hash algorithm	2018-01-26 18:01:13 +01:00
Laurent Destailleur	d796f403a9	Fix sender email when sending a password remind	2018-01-24 15:43:55 +01:00
Laurent Destailleur	f1b63d7cbf	Fix css	2018-01-23 09:00:03 +01:00
Laurent Destailleur	c969d58907	Clean code	2018-01-22 23:51:24 +01:00
Laurent Destailleur	d1365c2492	Fix trackid	2018-01-22 17:15:44 +01:00
Aurélien Labate	8088d92bbb	NEW Add password_hash as hash algorithm	2018-01-15 00:33:25 +01:00
Laurent Destailleur	aad0da2513	Fix maxi debug of APIs (clean output fields)	2017-12-21 16:50:18 +01:00
Laurent Destailleur	d20062df73	Fix jquery css theme	2017-12-20 20:18:41 +01:00
Laurent Destailleur	731cb3f721	Fix editor of user signature	2017-12-19 17:00:40 +01:00
Laurent Destailleur	f504716501	Fix sync contact - external user	2017-12-19 16:16:31 +01:00
Laurent Destailleur	d4afb8300d	Fix several pb of duplicate functions in some cases	2017-12-19 00:15:22 +01:00
Laurent Destailleur	8e12551f17	Fix not employee must not appear on page to create salaries	2017-12-18 11:55:34 +01:00
Laurent Destailleur	9cdf322bfb	Fix scrutinizer bugs	2017-12-15 22:14:28 +01:00
Laurent Destailleur	5af153550d	Debug blockedlog: ... - Add a track into log when we disable/enable module - Add a protection to avoid disable of module when recording was started - Better compatibility with multicompany - Can filter on ref and amount - Add a permission to read the blockedlog - Add more information on payments/invoice/thirdparty into log - Reset of module data after a migration from v6 (not compatible)	2017-12-15 16:56:08 +01:00
Laurent Destailleur	af1028576d	Fix on search all (trim search + search from smartphone).	2017-12-12 11:31:30 +01:00
Laurent Destailleur	f22e7ee24a	Fixes	2017-12-09 17:29:19 +01:00
Laurent Destailleur	df5768c176	Fix missing translation	2017-12-08 12:38:22 +01:00
Laurent Destailleur	e57c8f324d	Fix style	2017-12-02 14:57:27 +01:00
Laurent Destailleur	1ce155728f	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/modules/mailings/fraise.modules.php	2017-12-01 16:25:13 +01:00
Laurent Destailleur	ce32da6217	Fix debugs APIs	2017-12-01 15:39:18 +01:00
Laurent Destailleur	dbde97f25f	Update card.php	2017-11-29 15:07:09 +01:00
jfefe	d0ab117488	FIX : external user cannot be set as internal	2017-11-28 15:06:23 +01:00
florian HENRY	94285ae494	factorization of extrafeild into list	2017-11-27 15:24:29 +01:00
Laurent Destailleur	7d3325c087	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/dolibarr_changes.txt htdocs/user/class/api_users.class.php	2017-11-25 13:17:38 +01:00
Laurent Destailleur	77509ee37a	Removed deprecated apis	2017-11-25 13:14:28 +01:00
Laurent Destailleur	4cbcf5189a	FIX #7806	2017-11-25 01:24:24 +01:00
Laurent Destailleur	38c770ffb3	FIX #7806	2017-11-25 01:16:12 +01:00
Laurent Destailleur	836f6bf3c9	Fix search filter when using extrafields 'links'	2017-11-12 12:39:23 +01:00
Laurent Destailleur	cb03b2f307	NEW Can sort joined files on thirdparty and user card.	2017-11-10 18:14:29 +01:00
Regis Houssin	ef44dfc472	Fix: move transversal mode management in multicompany module	2017-11-04 15:40:35 +01:00
Laurent Destailleur	1b28c45e2c	PERF Links in getNomUrl use only one tag a instead of 2.	2017-11-02 15:19:14 +01:00
Regis Houssin	19f1cd7787	Fix: move some check in multicompany module	2017-11-02 13:16:00 +01:00
Laurent Destailleur	d569218162	Fix 'separate' extrafields must be visible by default. ... Sandardize name of list pages (must end with _list.php)	2017-10-29 11:23:20 +01:00
Laurent Destailleur	00db7e16ec	Clean code	2017-10-28 16:00:07 +02:00
Laurent Destailleur	202712be94	Work on module builder	2017-10-25 22:02:07 +02:00
Laurent Destailleur	9f0f5eb5e8	Fix translation of extrafields type	2017-10-24 18:05:43 +02:00
Laurent Destailleur	f4f47c6732	NEW Remove tooltip tipTip library replaced with standatd jquery tooltip	2017-10-22 21:15:08 +02:00
Laurent Destailleur	c6e5115d34	Set default limit to 100 on all rest api that list	2017-10-22 15:42:19 +02:00
Laurent Destailleur	4247038d01	Add phpunit test	2017-10-22 13:06:27 +02:00
Laurent Destailleur	475db3172a	NEW Remove js library fileupload that was not used by core code.	2017-10-21 19:40:17 +02:00
Laurent Destailleur	5c189449e1	Move default value for user expense report on tab expense report	2017-10-20 17:02:26 +02:00
Laurent Destailleur	d82af57b57	NEW Add tab "Expense report" on user card	2017-10-19 20:56:23 +02:00
Laurent Destailleur	f1a0e13718	Merge pull request #7646 from atm-maxime/new_hrm_detailed_user ... NEW hrm details output on user	2017-10-19 19:21:29 +02:00
Laurent Destailleur	7f85d73001	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/card.php htdocs/comm/propal/list.php htdocs/commande/list.php htdocs/compta/facture/list.php htdocs/contrat/card.php htdocs/expensereport/card.php htdocs/fichinter/list.php htdocs/fourn/commande/card.php htdocs/fourn/commande/list.php htdocs/fourn/facture/card.php htdocs/fourn/paiement/card.php htdocs/livraison/card.php htdocs/modulebuilder/template/myobject_list.php htdocs/societe/rib.php htdocs/supplier_proposal/list.php htdocs/user/card.php	2017-10-18 19:51:29 +02:00
Laurent Destailleur	8626d6279a	Fix perm to delete files	2017-10-18 17:21:30 +02:00
Maxime Kohlhaas	9875d1b7cc	Missing comments	2017-10-17 19:46:06 +02:00
Maxime Kohlhaas	25fa7d0564	New : add salaries, expense reports and leave requests in HRM tab of user card	2017-10-16 21:42:57 +02:00
Maxime Kohlhaas	f7cadfbed1	Fix function declaration	2017-10-16 21:42:24 +02:00
Laurent Destailleur	4296df45af	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/class/html.form.class.php htdocs/projet/list.php htdocs/user/card.php	2017-10-13 22:01:56 +02:00
Laurent Destailleur	5f021990b4	Code comment	2017-10-13 17:46:16 +02:00
Scrutinizer Auto-Fixer	165741517e	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-13 11:28:26 +00:00
Laurent Destailleur	8c5cf9ea45	Fix date output	2017-10-12 18:04:47 +02:00
Laurent Destailleur	33624e1001	NEW Attaching doc automatically in email is now a parameter of template.	2017-10-08 16:34:42 +02:00
Scrutinizer Auto-Fixer	328d39bc71	Scrutinizer Auto-Fixes ... This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2017-10-07 11:09:31 +00:00
Laurent Destailleur	4bc7eb0ec1	Merge pull request #7520 from hregis/develop_ldap ... Fix: Set LDAP password when LDAP key changed	2017-10-06 13:09:28 +02:00
Laurent Destailleur	06b18a740e	NEW Add date of birth on user card. ... NEW Show expected worked hours on the timesheet form.	2017-10-06 12:08:01 +02:00
Laurent Destailleur	801a5180d6	Fix scrutinizer bug reports	2017-10-06 01:16:19 +02:00
Regis Houssin	723bc4d436	NEW add ldap_rename for avoid password if ldap key changed	2017-10-04 11:22:41 +02:00
Regis Houssin	feea6246c2	NEW add possibility to hide LDAP tab for non admin	2017-10-04 09:13:41 +02:00
Regis Houssin	8d3ad9ddc8	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-10-04 08:43:07 +02:00
Laurent Destailleur	a501a20487	NEW Search filters in lists are restored when using "back to list"	2017-10-03 16:00:52 +02:00
gauthier	8f969d61e2	FIX : invalid foreach protection	2017-10-02 09:23:04 +02:00
Regis Houssin	475c881e67	Fix: add missing ldap fields	2017-10-02 09:00:07 +02:00
Regis Houssin	c1b6f59c1b	Fix: restore possible ldap keys	2017-10-02 08:43:53 +02:00
Laurent Destailleur	88554a74a9	Merge pull request #7532 from AXeL-dev/develop ... Fix: payment form & user first/last name position	2017-10-02 00:37:35 +02:00
AXeL-dev	f7dcf1ca45	FIX: wrong user first name/last name position in user tooltip	2017-10-01 18:35:06 +01:00
Laurent Destailleur	3ddd5d3d3a	The default value feature is sensitive to url parameters.	2017-10-01 14:54:17 +02:00
Regis Houssin	cb9d627f02	Fix: Set LDAP password when LDAP key changed	2017-09-30 11:51:22 +02:00
Regis Houssin	46cc23c568	Fix: $this->pass is empty if DATABASE_PWD_ENCRYPTED is used	2017-09-30 10:41:35 +02:00
Laurent Destailleur	f007f9e7e5	NEW Add new property visible dy default on lists on extrafields	2017-09-29 13:26:44 +02:00
Laurent Destailleur	d7dd6ed334	Fix undefined var	2017-09-26 16:15:22 +02:00
Regis Houssin	92ff974c5b	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-25 06:47:34 +02:00
Laurent Destailleur	e3da4188e2	GETPOST must not clean data for text input.	2017-09-25 00:16:52 +02:00
Regis Houssin	f550e27579	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-18 12:15:01 +02:00
Laurent Destailleur	291a0d46e6	Fix edit of categories	2017-09-18 01:39:39 +02:00
Regis Houssin	bdc425c203	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_ldap	2017-09-16 21:41:55 +02:00
Regis Houssin	87b81fb2fd	NEW add members types ldap group management	2017-09-16 21:41:30 +02:00
Laurent Destailleur	a8b4d216e5	Fix PHPCS	2017-09-15 23:21:42 +02:00
Regis Houssin	7f57f737b3	New: Ping ldap server before ldap_connect for avoid waiting	2017-09-15 18:02:52 +02:00
tysauron	4f15c90aee	Pour ne pas charger les membres d'un groupe lorsque l'on charge les groupe d'un user (sinon avec 200 user et 30 groupes = 6000 objects . trop lourd)	2017-09-15 12:58:13 +02:00
Laurent Destailleur	0873260b8a	USe second parameter in GETPOST	2017-09-15 10:50:50 +02:00
Laurent Destailleur	8f5206accf	NEW The lot of a product uses the link and picto when shown into list.	2017-09-15 10:45:41 +02:00
Laurent Destailleur	149ab80b3a	The event array of an object is visible even if no event yet recorded.	2017-09-13 14:18:36 +02:00
Laurent Destailleur	cf56da8102	NEW Default filter and sort order can use partial list of query ... parameters to set the qualified URLs.	2017-09-11 00:02:52 +02:00
Laurent Destailleur	259cca0230	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/admin/mails_templates.php	2017-09-08 13:30:54 +02:00
Laurent Destailleur	bde293af22	Fix filter on extrafield with type sellist	2017-09-07 15:34:25 +02:00
Laurent Destailleur	cff9ff01c8	Better disconnect with exotic connection mode	2017-09-07 13:30:18 +02:00
Laurent Destailleur	a60cd49fb0	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/actions_sendmails.inc.php htdocs/core/class/CMailFile.class.php htdocs/filefunc.inc.php	2017-08-28 12:53:02 +02:00
Regis Houssin	0ce51fcb87	Fix: add resprint for passwordforgotten	2017-08-28 09:14:50 +02:00
Laurent Destailleur	c573df4f0e	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/card.php	2017-08-26 22:33:56 +02:00
Laurent Destailleur	7030d0d596	Add combo on ldap selection	2017-08-25 15:04:55 +02:00
Laurent Destailleur	da34ea6b11	FIX field entity "edit" and "view" was in hook but not "create".	2017-08-25 13:31:55 +02:00
Laurent Destailleur	fa752348c8	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/bank/various_payment/index.php htdocs/contact/list.php htdocs/langs/en_US/errors.lang	2017-08-02 17:56:09 +02:00
Laurent Destailleur	5b1f5b0f20	Fix translation done twice into field title of array	2017-08-02 13:31:53 +02:00
Laurent Destailleur	b6a7ce6822	Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-08-01 10:22:37 +02:00
Laurent Destailleur	97e694f4d9	Fix look and feel v6	2017-07-31 12:43:07 +02:00
Laurent Destailleur	612ab65b72	Fix by adding a MULTICOMPANY_BACKWARD_COMPATIBILITY option.	2017-07-31 06:01:05 +02:00
atm-ph	1f3f9e40b1	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-27 16:01:53 +02:00
Regis Houssin	c934f1bd13	Fix: remove unused old code	2017-07-23 12:07:20 +02:00
Laurent Destailleur	0763d15b4c	Debug journalization ... Debug edition of user BAN.	2017-07-15 12:37:31 +02:00
Laurent Destailleur	f106ff7e76	Fix var init	2017-07-13 23:52:02 +02:00
Laurent Destailleur	ae7797ebf2	Look and feel v6	2017-07-13 14:43:41 +02:00
Laurent Destailleur	85d9a2f790	Merge pull request #7145 from hregis/6.0_bug2 ... Fix: missing group name with dol_banner_tab	2017-07-13 14:36:17 +02:00
Laurent Destailleur	2870798d07	Fix remove warnings	2017-07-13 00:35:10 +02:00
Regis Houssin	d63e15f0c6	Fix: missing group name with dol_banner_tab	2017-07-12 15:52:58 +02:00
phf	b8865c425f	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into new_develop_expense_report	2017-07-05 10:48:01 +02:00
phf	1beec51928	New expense report rules and ik (index kilometers) - MAIN_USE_EXPENSE_IK - MAIN_USE_EXPENSE_RULE	2017-07-05 10:44:52 +02:00
Laurent Destailleur	63dcdc3a03	Fix API was loading definition of all APIs at each call.	2017-06-25 17:09:08 +02:00
Laurent Destailleur	bb2d27280b	Fix sort link must be disabled for computed field	2017-06-19 14:31:08 +02:00
Laurent Destailleur	86a6a83647	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog htdocs/admin/tools/index.php htdocs/bookmarks/bookmarks.lib.php htdocs/compta/facture.php htdocs/core/tpl/passwordforgotten.tpl.php htdocs/fourn/ajax/getSupplierPrices.php htdocs/main.inc.php htdocs/product/stats/card.php htdocs/public/paypal/paymentko.php	2017-06-18 21:13:48 +02:00
Laurent Destailleur	abe736c6a6	Escape hml tags	2017-06-18 19:42:59 +02:00
Regis Houssin	d1b003f3c4	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc	2017-06-17 12:01:14 +02:00
Laurent Destailleur	5b7a8e9c90	Fix missing signature when sending email from user card	2017-06-17 10:17:36 +02:00
Regis Houssin	f0e234eef2	Fix: missing hookmanager init	2017-06-16 17:01:43 +02:00
Laurent Destailleur	faabdd3f99	Missing filter field	2017-06-14 11:34:35 +02:00
Laurent Destailleur	00bf4bba13	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/index.php	2017-06-14 10:54:34 +02:00
Laurent Destailleur	b889db997a	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/compta/facture.php htdocs/core/datepicker.php htdocs/core/get_menudiv.php htdocs/core/menus/standard/auguria.lib.php htdocs/core/menus/standard/eldy.lib.php htdocs/core/search_page.php htdocs/main.inc.php htdocs/master.inc.php htdocs/product/list.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/card.php htdocs/user/index.php	2017-06-14 10:48:34 +02:00
Laurent Destailleur	848f70e026	Fix bad merge	2017-06-14 10:38:34 +02:00
Laurent Destailleur	7939daa225	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/lib/functions.lib.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php htdocs/user/index.php	2017-06-14 10:18:24 +02:00
Laurent Destailleur	9b979e3cb7	Fix wrong warning when user is disabled	2017-06-13 13:44:18 +02:00
Laurent Destailleur	a96362e2f9	Fix #formmailbeforetitle not supported everywhere	2017-06-11 11:40:01 +02:00
Laurent Destailleur	e93cefbbf0	FIX #6985	2017-06-11 10:37:58 +02:00
Laurent Destailleur	d037515e37	FIX SQL injection on user/index.php parameter search_statut. ... Conflicts: htdocs/user/index.php	2017-06-10 20:10:57 +02:00
Laurent Destailleur	7c0de18ac1	Fix code comment	2017-06-10 12:56:28 +02:00
Laurent Destailleur	884c6c674d	Fix css	2017-06-09 20:08:23 +02:00
Laurent Destailleur	1af74b4c42	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/skeleton_list.php htdocs/admin/perms.php htdocs/core/class/commonobject.class.php htdocs/core/class/hookmanager.class.php htdocs/core/lib/files.lib.php htdocs/product/class/product.class.php htdocs/product/class/service.class.php htdocs/product/index.php htdocs/product/list.php htdocs/public/members/new.php htdocs/theme/eldy/style.css.php htdocs/theme/md/style.css.php	2017-06-09 12:50:56 +02:00
Laurent Destailleur	41586b76c0	Fix missing css	2017-06-09 11:40:35 +02:00
Laurent Destailleur	b441c62e1d	Fix syntax error	2017-06-08 14:55:12 +02:00
Laurent Destailleur	b1f93ccb0c	Fix security	2017-06-08 14:33:46 +02:00
Laurent Destailleur	543630e487	Fix missing count of nb of columns into lists	2017-06-08 14:14:06 +02:00
Laurent Destailleur	7587a3d592	Merge branch 'develop' into develop_transverse	2017-06-08 10:25:04 +02:00
Regis Houssin	b183c6e7ac	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_transverse	2017-06-07 20:23:24 +02:00
Regis Houssin	2b36135641	Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into ... develop_mc	2017-06-07 20:14:03 +02:00
Laurent Destailleur	1820649175	Maxi debug of v6	2017-06-07 19:28:31 +02:00
Regis Houssin	b66da3d148	New: big refactorization of multicompany transverse mode	2017-06-06 10:23:33 +02:00
Regis Houssin	5c5663c5ae	New: getEntity function use true $shared value by default	2017-05-30 18:50:54 +02:00
Laurent Destailleur	c71488e58b	Removed deprecated code	2017-05-29 15:09:13 +02:00
Laurent Destailleur	e667d72547	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: dev/skeletons/build_class_from_table.php htdocs/compta/facture.php htdocs/core/class/html.form.class.php	2017-05-29 10:41:51 +02:00
Laurent Destailleur	4a330af4bf	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 5.0	2017-05-29 10:15:30 +02:00
Laurent Destailleur	aa0a369f06	Fix typo	2017-05-29 10:15:10 +02:00
Laurent Destailleur	70636cc59f	FIX SQL injection on user/index.php parameter search_statut.	2017-05-29 09:59:21 +02:00
Laurent Destailleur	160eb194ea	Clean REST response for user and third parties	2017-05-24 15:24:35 +02:00
Regis Houssin	a3d8da0a73	Fix: wrong SPECIMEN value	2017-05-24 11:30:11 +02:00
Laurent Destailleur	f5e29d6c86	Fix phpcs warning	2017-05-22 10:45:02 +02:00
Laurent Destailleur	b3dc73e611	Look and feel v6	2017-05-21 02:43:51 +02:00
Laurent Destailleur	4e7353f8a0	Clean code	2017-05-19 13:39:00 +02:00
Laurent Destailleur	aec4cef5de	Clean some code for type of event deprecated since 3.3	2017-05-19 12:58:38 +02:00
Laurent Destailleur	7dbe3b1da9	Merge pull request #6843 from aspangaro/6.0-multijournal ... Fix : Sql error on salaries index for accountancy multijournal + debug	2017-05-18 17:45:21 +02:00
Laurent Destailleur	b0f0285137	Standardize code	2017-05-16 21:29:18 +02:00
Laurent Destailleur	68e333879f	Fix var not sanitized	2017-05-16 13:27:32 +02:00
Laurent Destailleur	b29d0385e6	NEW Can send an email to a user from its card.	2017-05-15 00:15:56 +02:00
Alexandre SPANGARO	4dc7d5cd8d	Fix : tooltip on bank in customer invoice card	2017-05-14 21:20:35 +02:00
Laurent Destailleur	fa290c34fa	Fix against SQL injection. Add phpunit to detect missing escapement.	2017-05-12 16:55:11 +02:00
Laurent Destailleur	e5c898e0d6	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: ChangeLog build/makepack-dolibarr.pl htdocs/fichinter/list.php htdocs/product/list.php htdocs/projet/tasks/list.php	2017-05-10 00:48:27 +02:00
Laurent Destailleur	6d01bd712d	FIX Better sanitizing of search all parameter.	2017-05-09 19:36:10 +02:00
Laurent Destailleur	081d0e7ec2	Debug module RH. Edition of user bank account is ok.	2017-05-09 11:09:21 +02:00
Laurent Destailleur	63259295c6	Look and feel v6	2017-05-09 10:41:03 +02:00
Laurent Destailleur	910a925167	NEW Add last activation author and ip of modules	2017-05-06 20:43:14 +02:00
Laurent Destailleur	44bdf91715	Add badge with nb of imported calendard on user tab	2017-05-06 12:43:45 +02:00
Laurent Destailleur	d53654e64f	Look and feel v6	2017-05-05 20:45:06 +02:00
Laurent Destailleur	983c72c918	Look and feel v6	2017-04-29 14:55:23 +02:00
Laurent Destailleur	defce63a24	Work on management of default values	2017-04-28 14:05:28 +02:00
Laurent Destailleur	4c056d68d8	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/dict.php htdocs/commande/list.php htdocs/core/class/html.form.class.php htdocs/langs/en_US/bills.lang htdocs/societe/list.php	2017-04-15 17:02:05 +02:00
Laurent Destailleur	5931bc4068	NEW Feature to crop/resize images available on user and expense reports	2017-04-14 13:53:39 +02:00
Laurent Destailleur	846204bdb4	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 13:02:29 +02:00
Laurent Destailleur	c52f4644e1	Look and feel v6	2017-04-14 13:00:39 +02:00
Laurent Destailleur	aabfc2f0db	Perf. Do not load personal conf of user by default.	2017-04-14 12:52:32 +02:00
Laurent Destailleur	4818b1ba44	Load default values into $user->default_values	2017-04-14 12:39:11 +02:00
Laurent Destailleur	39ebaec064	Replace usage of $bc[$var] with class="oddeven"	2017-04-14 11:22:48 +02:00
Laurent Destailleur	26a9999fbf	Support of preview for pdf with several pages	2017-04-12 11:38:55 +02:00
Laurent Destailleur	2446cb5431	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/compta/facture.php htdocs/compta/facture/fiche-rec.php htdocs/contact/list.php htdocs/fourn/class/fournisseur.commande.class.php htdocs/fourn/facture/card.php htdocs/societe/list.php htdocs/user/document.php	2017-04-11 11:43:54 +02:00
Marcos García de La Fuente	74f0ae5bbb	FIX #6623 User card shows "Return to list" link even if the user has no rights to list users ... Close #6623	2017-04-09 14:09:33 +02:00
Laurent Destailleur	56a4b7a1fd	Work on v6 look and feel	2017-04-08 14:03:38 +02:00
Laurent Destailleur	be439f6252	Work on look and feel v6	2017-04-07 16:16:44 +02:00
Laurent Destailleur	e2ea5945dd	Work on look and feel v6	2017-04-06 21:48:28 +02:00
Laurent Destailleur	d99b0461c7	Extrafields multilanguage support.	2017-04-03 10:56:28 +02:00
Laurent Destailleur	4902df7e3f	Work on look and feel v6	2017-04-02 19:28:38 +02:00
Laurent Destailleur	ed89852807	Work on look and feel v6	2017-04-01 13:49:17 +02:00
Laurent Destailleur	7254b54a04	Work on 6.0 look and feel	2017-04-01 00:49:06 +02:00
Laurent Destailleur	01a74a8d23	Work on 6.0 look and feel	2017-03-31 17:41:20 +02:00
Laurent Destailleur	979bcd3a9b	NEW Can add a background image on login page	2017-03-31 11:40:31 +02:00
Laurent Destailleur	da1427ef54	Work on 6.0 look and feel	2017-03-30 16:10:08 +02:00
Laurent Destailleur	4df8dcf980	Work on module modBlockedLog and modModuleBuilder	2017-03-29 21:50:15 +02:00
Laurent Destailleur	fec3a89aa5	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2017-03-23 11:38:46 +01:00
Laurent Destailleur	0a35d17207	CSS enhancement	2017-03-23 10:59:13 +01:00
Laurent Destailleur	9abe0940e7	Fix bad use of showLinkedObjectBlock	2017-03-21 11:42:02 +01:00
Laurent Destailleur	4831fb4dcb	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/adherents/class/adherent.class.php htdocs/filefunc.inc.php	2017-03-19 11:26:49 +01:00
arnaud	192a825de8	NEW ODT docs for USER USERGROUP CONTRACT and PRODUCT class	2017-03-14 09:25:29 +01:00
Regis Houssin	017d73792c	Fix: add md5 password for OpenLdap	2017-03-13 15:00:44 +01:00
arnaud	a796a321cc	Merge branch '3.9_dalibo' of github.com:ATM-Consulting/dolibarr into NEW_odt_others_objects ... Conflicts: htdocs/core/class/html.formfile.class.php htdocs/product/admin/product.php htdocs/product/card.php	2017-03-10 12:16:55 +01:00
arnaud	4a7e3fb387	NEW odt usergroup	2017-03-08 11:34:21 +01:00
Laurent Destailleur	28ad50e059	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/core/tpl/objectline_create.tpl.php htdocs/langs/de_DE/bills.lang htdocs/langs/fr_FR/bills.lang htdocs/langs/fr_FR/main.lang htdocs/langs/fr_FR/suppliers.lang	2017-03-03 14:31:35 +01:00
arnaud	abeba95de9	New USER odt	2017-03-02 15:13:42 +01:00
Laurent Destailleur	3c54cb5ba9	Fix avoid trigger during migration	2017-02-28 20:55:14 +01:00
Laurent Destailleur	372cb40cf9	The trigger USER_SETINGROUP and USER_REMOVEFROMGROUP has been replaced ... with trigger USER_MODIFY	2017-02-28 12:10:45 +01:00
Laurent Destailleur	9648f20a2e	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 12:08:41 +01:00
Laurent Destailleur	59d2943d8d	Fix context must be provided to triggers using ->context no a dedicated ... property.	2017-02-28 12:07:05 +01:00
Laurent Destailleur	40b412728f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-02-28 11:49:10 +01:00
Laurent Destailleur	43a6366f1b	Fix security audit was not triggered.	2017-02-28 11:48:46 +01:00
Laurent Destailleur	9928f943a7	Remove hook that is duplicate code with trigger.	2017-02-28 11:40:04 +01:00
Laurent Destailleur	a71541e6de	Fix duplicate code	2017-02-28 11:16:07 +01:00
Laurent Destailleur	fb88eaf2a4	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-02-23 02:55:50 +01:00
Laurent Destailleur	e981e719a1	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/comm/action/card.php	2017-02-23 02:54:40 +01:00
Laurent Destailleur	cbb80e6727	Fixfield at wrong place	2017-02-22 00:08:52 +01:00
Laurent Destailleur	32678015c9	FIX protection against infinite loop on hierarchy	2017-02-21 23:52:13 +01:00
Laurent Destailleur	a0873bad29	Fix TZ	2017-02-21 11:34:22 +01:00
Laurent Destailleur	eb70d6eea1	Debug of feature for browser notifications	2017-02-14 18:20:01 +01:00
De Coninck Laurent	294517a8e0	use already existing variable	2017-02-13 16:49:10 +01:00
Laurent Destailleur	868f2e5473	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/admin/tools/update.php htdocs/core/lib/functions.lib.php	2017-02-13 01:36:02 +01:00
Laurent Destailleur	abffd29179	Try a fix for #6334, #6416	2017-02-12 20:55:54 +01:00
De Coninck Laurent	b356c34dc4	[mail; password; forgotten][#6334] - Fix mail url ... Fix the mail url on password generation	2017-02-12 17:22:06 +01:00
Laurent Destailleur	70091eceed	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/expensereport/card.php	2017-01-27 01:26:11 +01:00
Laurent Destailleur	65f493ac41	Merge pull request #6321 from hregis/5.0_bug ... Fix: avoid numeric errors	2017-01-27 00:27:47 +01:00
Laurent Destailleur	053afe21dd	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/user/class/user.class.php	2017-01-26 23:40:16 +01:00
Laurent Destailleur	ca79d0c274	Fix PHPCS	2017-01-26 23:36:58 +01:00
Laurent Destailleur	c1b59b1950	Fix several security bugs on expense report	2017-01-26 18:08:00 +01:00
Regis Houssin	7980f1c999	Fix: avoid php non-numeric errors	2017-01-23 12:29:05 +01:00
Regis Houssin	0479fdb0a2	Fix: avoid non-numeric error	2017-01-23 12:25:39 +01:00
Laurent Destailleur	39151d7a74	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-22 12:14:18 +01:00
Laurent Destailleur	65f7de8f64	Fix css and look 5.0	2017-01-22 12:13:32 +01:00
Laurent Destailleur	9a5670787f	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-21 12:26:50 +01:00
Laurent Destailleur	fc4aa96cd7	Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 ... Conflicts: htdocs/core/class/extrafields.class.php htdocs/fichinter/card.php htdocs/fourn/commande/dispatch.php	2017-01-20 21:02:05 +01:00
Laurent Destailleur	412be59f78	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop ... Conflicts: htdocs/filefunc.inc.php	2017-01-20 12:09:39 +01:00
Laurent Destailleur	bb95f139a8	Fix responsive	2017-01-17 20:04:41 +01:00
Laurent Destailleur	fdbe4051f1	FIX #6230	2017-01-16 12:54:51 +01:00
Laurent Destailleur	da64d4d398	Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into develop	2017-01-16 10:58:45 +01:00
Laurent Destailleur	d2b766f9f4	Fix PHP 7.1	2017-01-16 10:17:25 +01:00
arnaud	b813144edb	NEW generation ODT	2017-01-06 16:44:09 +01:00
Laurent Destailleur	088a948e5a	Merge pull request #6220 from gnovaro/patch-2 ... Var to public	2016-12-31 17:26:40 +01:00
Laurent Destailleur	b5c815367c	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-26 15:44:31 +01:00
Gustavo Novaro	3557e4eb37	Var to public	2016-12-23 12:40:13 -03:00
Laurent Destailleur	9e44eb0d15	Fix return code REST similar for all api with POST	2016-12-23 02:08:22 +01:00
Gustavo Novaro	3542364da8	var to public ... Improve code style to current php practices	2016-12-20 17:11:50 -03:00
Laurent Destailleur	78bf209119	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop6	2016-12-18 02:21:57 +01:00
Laurent Destailleur	60b8582aa9	Fix more then 30 security defects	2016-12-18 01:44:26 +01:00