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
106,821 Commits 35 Branches 179 Tags 1.7 GiB
6447c1e394
Commit Graph

7406 Commits

Author SHA1 Message Date
Laurent Destailleur
409da7f091 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-25 19:17:41 +01:00
Laurent Destailleur
84db3437bd Add missing ' in command 2022-02-25 14:13:42 +01:00
Laurent Destailleur
8c61a29051 Show value of short_open_tags 2022-02-25 01:30:34 +01:00
Laurent Destailleur
e96061dd18 Fix phpunit SecurityTest 2022-02-22 23:46:57 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
27cc6078ed Clean code 2022-02-22 22:15:29 +01:00
Thomas Negre
5d10d6cb78 allow delays configuration from ticket module params 2022-02-21 11:57:59 +01:00
ptibogxiv
b8d82671b3
Update filecheck.php 2022-02-20 10:39:59 +01:00
ptibogxiv
996dcdde82
FIX error with php8 2022-02-19 18:34:53 +01:00
Laurent Destailleur
6b8312aab0 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-17 20:51:25 +01:00
Laurent Destailleur
d19aca7192 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into 15.0
 2022-02-17 20:50:03 +01:00
Laurent Destailleur
ec71eb410e
Merge pull request #20040 from thomas-Ngr/develop_ticket_config_auto_read 
ticket config: auto read ticket
 2022-02-17 19:58:01 +01:00
Laurent Destailleur
39bb854ef8
Update ticket.php 2022-02-17 19:57:45 +01:00
Laurent Destailleur
7e33794f66
Merge pull request #20047 from simicar29/14-dolistore 
Fix urlencode breaking links in Market Place page
 2022-02-17 19:54:04 +01:00
Laurent Destailleur
c529af90c6 Fix trans 2022-02-17 12:06:48 +01:00
Laurent Destailleur
3697cb9ca4 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/reception/class/reception.class.php
 2022-02-17 11:34:54 +01:00
Laurent Destailleur
d5e5e8d436 Debug v15 2022-02-13 17:09:40 +01:00
Laurent Destailleur
1097111706 Fix autofocus 2022-02-13 16:37:08 +01:00
Laurent Destailleur
cafdcb7206 Show translation value 2022-02-13 16:13:38 +01:00
Laurent Destailleur
b623b88674 css 2022-02-11 18:06:39 +01:00
Marc GUENNEUGUES
c552030b69 Fix urlencode breaking links in Market Place page 2022-02-11 15:18:38 +01:00
Laurent Destailleur
b84fd3ec3d Clean code 2022-02-11 12:46:45 +01:00
Thomas Negre
c5d1310373 handle workflow constants in appropriate category 2022-02-10 17:51:32 +01:00
Thomas Negre
39bd5dd6dc ticket config : add TICKET_AUTO_READ_WHEN_CREATED_FROM_BACKEND option to config panel 2022-02-10 17:50:59 +01:00
Laurent Destailleur
3b18462a62 # WARNING: head commit changed in the meantime 
Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop
 2022-02-07 15:51:01 +01:00
Laurent Destailleur
31ca78acda Sync transifex. 
Fix install.
 2022-02-07 14:25:20 +01:00
Laurent Destailleur
9b1f04209d NEW Change in theme colors does not need to use the refresh button 2022-02-06 22:11:44 +01:00
Laurent Destailleur
86da9c610e
Merge pull request #17887 from marc-dll/develop_NEW_block_leave_if_negative_balance 
NEW: leave requests: add field into type dictionary to block request if balance is negative
 2022-02-04 20:23:04 +01:00
Laurent Destailleur
aef646bb2a Change order of options and removed useless option 2022-02-04 12:17:38 +01:00
Laurent Destailleur
44bc197d03 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-01 13:25:45 +01:00
Laurent Destailleur
9db0b7d0ef Fix look and feel v15 2022-02-01 11:57:33 +01:00
Laurent Destailleur
38e39cfa96 CSS 2022-01-28 19:57:07 +01:00
Laurent Destailleur
288a6564dc CSS 2022-01-28 19:28:37 +01:00
Anthony Berton
49efba7ded
Merge branch 'develop' into Add_param_color_button_action 2022-01-26 15:12:16 +01:00
BB2A Anthony Berton
28b9ead688 ADD config text color 2022-01-26 15:06:51 +01:00
Laurent Destailleur
38408f916b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop
 2022-01-26 13:51:25 +01:00
Laurent Destailleur
416543a5f5 Standardize code to allow deletion of an odt template 2022-01-26 13:49:46 +01:00
BB2A Anthony Berton
656dc02e7d Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-26 13:03:01 +01:00
BB2A Anthony Berton
54b5fed67b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into Add_param_color_button_action 2022-01-25 16:45:30 +01:00
Juanjo Menent
56cb81287e Merge remote-tracking branch 'upstream/develop' into develop_hotfix19760 
# Conflicts:
#	htdocs/install/mysql/migration/15.0.0-16.0.0.sql
 2022-01-25 16:25:44 +01:00
Laurent Destailleur
34d3fdad02
Merge pull request #19699 from atm-john/new_convert_setup_to_new_setup 
NEW : convert situation setup to new setup system
 2022-01-25 15:17:14 +01:00
Laurent Destailleur
8dbadc0aa8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 14:12:06 +01:00
Laurent Destailleur
1eb4d76253 Clean code 2022-01-24 13:15:32 +01:00
Laurent Destailleur
8ceec043e8 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-24 12:50:10 +01:00
Laurent Destailleur
67fa80cf18
Merge pull request #19841 from fappels/15_fix_dolibarr_export 
Fix view after generate database export
 2022-01-23 18:20:36 +01:00
Laurent Destailleur
9049134556 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-23 12:07:11 +01:00
Laurent Destailleur
e06ca2ea08 css 2022-01-23 02:38:34 +01:00
Laurent Destailleur
e3cf5fecbe css 2022-01-23 02:06:47 +01:00
Laurent Destailleur
a16293f9b7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-01-22 17:27:57 +01:00
Laurent Destailleur
65e58943b3 FIX exclude the pdf png preview files from backup 2022-01-21 20:57:45 +01:00