lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
69,088 Commits 43 Branches 150 Tags 886 MiB
a5edd530d2
Commit Graph

69088 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a5edd530d2 Fix delete of website 2018-09-08 14:10:07 +02:00
Laurent Destailleur
391bb9efc6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-08 13:55:38 +02:00
Laurent Destailleur
538a2cc647 NEW Add first template of website 2018-09-08 13:55:15 +02:00
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +02:00
Laurent Destailleur
f0dafb7ae2
Merge pull request #9414 from grandoc/new_branch_03_09_2018 
Standardize and update code
 2018-09-07 19:40:14 +02:00
Laurent Destailleur
86cf289f14
Merge pull request #9430 from grandoc/new_branch_07_09_2018 
New branch 07 09 2018
 2018-09-07 19:38:57 +02:00
Laurent Destailleur
aa562c9c69
Merge pull request #9420 from frederic34/patch-5 
Update holiday.class.php
 2018-09-07 19:32:36 +02:00
Laurent Destailleur
33f71be6ef Fix gradient ok for webview 2018-09-07 19:03:53 +02:00
Philippe GRAND
035b2be2eb Standardize and update call to langs 2018-09-07 14:58:22 +02:00
Philippe GRAND
af37b08da3 Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018 2018-09-07 14:48:43 +02:00
Laurent Destailleur
e5058a251d Use colored gradient background on login page 2018-09-07 12:27:08 +02:00
Philippe GRAND
a6d13b06b0 Standardize and update call to 2018-09-07 10:40:36 +02:00
Philippe GRAND
97c740f510 Merge branch 'develop' of github.com:grandoc/dolibarr into develop 2018-09-06 19:28:10 +02:00
Philippe GRAND
e9c2a475bc fix merge 2018-09-06 19:27:28 +02:00
Laurent Destailleur
c5695db3e4 NEW Can disable meteo on smartphone only 2018-09-06 11:09:51 +02:00
Philippe GRAND
3c06527a7b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-06 09:50:12 +02:00
Laurent Destailleur
f7c87a9ad3 Clean cron init 2018-09-05 22:46:08 +02:00
Frédéric FRANCE
5a618c6808
Update holiday.class.php 2018-09-05 21:14:15 +02:00
Laurent Destailleur
2a471df828 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:42:55 +02:00
Laurent Destailleur
ed31eec5ee Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 20:40:19 +02:00
Laurent Destailleur
dfea391c88 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 
Conflicts:
	htdocs/core/lib/pdf.lib.php
 2018-09-05 20:39:38 +02:00
Laurent Destailleur
4ac67e6409 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 20:31:10 +02:00
Laurent Destailleur
e3339f5f95 Fix trad 2018-09-05 19:01:00 +02:00
Laurent Destailleur
0bd4bc39dd Fix responsive 2018-09-05 16:03:43 +02:00
Laurent Destailleur
ad92556a31 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-05 16:03:21 +02:00
Laurent Destailleur
cb89942bfb Add option capture on input file for photo 2018-09-05 16:03:10 +02:00
Philippe GRAND
056b0b26cc fix : Public member variable _fetched must not be prefixed with an underscore 2018-09-05 15:39:04 +02:00
Philippe GRAND
36e837207b Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018 2018-09-05 15:35:42 +02:00
Laurent Destailleur
3650dc3ec9 FIX #8452 2018-09-05 15:25:47 +02:00
Laurent Destailleur
f1cb13634b FIX Entering negative price on order 2018-09-05 14:55:45 +02:00
Laurent Destailleur
19431a94ba Code style 2018-09-05 14:37:44 +02:00
Laurent Destailleur
1882043f19 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 2018-09-05 14:26:24 +02:00
Laurent Destailleur
51901108ad FIX #9412 2018-09-05 14:26:12 +02:00
Laurent Destailleur
49b568f73f
Merge pull request #9413 from fmarcet/8.0 
FIX Expedition not showing extrafields on creation
 2018-09-05 14:16:28 +02:00
Laurent Destailleur
f3b0e16f27
Merge pull request #9411 from frederic34/patch-11 
Update api_agendaevents.class.php
 2018-09-05 14:16:05 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10 
Create index.html
 2018-09-05 14:15:22 +02:00
Laurent Destailleur
ead2a764c7
Merge pull request #9409 from frederic34/patch-9 
Create index.html
 2018-09-05 14:15:12 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Ferran Marcet
57be6a752e Fix: Expedition not showing extrafields on creation 2018-09-05 10:00:33 +02:00
Frédéric FRANCE
aa74d2ac38
Update api_agendaevents.class.php 2018-09-04 23:53:37 +02:00
Frédéric FRANCE
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +02:00
Laurent Destailleur
ab8155f170 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/commande/class/commande.class.php
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2018-09-04 21:35:43 +02:00
Laurent Destailleur
aec0d4022b Fix responsive 2018-09-04 19:59:20 +02:00
Laurent Destailleur
154e44e761 Fix responsive 2018-09-04 19:57:20 +02:00
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +02:00
Laurent Destailleur
b3e6d4a943
Merge pull request #9399 from grandoc/new_branch_03_09_2018 
New branch 03 09 2018
 2018-09-04 15:59:00 +02:00
Philippe GRAND
fada93574d Merge branch 'new_branch_03_09_2018' of github.com:grandoc/dolibarr into new_branch_03_09_2018 2018-09-04 14:51:44 +02:00
Philippe GRAND
707f8b7312 fix merge 2018-09-04 14:49:56 +02:00