2469 Commits

Author	SHA1	Message	Date
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