Laurent Destailleur
|
75252283c0
|
Merge branch 'develop' into master
|
2019-02-01 15:33:36 +01:00 |
|
Laurent Destailleur
|
aa9feaec55
|
Update doc
|
2019-02-01 15:19:57 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
Laurent Destailleur
|
97c8bca5ee
|
Fix doc
|
2019-02-01 15:09:05 +01:00 |
|
Laurent Destailleur
|
95a6957035
|
Fix setup doc
|
2019-02-01 15:04:44 +01:00 |
|
Laurent Destailleur
|
ae81bbac93
|
Better var name
|
2019-02-01 13:49:07 +01:00 |
|
Laurent Destailleur
|
b14a16a119
|
Code comment
|
2019-02-01 13:48:09 +01:00 |
|
Laurent Destailleur
|
849b3b640b
|
Code comment
|
2019-02-01 13:41:23 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
a0c0b377b2
|
css
|
2019-01-31 20:53:47 +01:00 |
|
Laurent Destailleur
|
c05628c746
|
Fix edit member module setup
|
2019-01-31 20:27:55 +01:00 |
|
Laurent Destailleur
|
0a56069f67
|
Fix trans
|
2019-01-31 19:42:55 +01:00 |
|
Laurent Destailleur
|
189323ad58
|
Fix when using image into description
|
2019-01-31 18:12:34 +01:00 |
|
Laurent Destailleur
|
4254ad0d33
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 15:51:54 +01:00 |
|
Laurent Destailleur
|
14dea53700
|
FIX Missing field in import/export of users
|
2019-01-31 15:51:02 +01:00 |
|
Laurent Destailleur
|
fd67253e40
|
Clean package
|
2019-01-31 13:16:54 +01:00 |
|
Laurent Destailleur
|
57797b1309
|
Remove image
|
2019-01-31 12:48:51 +01:00 |
|
Laurent Destailleur
|
4c31749f4b
|
Add tooltip on setup
|
2019-01-31 11:11:56 +01:00 |
|
Laurent Destailleur
|
2bed90e9db
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/sociales/class/chargesociales.class.php
|
2019-01-31 10:24:52 +01:00 |
|
Laurent Destailleur
|
7d4475f812
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-31 10:23:16 +01:00 |
|
Laurent Destailleur
|
4c2b27560d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:22:32 +01:00 |
|
Laurent Destailleur
|
484b4371c1
|
FIX XSS
Conflicts:
htdocs/viewimage.php
|
2019-01-31 10:19:23 +01:00 |
|
Laurent Destailleur
|
5e46a359e0
|
FIX XSS
|
2019-01-31 10:18:06 +01:00 |
|
Laurent Destailleur
|
21c089fee9
|
FIX XSS
|
2019-01-31 10:17:29 +01:00 |
|
Laurent Destailleur
|
6121771c5f
|
FIX XSS
|
2019-01-31 10:16:49 +01:00 |
|
Laurent Destailleur
|
045b8b13ed
|
css
|
2019-01-30 23:20:57 +01:00 |
|
Laurent Destailleur
|
a23fd6f090
|
Fix phpcs
|
2019-01-30 20:55:55 +01:00 |
|
Laurent Destailleur
|
01f1f6162f
|
Fix phpcs
|
2019-01-30 20:06:21 +01:00 |
|
Laurent Destailleur
|
15bd99acf4
|
Fix phpcs
|
2019-01-30 20:06:05 +01:00 |
|
Laurent Destailleur
|
c1f3f4c2b5
|
Fix: text for empty line not visible in select
|
2019-01-30 20:03:04 +01:00 |
|
Laurent Destailleur
|
b197ad72d3
|
Work on billing projects
|
2019-01-30 20:02:41 +01:00 |
|
Laurent Destailleur
|
200d30f2b9
|
Fix: text for empty line not visible in select
|
2019-01-30 20:01:55 +01:00 |
|
Laurent Destailleur
|
2882f45bca
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-30 18:55:01 +01:00 |
|
Laurent Destailleur
|
f67937c59d
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2019-01-30 18:54:29 +01:00 |
|
Laurent Destailleur
|
ae1c4e065b
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-30 18:53:56 +01:00 |
|
Laurent Destailleur
|
231395dab8
|
Merge pull request #10398 from atm-john/fix_trigger
Fix missing trigger
|
2019-01-30 18:53:10 +01:00 |
|
Laurent Destailleur
|
408609e0ec
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/tpl/objectline_edit.tpl.php
|
2019-01-30 16:54:38 +01:00 |
|
Laurent Destailleur
|
1b8a873987
|
Merge pull request #10434 from frederic34/patch-17
The variable $i does not seem to be defined for all execution paths
|
2019-01-30 16:49:16 +01:00 |
|
Laurent Destailleur
|
9fdba921b4
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/lib/functions.lib.php
|
2019-01-30 16:48:33 +01:00 |
|
Laurent Destailleur
|
41e20a9d4f
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-30 16:44:08 +01:00 |
|
Laurent Destailleur
|
81ae4c52c5
|
Merge pull request #10446 from mapiolca/8.0
Fix #10317 et #10318
|
2019-01-30 16:43:14 +01:00 |
|
Laurent Destailleur
|
d0b20178e0
|
Merge pull request #10442 from aspangaro/10.0_accountancy_default
NEW: When you create product or service, sell accountancy account by default are proposed
|
2019-01-30 16:30:13 +01:00 |
|
Laurent Destailleur
|
7983a85bb2
|
Update accountancy.lang
|
2019-01-30 16:29:45 +01:00 |
|
Laurent Destailleur
|
97248a830b
|
FIX #10440
|
2019-01-30 16:28:37 +01:00 |
|
Laurent Destailleur
|
6d992a6d7b
|
FIX #10440
|
2019-01-30 16:24:27 +01:00 |
|
Laurent Destailleur
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +01:00 |
|
Laurent Destailleur
|
db5d0f4e2d
|
Merge pull request #10461 from ptibogxiv/patch-109
Fix url payout
|
2019-01-30 16:16:34 +01:00 |
|
Laurent Destailleur
|
0fbf578edb
|
Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images
FIX css in the case of not showing topmenu images.
|
2019-01-30 16:15:40 +01:00 |
|
ptibogxiv
|
5fd75f0824
|
Fix url payout
|
2019-01-30 16:15:15 +01:00 |
|
Laurent Destailleur
|
bdbc61c1aa
|
Merge pull request #10454 from grandoc/new_branch_30_01_2019
update with html5 compliant code
|
2019-01-30 16:01:08 +01:00 |
|