2
0
forked from Wavyzz/dolibarr
Commit Graph

454 Commits

Author SHA1 Message Date
Laurent Destailleur
45eca85bae Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-07-28 10:29:14 +02:00
Laurent Destailleur
d46d34915e FIX Checkbox "drop table" was not checked when using php method for dump 2020-07-28 10:23:09 +02:00
Laurent Destailleur
75ac377352 Fix tar command 2020-05-16 04:26:43 +02:00
Laurent Destailleur
24f4a0be1f exclude other log files 2020-05-16 04:24:23 +02:00
Laurent Destailleur
a8222c2651 Look and feel v12 2020-05-06 05:10:42 +02:00
Laurent Destailleur
75dd5f268f Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/core/lib/sendings.lib.php
2020-05-01 22:00:00 +02:00
Laurent Destailleur
160009630f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2020-05-01 21:57:28 +02:00
Laurent Destailleur
aab9a2ff75 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 2020-05-01 21:03:38 +02:00
Laurent Destailleur
b41b22996f Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2020-05-01 21:03:16 +02:00
Laurent Destailleur
385f998254 Fix restore param --quick 2020-05-01 21:01:40 +02:00
Laurent Destailleur
82ace4b4ef FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2020-04-30 11:52:30 +02:00
Laurent Destailleur
31157931a9 Fix phpcs 2020-04-26 23:52:23 +02:00
Laurent Destailleur
16e46c672c Clean code 2020-04-20 15:06:27 +02:00
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-04-10 08:59:32 +00:00
Laurent Destailleur
6f1b9c4678 Fix colspan 2020-03-25 18:24:39 +01:00
Scrutinizer Auto-Fixer
e8083e2a65 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-03-23 14:54:02 +00:00
Laurent Destailleur
33c5db9cc3 Prepare code for the new pagination possibility 2020-03-13 13:07:11 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
ksar
e951743077 Update export_files.php
Remove Warning
2020-02-08 15:04:27 +01:00
ksar
b5da9763ce Update export_files.php
Remove Warning
2020-02-06 12:15:18 +01:00
ksar
16fdab6089 Update export_files.php
REmove the Warning
2020-02-06 12:12:20 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
26e450fb2a Fix extension of backup file 2020-01-17 11:52:21 +01:00
Laurent Destailleur
2099e05f22 Fix translation 2020-01-17 11:39:22 +01:00
Laurent Destailleur
906110dc1d Fix backup. Recommended compression is gzip. 2020-01-17 11:34:31 +01:00
Laurent Destailleur
ed0e4b53d4 Fix error in mysqldump 2020-01-15 16:11:31 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Frédéric FRANCE
35751a80ab 100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
204475efb9 Removed deprecated file 2019-11-05 19:10:29 +01:00
Frédéric FRANCE
e93aaa2a75 replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
360bf55f5b clean indent 2019-10-20 01:09:11 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Laurent Destailleur
b445c0eec7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
2019-09-03 22:40:26 +02:00
Laurent Destailleur
0a17e6bfd5 FIX Several pb in export of documents
FIX Must escape shell
FIX Must exclude logs and some dirs for compressed backup
FIX gzip and bzip2 must use option -f
2019-09-03 22:39:24 +02:00
Laurent Destailleur
5c13f5d397 Update dolibarr_export.php 2019-08-26 16:33:38 +02:00
Laurent Destailleur
6771af4565 Update dolibarr_export.php 2019-08-26 16:33:22 +02:00
schhub
3c706ae28a Update dolibarr_export.php 2019-08-23 08:53:43 +02:00
schhub
264763f6b7 Update dolibarr_export.php 2019-08-23 08:31:50 +02:00
schhub
9d3b4eb699 Update dolibarr_export.php 2019-08-23 08:05:44 +02:00
schhub
5bab233252 Delete action correction for documents backup.
correction of delete action always trying to delete files in document/admin/backup directory. Documents backups are stored in documents/admin/documents directory. If preg_match is too "heavy" it can be replaced by strpos.
2019-08-22 13:19:45 +02:00
Laurent Destailleur
70dc68426b Param 2019-08-21 13:12:37 +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