Commit Graph

1155 Commits

Author SHA1 Message Date
Nicolas ZABOURI
b6bd4119d9 FIX travis Public underscore in load_ldap_info 2019-06-19 09:12:01 +02:00
Laurent Destailleur
525598f6aa Fix scrutinizer warnings 2019-06-18 20:01:28 +02:00
Laurent Destailleur
5f0fbcea9a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/admin/productaccount.php
	htdocs/contact/card.php
	htdocs/core/class/commonobject.class.php
	htdocs/core/class/extrafields.class.php
2019-06-02 11:49:33 +02:00
Laurent Destailleur
f2088a084f Fix error management 2019-05-31 11:53:30 +02:00
Laurent Destailleur
c1a0e9385f
Merge pull request #11219 from frederic34/patch-2
dol_print_object_info return void
2019-05-21 22:38:39 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Frédéric FRANCE
c8027ccf1a
Update agenda.php 2019-05-19 09:15:10 +02:00
florian HENRY
0787eee9b8 fix :email collector for event creation 2019-05-18 18:42:46 +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
John BOTELLA
f296093f8d fix travis 2019-05-10 15:52:46 +02:00
Sof
2154b4a654
FIX : Typo
$seearch_cti = $search_cti
2019-04-28 12:09:59 +02:00
atm-quentin
2bc93b9748 NEW public note and private note in contact list sall 2019-04-16 16:19:36 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
John BOTELLA
7372e8c610 Appli function to links 2019-04-15 15:47:36 +02:00
Laurent Destailleur
84050c888f Fix set of civility label 2019-04-11 18:04:18 +02:00
Laurent Destailleur
9337e48072
Merge branch 'develop' into patch-147 2019-04-11 17:54:29 +02:00
ptibogxiv
42b1ab10d1
Update contact.class.php 2019-04-11 17:04:40 +02:00
ptibogxiv
1f017d4d06
Update contact.class.php 2019-04-11 17:03:07 +02:00
Laurent Destailleur
d7f980fda0 NEW Add picto of deletion on mass action combo lists 2019-04-09 01:22:59 +02:00
Laurent Destailleur
54714bc755 Deprecated property ->fk_departement is now ->state_id everywhere. 2019-04-05 20:06:13 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
ptibogxiv
013b8a61ec
ADD cilivity label in fetch contact / API 2019-03-29 12:11:50 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
4f9981063f Merge branch 'Squiz.Scope.MethodScope.Missing' of https://github.com/frederic34/dolibarr into frederic34-Squiz.Scope.MethodScope.Missing 2019-03-02 18:26:50 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +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
825705179c Fix phpcs 2019-02-27 12:49:44 +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
Laurent Destailleur
4634312306 Fix phpcs 2019-02-27 04:18:25 +01:00
Laurent Destailleur
61b7564664 Fix syntax error 2019-02-27 02:29:14 +01:00
Laurent Destailleur
6373e1db84
Merge branch 'develop' into 10.0_linkedin 2019-02-27 01:16:21 +01:00
Frédéric FRANCE
c89e4d79b8
wip 2019-02-25 22:27:04 +01:00
Josep Lluís
f6fc9190f3
Add no_email field in contact list
Add no_email field in contact list
2019-02-25 19:41:40 +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
Frédéric FRANCE
42a1387218
wip 2019-02-25 00:56:48 +01:00
Frédéric FRANCE
167a857f4c
replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Laurent Destailleur
86c9dbc218
Merge branch 'develop' into new_branch_14_02_2019 2019-02-19 13:26:35 +01:00
Sof
be4cd0572a
Update card.php 2019-02-17 20:09:46 +01:00
Philippe Grand
f2b057f376
Update consumption.php 2019-02-15 10:46:37 +01:00
Philippe Grand
b301ed0040
Update consumption.php 2019-02-15 10:44:04 +01:00
Philippe Grand
a9407f3b4e
Update consumption.php
following the remark of Frédéric France
2019-02-15 09:35:38 +01:00
Frédéric FRANCE
7412a624c6
update html5 contact list 2019-02-14 21:26:39 +01:00
Philippe GRAND
bd031bd294 update with html5 compliant code 2019-02-14 17:02:17 +01:00
Frédéric FRANCE
55d4037de1
Update card.php 2019-02-13 23:57:27 +01:00
Laurent Destailleur
f1500281ef Fix phpcs 2019-02-12 19:00:50 +01:00
Laurent Destailleur
aa206e5d7c
Update consumption.php 2019-02-12 13:45:38 +01:00
Frédéric FRANCE
9893e8d752
Update consumption.php 2019-02-10 23:37:12 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00