Laurent Destailleur
|
f207e91643
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/holiday/define_holiday.php
htdocs/main.inc.php
htdocs/societe/class/societe.class.php
|
2018-02-20 15:06:41 +01:00 |
|
Laurent Destailleur
|
b8736f5103
|
Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 14:59:40 +01:00 |
|
Laurent Destailleur
|
a698ba0b56
|
Merge pull request #8205 from steschuser/5.0
FIX: #8139 User search does not work if MAIN_USE_OLD_SEARCH_FORM, missing list.php
|
2018-02-20 14:59:20 +01:00 |
|
Laurent Destailleur
|
8596b0b59d
|
Merge pull request #8203 from dolibarr95/patch-38
Fix : bad var name
|
2018-02-20 14:58:28 +01:00 |
|
Laurent Destailleur
|
30554e0385
|
Merge branch 'develop' into patch-38
|
2018-02-20 14:58:04 +01:00 |
|
Laurent Destailleur
|
85e5ac678f
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 14:56:17 +01:00 |
|
Laurent Destailleur
|
6c8e7494f0
|
Merge pull request #8200 from atm-maxime/fix_contact_tooltiip
Fix contact tooltip
|
2018-02-20 14:56:06 +01:00 |
|
Laurent Destailleur
|
276f2dce77
|
FIX #8200
|
2018-02-20 14:55:23 +01:00 |
|
Laurent Destailleur
|
67ee443b34
|
Fix can set holiday remaining to 0
|
2018-02-20 14:53:19 +01:00 |
|
Laurent Destailleur
|
346a0becac
|
Propagate context
|
2018-02-20 13:20:24 +01:00 |
|
Laurent Destailleur
|
b361877ea8
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/compta/facture/card.php
|
2018-02-20 12:48:28 +01:00 |
|
Laurent Destailleur
|
4056b87a74
|
Fix syntax error
|
2018-02-20 12:36:03 +01:00 |
|
Laurent Destailleur
|
7321829732
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2018-02-20 12:34:15 +01:00 |
|
Laurent Destailleur
|
ea071b7680
|
Fix can't delete holiday refused
|
2018-02-20 12:31:26 +01:00 |
|
Laurent Destailleur
|
17c210ca98
|
Normalize links href to Dolibarr internal naming
|
2018-02-20 11:16:13 +01:00 |
|
Laurent Destailleur
|
32e8bab20d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-02-20 11:01:20 +01:00 |
|
Laurent Destailleur
|
16fca2ee35
|
Fix bad link
|
2018-02-20 10:05:11 +01:00 |
|
Laurent Destailleur
|
87a3019e73
|
Fix upgrade missing steps
|
2018-02-20 06:03:22 +01:00 |
|
Laurent Destailleur
|
aa1ede6f74
|
FIX Search criteria on vat
|
2018-02-20 06:03:08 +01:00 |
|
Laurent Destailleur
|
cb644665bd
|
Fix output dir of grab
|
2018-02-20 06:02:53 +01:00 |
|
Laurent Destailleur
|
eb0073c330
|
Fix upgrade missing steps
|
2018-02-20 05:53:53 +01:00 |
|
Laurent Destailleur
|
0a00bdcb73
|
FIX Search criteria on vat
|
2018-02-20 05:45:42 +01:00 |
|
Laurent Destailleur
|
6ef3b330e4
|
Fix output dir of grab
|
2018-02-20 00:04:43 +01:00 |
|
Laurent Destailleur
|
5f51af505f
|
NEW Can delete dir content in media and ECM module recursively
|
2018-02-19 23:52:45 +01:00 |
|
Laurent Destailleur
|
9230c6757b
|
Fix error when removing dir with some subdirs
|
2018-02-19 23:31:35 +01:00 |
|
Laurent Destailleur
|
5ada5c18f9
|
url in generator
|
2018-02-19 23:19:54 +01:00 |
|
Laurent Destailleur
|
1cb58a308c
|
Fix redirect
|
2018-02-19 22:25:12 +01:00 |
|
Laurent Destailleur
|
1f412bd1d4
|
Fix infinite redirects
|
2018-02-19 22:10:15 +01:00 |
|
Laurent Destailleur
|
bfbe03d55d
|
Fix tooltip doc
|
2018-02-19 21:57:30 +01:00 |
|
Laurent Destailleur
|
3eef9fd57a
|
Fix doc
|
2018-02-19 21:31:03 +01:00 |
|
Laurent Destailleur
|
31d0679876
|
Add data
|
2018-02-19 19:52:51 +01:00 |
|
Laurent Destailleur
|
1ee128ff13
|
NEW Add type of website container/page into dictionary
|
2018-02-19 19:48:53 +01:00 |
|
Laurent Destailleur
|
576fda9c4a
|
Sort
|
2018-02-19 18:17:42 +01:00 |
|
Laurent Destailleur
|
a0078baeb6
|
Fix webpage
|
2018-02-19 18:07:59 +01:00 |
|
Ferran Marcet
|
671b4a399d
|
Fix: Barcode type
|
2018-02-19 17:47:24 +01:00 |
|
Ferran Marcet
|
2e1727e323
|
Fix: Barcode type
|
2018-02-19 17:45:19 +01:00 |
|
Ferran Marcet
|
5535daf84a
|
Merge branch '5.0up' into 5.0
|
2018-02-19 17:43:14 +01:00 |
|
Laurent Destailleur
|
f3114765a3
|
Work on website module
|
2018-02-19 16:46:29 +01:00 |
|
Laurent Destailleur
|
60a77a6d85
|
Add option to grab images into same dir or subdir
|
2018-02-19 14:56:37 +01:00 |
|
sschwebel
|
7c583227fb
|
FIX: #8139
|
2018-02-19 10:58:05 +01:00 |
|
Laurent Destailleur
|
60fe1fa503
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/mails.php
|
2018-02-17 01:19:17 +01:00 |
|
Laurent Destailleur
|
ab6d0d2530
|
Fix errors
|
2018-02-17 01:16:52 +01:00 |
|
Laurent Destailleur
|
46c941c823
|
Translation
|
2018-02-16 23:57:35 +01:00 |
|
Laurent Destailleur
|
5c5d2cbefa
|
Fix smtp warning message
|
2018-02-16 23:49:08 +01:00 |
|
Laurent Destailleur
|
9bed2ce8e2
|
Fix ignore file integrity check on filefunc.inc.php for deb/rpm package
|
2018-02-16 22:03:13 +01:00 |
|
Laurent Destailleur
|
b3e567c310
|
Fix rpm package for apache 2.4, selinux and php packages
|
2018-02-16 20:47:28 +01:00 |
|
Laurent Destailleur
|
a4b155fc91
|
Fix typo and
|
2018-02-16 20:42:40 +01:00 |
|
Laurent Destailleur
|
c513ffe1f7
|
Fix debian package
|
2018-02-16 18:21:18 +01:00 |
|
Laurent Destailleur
|
8db6b1ecc0
|
Fix package for debian
|
2018-02-16 17:19:04 +01:00 |
|
Laurent Destailleur
|
d233c152a7
|
Code comment
|
2018-02-16 14:18:05 +01:00 |
|