Frédéric FRANCE
98023353fe
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-03 17:21:31 +02:00
Laurent Destailleur
331148499a
Fix check on terminal setup
2019-10-03 17:11:41 +02:00
Laurent Destailleur
8904ce5732
Removed warning we don't want
2019-10-03 16:57:12 +02:00
Laurent Destailleur
f0122a5766
Fix phpcs
2019-10-03 16:54:33 +02:00
altairis
699a3391c9
FCKeditor setup for tickets
2019-10-03 16:51:05 +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
9762d77958
Merge pull request #12024 from frederic34/patch-17
...
Update dolgraph.class.php
2019-10-03 15:57:48 +02:00
Laurent Destailleur
e59c70116f
Merge pull request #12021 from frederic34/patch-14
...
fix broken search
2019-10-03 15:57:31 +02:00
Laurent Destailleur
fce33240f3
Merge pull request #12013 from Ahuahuachi/develop
...
Translate french documentation
2019-10-03 15:56:42 +02:00
stickler-ci
3168ad404c
Fixing style errors.
2019-10-03 13:56:33 +00:00
Laurent Destailleur
c529979005
Merge pull request #12016 from yashkothari1946/yashkothari1946-patch-1
...
#11966 bug fix
2019-10-03 15:55:46 +02:00
Laurent Destailleur
78751fe0ad
Update newpayment.php
2019-10-03 15:54:52 +02:00
Laurent Destailleur
03614536f9
Merge pull request #12018 from frederic34/patch-12
...
backport commit for setmulticurrency
2019-10-03 15:54:01 +02:00
Laurent Destailleur
648a2881ed
Merge pull request #12022 from frederic34/patch-15
...
Update list.php
2019-10-03 15:53:43 +02:00
Laurent Destailleur
95c73f7b46
Merge pull request #12025 from seebag/fix/no_sub_members
...
Fix for no subscription members
2019-10-03 15:52:16 +02:00
altairis
153121b95d
add MAIN_LANGUAGES_ALLOWED constant
2019-10-03 15:48:24 +02:00
Sebastien Baguet
d11bb9570c
Add French and English translation
2019-10-03 13:44:40 +02:00
Sebastien Baguet
5dbf34a864
Small fix on a query
2019-10-03 13:34:47 +02:00
Laurent Destailleur
5bf9b5116f
Clean code
2019-10-03 10:13:07 +02:00
Laurent Destailleur
6a40c3d8f0
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
2019-10-03 10:08:17 +02:00
Laurent Destailleur
d754338096
Migration to fontawesome v5 seems complete. We removed v4 files.
2019-10-03 10:08:04 +02:00
stickler-ci
3cad71f2c1
Fixing style errors.
2019-10-03 08:00:38 +00: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
John Botella
135621c02b
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_dropdown_bookmark
2019-10-03 08:51:22 +02:00
stickler-ci
09b423d14d
Fixing style errors.
2019-10-02 22:35:09 +00:00
Sebastien Baguet
9daffcbe07
Fix for no subscription members
2019-10-03 00:29:41 +02:00
Frédéric FRANCE
0d41216624
Update dolgraph.class.php
2019-10-03 00:22:14 +02:00
Frédéric FRANCE
67cb432cfb
cut long lines
2019-10-02 23:10:33 +02:00
Frédéric FRANCE
c5f729b945
Update list.php
2019-10-02 22:59:13 +02:00
Frédéric FRANCE
723b88f618
retrieve duration of lines
2019-10-02 22:41:14 +02:00
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
91761e8185
fix migration script for thirdparties
2019-10-02 21:16:33 +02:00
Frédéric FRANCE
fe4629cd87
new migration script for thirdparties
2019-10-02 21:11:21 +02:00
Frédéric FRANCE
634fc5727c
new migration script for contacts
2019-10-02 21:08:41 +02:00
Frédéric FRANCE
b96911e9b7
new migration script for members
2019-10-02 21:05:19 +02:00
Frédéric FRANCE
37bb548d21
Merge remote-tracking branch 'upstream/develop' into socialnetworks
2019-10-02 20:56:32 +02:00
Frédéric FRANCE
cc03a0a63f
new migration script for user
2019-10-02 20:53:47 +02:00
Laurent Destailleur
6ec36ab04e
Fix phpunit
2019-10-02 20:36:57 +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
Frédéric FRANCE
fe0f190209
Update dav.php
2019-10-02 18:49:05 +02:00
Laurent Destailleur
d8a8c4fbe6
Look and feel v11. Picto are fontawesome.
2019-10-02 18:36:36 +02:00
Frédéric FRANCE
eb40d51dda
Update dav.php
2019-10-02 18:32:23 +02:00
Laurent Destailleur
24570f7165
Look and feel v11. Picto are fontawesome.
2019-10-02 18:14:41 +02:00
Frédéric FRANCE
9607bb145c
wip
2019-10-02 17:53:52 +02:00
