Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

1770 Commits

Author SHA1 Message Date
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
 2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
 2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/admin/system/filecheck.php
 2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556 Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Frédéric FRANCE
18e3a4bcbb Update generate_filelist_xml.php 2019-12-13 12:56:02 +01:00
Frédéric FRANCE
030b78d79f Update generate_filelist_xml.php 2019-12-13 11:16:04 +01:00
Frédéric FRANCE
cad54c6d7a Update generate_filelist_xml.php 2019-12-13 10:42:49 +01:00
Frédéric FRANCE
66805a502a doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
069e39ead8 Update dolibarr-doxygen-build.pl 2019-12-11 21:09:47 +01:00
Frédéric FRANCE
4309601ffb typo 2019-12-11 20:40:18 +01:00
Arunas Ruksnaitis
5572102ae5 Docker corrections 2019-12-10 00:30:47 +00:00
Daniel Seichter
c2eba28f36 Merge remote-tracking branch 'upstream/develop' into develop 2019-11-14 00:18:03 +01:00
Laurent Destailleur
e79ac7081a Look and feel v11 2019-11-12 17:37:05 +01:00
Laurent Destailleur
c07f1f8246 Try exakat 2019-11-12 16:26:42 +01:00
Daniel Seichter
0e450b2acf remove duplicate entries 2019-11-12 16:17:23 +01:00
Laurent Destailleur
2ccef4e469 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/supplier_invoice/pdf/pdf_canelle.modules.php
 2019-11-11 19:10:35 +01:00
Laurent Destailleur
96e93ef103 Clean code for tgz 2019-11-07 12:49:39 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Laurent Destailleur
263bd9cbc0 Filter 2019-10-18 15:12:07 +02:00
Laurent Destailleur
e8104a50ac Better params 2019-10-18 13:59:48 +02:00
Laurent Destailleur
aabf30ffd0 Tools to build dolibarr genesis video 2019-10-18 12:57:43 +02:00
Laurent Destailleur
9055d1a4c0 Add files and doc to execute gource on Dolibarr git project 2019-10-18 12:06:45 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Laurent Destailleur
e7beadb58a Remove duplicate 2019-09-28 10:42:58 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
Daniel Seichter
1c5a5eb593 Added hint for setting up database (issue #11815) 2019-09-16 13:24:21 +02:00
Laurent Destailleur
28785b31d7 Removed useless div 2019-09-09 19:18:01 +02:00
Laurent Destailleur
3802734212 fix 2019-09-05 16:37:30 +02:00
Laurent Destailleur
6ea7e06982 Doxygen 2019-08-27 20:36:52 +02:00
Laurent Destailleur
6df36866e1 Remove mentions to register_globals 2019-08-14 15:30:03 +02:00
Laurent Destailleur
2e68488231 Enhance scan using phpstan 2019-07-20 15:53:46 +02:00
Laurent Destailleur
c9477f5c4f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-07-01 13:29:33 +02:00
Laurent Destailleur
0259cde0da Typo 2019-07-01 13:26:45 +02:00
Laurent Destailleur
511b21ca9c Fix for doliwamp 2019-07-01 00:22:28 +02:00
Laurent Destailleur
46ced373be Fix for doliwamp 2019-06-30 23:52:28 +02:00
Laurent Destailleur
8f5b575b19 Fix missing php-intl is not blocking (not working on windows) 2019-06-30 16:19:26 +02:00
Laurent Destailleur
a992690c43 Fix missing php-intl 2019-06-30 14:49:51 +02:00
Laurent Destailleur
b31297b712 Add comment for microsoft edge 2019-06-30 14:45:36 +02:00
Laurent Destailleur
fcf3ec3f0e Fix software is uncountable noun 2019-06-30 14:01:02 +02:00
Laurent Destailleur
8919eaebab Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-29 23:27:15 +02:00
Laurent Destailleur
6537faa35e Fix merge 2019-06-29 23:26:14 +02:00
Laurent Destailleur
0aeb27ba97 Fix merge 2019-06-29 23:25:07 +02:00
Laurent Destailleur
2cefe638ef Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/compta/prelevement/factures.php
 2019-06-29 23:24:04 +02:00
Laurent Destailleur
81bb85c4df Merge 2019-06-29 23:19:47 +02:00
Laurent Destailleur
fdc958a172 Fix launch of ISCC.ex if not into path 2019-06-29 23:17:36 +02:00
Laurent Destailleur
09d420307d Fix error "fatal: ni ceci ni aucun de ses répertoires parents n'est un 
dépôt git : .git"
 2019-06-29 23:16:07 +02:00
Laurent Destailleur
1ae9d94de9 Add info on signature generator 2019-06-25 23:15:30 +02:00
Laurent Destailleur
51a1550dbb Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2019-06-25 23:14:49 +02:00
Laurent Destailleur
7a0962a393 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/modules/modAccounting.class.php
 2019-06-25 23:13:55 +02:00