Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-25 19:01:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
68,401 Commits 36 Branches 191 Tags
d5aed3394dea03d152db518a6d96547b82b176c1
Commit Graph

68401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ptibogxiv
d5aed3394d fix duration display for service in list.php 2018-08-20 09:52:59 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
795b2f3d58 FIX Delete file on smartphone 2018-08-19 03:00:11 +02:00
Laurent Destailleur
547a0aaac7 FIX Look and feel v8 2018-08-19 02:43:45 +02:00
Laurent Destailleur
116f4a1a09 Fix responsive 2018-08-19 02:22:12 +02:00
Laurent Destailleur
d8365e9260 Module DAV 2018-08-19 02:17:12 +02:00
Laurent Destailleur
cca0f4bf22 Fix translation 2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c Fix trans 2018-08-19 01:51:45 +02:00
Laurent Destailleur
9a82cc3261 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
Laurent Destailleur
8ac3b01f04 NEW Can export/import a website template 2018-08-16 23:57:19 +02:00
Laurent Destailleur
ab22c9d0de Work on import 2018-08-16 21:48:16 +02:00
Laurent Destailleur
4e02b134da Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-16 14:50:04 +02:00
Laurent Destailleur
4c52384609 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-08-16 14:48:42 +02:00
Laurent Destailleur
0c654bd452 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-08-16 14:47:56 +02:00
Laurent Destailleur
7075fdf8f5 NEW Can add autorefresh=X in any URLs to refresh page after X seconds 2018-08-16 14:47:12 +02:00
Laurent Destailleur
f7da76e1c0 Use session cache for stats 2018-08-16 14:24:59 +02:00
Laurent Destailleur
1b1258b2ef Fix url in tooltip 2018-08-16 11:19:22 +02:00
Laurent Destailleur
71c1d2275b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-16 11:18:18 +02:00
Laurent Destailleur
bbd19010d0 Fix url in tooltip 2018-08-16 11:18:03 +02:00
Laurent Destailleur
9f5cc2d05f Fix menu entry 2018-08-16 10:33:20 +02:00
Laurent Destailleur
1922c3d881 Fix menu entry 2018-08-16 10:32:42 +02:00
Laurent Destailleur
2719c4eb43 Fix escape 2018-08-16 01:01:38 +02:00
Laurent Destailleur
4b7889b295 Fix left join broken 2018-08-16 01:00:38 +02:00
Laurent Destailleur
3b245f1b30 Merge pull request #9247 from frederic34/missingReturn 
return comment
 2018-08-16 00:35:39 +02:00
Laurent Destailleur
55bfe4e821 Merge pull request #9245 from grandoc/new_branch_14_08_2018 
Standardize code
 2018-08-16 00:33:33 +02:00
Laurent Destailleur
e88b68f131 Merge pull request #9246 from atm-florian/6.0 
fix : ODT project substitution
 2018-08-16 00:33:04 +02:00
Laurent Destailleur
2a69fa39d6 error message 2018-08-16 00:18:08 +02:00
Laurent Destailleur
4610b193bb Add error message 2018-08-16 00:13:13 +02:00
Laurent Destailleur
ae9867eead Work on website import 2018-08-16 00:03:19 +02:00
Laurent Destailleur
7d6e25789c Fix popup customer 2018-08-15 15:07:23 +02:00
Laurent Destailleur
15144a2473 Prepare 8.0.1 2018-08-15 14:42:34 +02:00
Laurent Destailleur
5a1a6ac095 Fix error message 2018-08-15 14:42:03 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
b88c657a4a Work on website import 2018-08-15 14:24:33 +02:00
Philippe GRAND
57f51fda3e Standardize 2018-08-15 12:48:13 +02:00
Laurent Destailleur
37ca3ff230 Fix separator 2018-08-14 20:51:24 +02:00
Frédéric FRANCE
d25fa61998 return comment 2018-08-14 13:14:55 +02:00
Frédéric FRANCE
a0a6afc224 return comment 2018-08-14 12:23:10 +02:00
florian HENRY
20309665e6 fix : ODT project substitution 2018-08-14 10:45:08 +02:00
Philippe GRAND
e35da2f84d Standardize code 2018-08-14 09:55:58 +02:00
Laurent Destailleur
7c6f41e04f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-13 23:58:18 +02:00
Laurent Destailleur
fa4a12be41 Merge pull request #9208 from ptibogxiv/patch-33 
fix connect mode for v8 release
 2018-08-13 23:56:42 +02:00
Laurent Destailleur
b98ee516d0 Merge pull request #9235 from grandoc/new_branch_13_08_2018 
standardize code
 2018-08-13 23:47:00 +02:00
Laurent Destailleur
b4a4ab4fa0 Merge pull request #9233 from grandoc/new_branch_12_08_2018 
standardize code
 2018-08-13 23:46:37 +02:00
Laurent Destailleur
3039e0e5ef Merge pull request #9237 from CelineDesign/develop 
NEW #9236 Allow to import expedtion lines via API
 2018-08-13 23:44:26 +02:00
delcroix Patrick
3b9266060c Fix #9205 quote in Label/number on supplier payment 
# Fix #9205 #9205
the num_paiement wasn't escaped, not sure it's an real issue but it was reported here
https://www.dolibarr.fr/forum/8-mise-a-jour/62340-message-erreur-suite-mise-a-jour#99408
8.0.0 		2018-08-13 23:42:18 +02:00
Laurent Destailleur
e325da9339 Merge pull request #9244 from delcroip/patch-16 
Fix #9205 quote in Label/number on supplier payment
 2018-08-13 23:41:02 +02:00
Laurent Destailleur
549462574e Merge pull request #9241 from frederic34/patch-11 
Update modules_holiday.php
 2018-08-13 23:40:05 +02:00
Laurent Destailleur
577d2d728c Merge pull request #9238 from ptibogxiv/patch-35 
Fix dolibarr_set_const
 2018-08-13 23:39:42 +02:00