Frédéric FRANCE
|
6e03e0ba83
|
Update contact.class.php
|
2019-10-28 08:08:59 +01:00 |
|
Frédéric FRANCE
|
043a71442f
|
contact phone
|
2019-10-27 20:06:16 +01:00 |
|
Frédéric FRANCE
|
a43e6f96b5
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-25 08:12:54 +02:00 |
|
Laurent Destailleur
|
6855f588b5
|
Use dolGetStatus
|
2019-10-24 16:38:06 +02:00 |
|
Laurent Destailleur
|
84c8b6b5d1
|
FIX #12198
|
2019-10-22 15:23:23 +02:00 |
|
Laurent Destailleur
|
f9c86256dc
|
FIX #12198
|
2019-10-22 15:21:41 +02:00 |
|
Frédéric FRANCE
|
9ec7836387
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-20 16:37:18 +02:00 |
|
Laurent Destailleur
|
d79114c1f8
|
Clean code
|
2019-10-20 15:16:40 +02:00 |
|
Frédéric FRANCE
|
f4540dddb8
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-17 20:24:04 +02:00 |
|
Frédéric FRANCE
|
e75f7d448c
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen
|
2019-10-16 20:00:01 +02:00 |
|
Frédéric FRANCE
|
d1d9b1ed85
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-15 09:39:57 +02:00 |
|
Laurent Destailleur
|
2ed96c9e5f
|
Fix scrutinizer
|
2019-10-15 02:54:19 +02:00 |
|
Frédéric FRANCE
|
b78187c1eb
|
Merge remote-tracking branch 'upstream/develop' into socialnetworks
|
2019-10-08 00:07:27 +02:00 |
|
stickler-ci
|
bc32d684a4
|
Fixing style errors.
|
2019-10-04 16:12:33 +00: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
|
010b2723b6
|
work on migration script
|
2019-10-01 20:14:06 +02:00 |
|
florian HENRY
|
d48f0fa791
|
resolve conflixt
|
2019-10-01 18:07:59 +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 |
|
Frédéric FRANCE
|
258424416e
|
Merge remote-tracking branch 'upstream/develop' into zapier
|
2019-09-30 07:49:52 +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
|
6858dce344
|
Rename table for categorie of warehouses
|
2019-09-27 13:28:28 +02:00 |
|
Alexandre SPANGARO
|
02dbc11f98
|
Move Gnu.org to https
|
2019-09-23 21:55:30 +02:00 |
|
Frédéric FRANCE
|
af63ac4051
|
work on contact
|
2019-09-14 13:31:26 +02:00 |
|
Frédéric FRANCE
|
1cd59cc16a
|
work on user
|
2019-09-14 11:26:31 +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 |
|
Frédéric FRANCE
|
bd4c9a64a8
|
wip
|
2019-09-07 14:48:25 +02:00 |
|
florian HENRY
|
dff7be59c8
|
mostlyDone
|
2019-09-06 09:22:53 +02:00 |
|
florian HENRY
|
d50114df64
|
mostlyDone
|
2019-09-06 09:20:18 +02:00 |
|
Laurent Destailleur
|
f893854986
|
Fix remove warnings
|
2019-09-05 14:24:13 +02:00 |
|
Laurent Destailleur
|
1828872bd1
|
Removed deprecated properties
|
2019-09-05 13:39:33 +02:00 |
|
Laurent Destailleur
|
3f121f07cc
|
Removed deprecated properties
|
2019-09-05 13:38:38 +02:00 |
|
florian HENRY
|
6c20fbafdf
|
add trigger files
|
2019-09-03 17:04:42 +02:00 |
|
florian HENRY
|
d811de4da2
|
let only triggers part
|
2019-09-02 22:01:48 +02:00 |
|
florian HENRY
|
405c92640c
|
on going
|
2019-09-02 14:47:32 +02:00 |
|
Laurent Destailleur
|
386f929fe3
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/core/lib/website.lib.php
htdocs/core/modules/facture/doc/pdf_sponge.modules.php
|
2019-08-15 23:39:02 +02:00 |
|
Laurent Destailleur
|
64e52789d6
|
FIX #11591 FIX #11592
|
2019-08-15 20:39:47 +02:00 |
|
Laurent Destailleur
|
a46bfc7a29
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/project.lib.php
|
2019-07-25 17:54:14 +02:00 |
|
ptibogxiv
|
c219b62b10
|
Update contact.class.php
|
2019-07-24 13:23:24 +02:00 |
|
ptibogxiv
|
46d0137d30
|
FIx display civility in contact card
|
2019-07-23 14:04:54 +02:00 |
|
Laurent Destailleur
|
adfbd62f8b
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-07-14 00:44:35 +02:00 |
|
Regis Houssin
|
4dab57b494
|
FIX phpcs
|
2019-07-13 11:24:25 +02:00 |
|
Regis Houssin
|
b7df4a2cd0
|
FIX this function can not be private
|
2019-07-13 11:21:07 +02:00 |
|
Laurent Destailleur
|
bf71731fc9
|
Fix phpcs
|
2019-06-19 22:28:33 +02:00 |
|
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 |
|
florian HENRY
|
0787eee9b8
|
fix :email collector for event creation
|
2019-05-18 18:42:46 +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
|
54714bc755
|
Deprecated property ->fk_departement is now ->state_id everywhere.
|
2019-04-05 20:06:13 +02:00 |
|
ptibogxiv
|
013b8a61ec
|
ADD cilivity label in fetch contact / API
|
2019-03-29 12:11:50 +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
|
c89e4d79b8
|
wip
|
2019-02-25 22:27: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
|
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 |
|
Laurent Destailleur
|
648eea3a70
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 16:00:11 +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
|
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 |
|
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
|
b47e7b2267
|
Work on new unsubscribe process
|
2018-12-11 09:49:46 +01:00 |
|
Philippe GRAND
|
3df83d7cf3
|
fix scrutinizer issue : The variable seems only to be defined at a later point
|
2018-12-01 15:45:02 +01:00 |
|
Laurent Destailleur
|
01e7b5747d
|
FIX user param is null not 0 when not defined
FIX properties email_xx were not set
|
2018-11-12 15:27:59 +01:00 |
|
Laurent Destailleur
|
5a7cb95b72
|
FIX filter on entity must be done as soon as we don't search on rowid.
|
2018-11-12 14:49:08 +01: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
|
277655b911
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-10-24 13:31:31 +02:00 |
|
Laurent Destailleur
|
30a2004d53
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-10-24 13:30:54 +02:00 |
|
gauthier
|
036f70860e
|
FIX : wrong occurence number of contract on contact card, we must only count externals
|
2018-10-24 10:17:21 +02:00 |
|
Philippe GRAND
|
83db36f9b2
|
Standardize code
|
2018-10-06 12:11:48 +02:00 |
|
Laurent Destailleur
|
98b1e13ed7
|
Work on module socialnetworks
|
2018-09-26 16:55:46 +02:00 |
|
Laurent Destailleur
|
ad6895aa2e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-24 10:23:09 +02:00 |
|
Laurent Destailleur
|
39e9029e41
|
Update contact.class.php
|
2018-09-23 15:44:44 +02:00 |
|
ptibogxiv
|
77dd516023
|
fix number mailing for a contact / multicompany
|
2018-09-22 14:45:15 +02:00 |
|
Frédéric FRANCE
|
a4fd8c4b75
|
reduce complexity of contact class
|
2018-09-16 19:19:45 +02:00 |
|
Frédéric FRANCE
|
2b62c4ca8f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-08 10:50:27 +02:00 |
|
Philippe GRAND
|
11d75573be
|
Standardize and update code
|
2018-09-05 12:21:13 +02:00 |
|
Frédéric FRANCE
|
61c4e9831f
|
move phpcs:ignore
|
2018-09-02 18:18:10 +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
|
2db84a679e
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/modulebuilder/index.php
|
2018-08-28 02:35:45 +02:00 |
|
Laurent Destailleur
|
534eadb7a2
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-08-28 01:35:43 +02:00 |
|
atm-ph
|
eb4e42bc40
|
Fix datec and tms missing in fetch method for API
|
2018-08-26 18:08:10 +02:00 |
|
Philippe GRAND
|
215677c972
|
Standardize and update code
|
2018-08-23 18:17:09 +02:00 |
|
Philippe GRAND
|
504b0e3d16
|
Update and standardize code
|
2018-08-22 18:34:50 +02:00 |
|
Frédéric FRANCE
|
39462742e2
|
Merge remote-tracking branch 'upstream/develop' into camelCaps
|
2018-08-16 08:17:55 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
Frédéric FRANCE
|
850ac34020
|
mark non camelCaps function
|
2018-08-13 17:26:32 +02:00 |
|
Laurent Destailleur
|
12e21b4886
|
FIX update extrafields
|
2018-08-12 16:29:26 +02:00 |
|
Regis Houssin
|
3e5271967b
|
FIX missing entity field
|
2018-07-08 12:11:22 +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 |
|