5903 Commits

Author	SHA1	Message	Date
Frédéric FRANCE	feaa5e2bd0	json query path	2019-10-02 22:15:24 +02:00
Frédéric FRANCE	6d117a501a	Update company.lib.php	2019-10-02 22:11:27 +02:00
Frédéric FRANCE	453ae05030	Update company.lib.php	2019-10-02 22:09:50 +02:00
Frédéric FRANCE	9f7f263f79	fix broken search	2019-10-02 21:49:36 +02:00
Frédéric FRANCE	37bb548d21	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-02 20:56:32 +02:00
Laurent Destailleur	b6a95b4be5	Look and feel v11	2019-10-02 19:04:24 +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	f89701b4d4	Fix technical id align on left	2019-10-02 18:55:18 +02:00
Laurent Destailleur	d8a8c4fbe6	Look and feel v11. Picto are fontawesome.	2019-10-02 18:36:36 +02:00
Laurent Destailleur	24570f7165	Look and feel v11. Picto are fontawesome.	2019-10-02 18:14:41 +02:00
florian HENRY	8c9cee1565	resolve conflict	2019-10-02 12:49:38 +02:00
florian HENRY	371ff76f5e	resolve copflict	2019-10-02 12:46:35 +02:00
Laurent Destailleur	ba7a288abb	Fix colspan and columns of contact of thirdparties	2019-10-01 23:28:13 +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	26c34198bf	show contact	2019-10-01 21:38:16 +02:00
Laurent De Coninck	3a25beabe6	add the country in the address of the PDF's footer	2019-10-01 21:03:58 +02:00
ATM john	4d5ffbb5c4	Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_unlock_title_button_feature	2019-10-01 20:45:04 +02:00
florian HENRY	d48f0fa791	resolve conflixt	2019-10-01 18:07:59 +02:00
Laurent Destailleur	b79831ec39	Merge pull request #11952 from aspangaro/11.0_https ... Move Gnu.org to https	2019-10-01 14:48:21 +02:00
Frédéric FRANCE	3b9bf2b06a	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-10-01 12:25:34 +02:00
Laurent Destailleur	fa921739ec	Remove duplicate code	2019-10-01 12:03:17 +02:00
Laurent Destailleur	11e01f5c86	Use correct style for table header	2019-10-01 12:02:28 +02:00
Laurent Destailleur	15e646cc62	Fix bad name of trigger	2019-10-01 11:34:35 +02:00
Laurent Destailleur	c7da05e4a1	Fix bad name of trigger	2019-10-01 11:28:10 +02:00
Laurent Destailleur	6ebd060315	Use php var with same name than html var	2019-10-01 11:23:38 +02:00
Laurent Destailleur	0828000626	Merge pull request #12005 from laudeco/feature/filter_contacts ... working solution about filtering the contacs of one company	2019-10-01 11:19:29 +02:00
Laurent Destailleur	0f4f5d47f2	Update company.lib.php	2019-10-01 11:18:53 +02:00
Laurent Destailleur	955d9daf38	Update company.lib.php	2019-10-01 11:18:14 +02:00
stickler-ci	5e075d5d30	Fixing style errors.	2019-10-01 06:39:26 +00: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
ATM john	b01bd979b5	Unlock title button feature	2019-09-30 21:10:16 +02:00
Frédéric FRANCE	f32f528bc2	fix merge	2019-09-30 19:36:57 +02:00
Frédéric FRANCE	b87610adcc	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-30 19:34:35 +02:00
Laurent Destailleur	ecc2e8df67	Fix restore lost images	2019-09-30 17:58:31 +02:00
Laurent Destailleur	dc7ad61940	Add class reposition on button that switch the view mode	2019-09-30 17:46:53 +02:00
Laurent Destailleur	b390cff172	Fix css	2019-09-30 17:22:22 +02:00
Laurent Destailleur	ce7e8c83a3	Use a dedicated css imgforviewmode for button used to switch view	2019-09-30 17:08:57 +02:00
Laurent Destailleur	d65af06d20	Merge pull request #11869 from atm-john/new_ticket_messaging_page ... New ticket messaging page design	2019-09-30 15:34:35 +02:00
Laurent Destailleur	b28cd1bb57	Merge pull request #11972 from aspangaro/11.0_fa_icon ... NEW Add fa_icon on load_fiche_titre	2019-09-30 15:26:28 +02:00
Laurent Destailleur	bbc98c19bc	Update functions.lib.php	2019-09-30 15:25:55 +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	1b151da776	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-29 11:28:54 +02:00
Laurent Destailleur	6966651d51	Standardize code to use dolSqlDateFilter	2019-09-28 13:22:05 +02:00
Alexandre SPANGARO	288aea190b	Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon	2019-09-28 06:09:40 +02:00
Alexandre SPANGARO	7f93f046e9	NEW Add fa_icon on load_fiche_titre	2019-09-28 06:02:25 +02:00
Frédéric FRANCE	cea3669ffa	Merge remote-tracking branch 'upstream/develop' into socialnetworks	2019-09-28 00:35:14 +02:00
florian HENRY	885d958e63	Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_contactdefault	2019-09-27 20:12:09 +02:00
Laurent Destailleur	fd37a81e19	FIX #11861	2019-09-27 20:02:33 +02:00
Laurent Destailleur	981c5c877a	Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop	2019-09-27 20:02:08 +02:00