Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,827 Commits 35 Branches 179 Tags 1.7 GiB
b0f0f655e9
Commit Graph

5513 Commits

Author SHA1 Message Date
Laurent Destailleur
163ae6d81a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-15 20:42:51 +02:00
Laurent Destailleur
155d41ee80 FIX Enable web site 2019-08-13 04:49:12 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
Laurent Destailleur
a35a999d74 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 02:52:53 +02:00
Laurent Destailleur
00660d4885 Fix responsive 2019-08-12 02:52:36 +02:00
Laurent Destailleur
86d39b435b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-12 02:42:11 +02:00
Laurent Destailleur
49e2f447a8 Fix responsive 2019-08-12 02:41:27 +02:00
Ferran Marcet
cda8b15c7f FIX: Not showing MAIN_INVERT_SENDER_RECIPIENT when edit field 2019-08-05 14:00:15 +02:00
Laurent Destailleur
3d8f6dca76 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-01 16:30:32 +02:00
Laurent Destailleur
d6ae62478c FIX #10984 FIX reposition on "Build backup" button 
FIX Fatal error on dol_htmloutput_mesg with corrupted array
 2019-08-01 15:42:44 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
8f2e781df6 FIX #11537 2019-08-01 12:42:12 +02:00
Laurent Destailleur
a7390e7e47
Merge pull request #11396 from ATM-Consulting/New_retained_warranty_develop 
NEW Management of retained warranty on situation invoices
 2019-07-30 21:53:09 +02:00
Laurent Destailleur
ecc0b4ed32 Add prefixsession in event table 2019-07-29 02:16:21 +02:00
Laurent Destailleur
bef3423764 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-07-22 19:12:27 +02:00
Laurent Destailleur
f5afc50067 Merge branch '11.0_salaries' of https://github.com/aspangaro/dolibarr into aspangaro-11.0_salaries 2019-07-22 18:47:35 +02:00
Laurent Destailleur
f0f0b989e9 FIX Add warning when setup is strange 2019-07-21 16:41:01 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/ticket/class/ticket.class.php
 2019-07-20 13:29:10 +02:00
Laurent Destailleur
20e58bdd97 FIX Limit of uploaded files (max_post_size was not used) 2019-07-20 13:09:25 +02:00
Laurent Destailleur
9f9598ac99 FIX missing token 2019-07-20 11:44:54 +02:00
Laurent Destailleur
e85c2202e8 FIX missing token 2019-07-20 11:44:31 +02:00
Alexandre SPANGARO
0af1206892
Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
327e5ebe78 FIX Show list of events on tickets 2019-07-19 19:09:38 +02:00
Laurent Destailleur
f745d01bf3 Prepare change of properties "titre" into "title" 2019-07-19 13:22:54 +02:00
Laurent Destailleur
278c2d7152 Enhance the perf page 2019-07-19 12:58:21 +02:00
Laurent Destailleur
fe89e158fe Fix: Avoid deletion of system entries in dictionary 2019-07-19 04:03:33 +02:00
Laurent Destailleur
2afefada40 Fix: Avoid deletion of system entries in dictionary 2019-07-19 04:02:42 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
b9fe874b5f Revert "Merge pull request #11022 from altatof/freetext" 
This reverts commit 879b4d8e7f, reversing
changes made to ddc01b4c27.
 2019-07-18 18:19:51 +02:00
Laurent Destailleur
c27ac63a3a Revert "Fix phpcs" 
This reverts commit 03e5cc16ca.
 2019-07-18 18:18:07 +02:00
Laurent Destailleur
a09d33b427 Fix responsive 2019-07-18 17:47:00 +02:00
Laurent Destailleur
03e5cc16ca Fix phpcs 2019-07-18 17:33:47 +02:00
Laurent Destailleur
879b4d8e7f
Merge pull request #11022 from altatof/freetext 
NEW : manage output languages for free text
 2019-07-18 17:29:45 +02:00
Laurent Destailleur
c1df3ae5c1 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-18 11:10:18 +02:00
Laurent Destailleur
a23bae6c96 Work to mke the page perf.php public by default. 2019-07-18 11:10:09 +02:00
Alexandre SPANGARO
21bd46fc15 Merge remote-tracking branch 'upstream/develop' into 11.0_salaries 2019-07-17 14:09:46 +02:00
Alexandre SPANGARO
79d8351dda NEW Extrafields on salaries 2019-07-17 14:09:25 +02:00
Laurent Destailleur
adfbd62f8b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-14 00:44:35 +02:00
Frédéric FRANCE
61c83117fe
Update ihm.php 2019-07-09 15:18:51 +02:00
Laurent Destailleur
0a7d70829f Translation of some comments 2019-07-05 21:37:25 +02:00
Laurent Destailleur
69db6e6aa7 Fix look and feel v10 2019-07-05 18:45:13 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
42576eb27a Fix status of email templates not visible for non admin users 2019-07-05 17:22:13 +02:00
Laurent Destailleur
5c6684bb73 Fix setup of ticket module 2019-07-05 11:53:33 +02:00
Laurent Destailleur
2fee41f712 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 12:27:00 +02:00
Laurent Destailleur
8e3620fce1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/compta/facture/invoicetemplate_list.php
 2019-07-04 12:26:17 +02:00
John Botella
a75a2ae8e4 Fix missing hidden input and short label 2019-07-02 15:44:42 +02:00
John Botella
9c2e83dcae Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_retained_warranty_develop 2019-07-01 09:51:26 +02:00
Laurent Destailleur
adb3062a9f Work on nblignes -> nblines 2019-06-29 16:38:14 +02:00