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

1900 Commits

Author SHA1 Message Date
Laurent Destailleur
80adf0fff1
Merge pull request #13700 from joseplluis/patch-7 
Update MySpanish.isl
 2020-04-22 18:05:55 +02:00
Josep Lluís
3f071462ab
Update MySpanish.isl 2020-04-22 17:50:15 +02:00
Josep Lluís
8207d27d00
Update MyCatalan.isl 2020-04-22 17:36:10 +02:00
Laurent Destailleur
d54c093ae2 Fix file 2020-04-22 00:57:28 +02:00
UT from dolibit
758246c2a9
Update MyGerman.isl 2020-04-21 20:33:41 +02:00
Laurent Destailleur
64aa231e33 Avoid password in files 2020-04-04 23:32:02 +02:00
Laurent Destailleur
2b725ad5d5 Update year in demo data 2020-03-30 14:57:56 +02:00
Laurent Destailleur
221776d07d Migrate DoliWamp to use WampServer 3 2020-03-29 23:06:48 +02:00
Laurent Destailleur
0905b3a6b2 Fix function not found 2020-03-23 15:46:16 +01:00
Laurent Destailleur
01e60562b9 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/index.php
	htdocs/takepos/takepos.php
 2020-03-23 15:38:10 +01:00
Laurent Destailleur
f7b4e48d59 Code comment 2020-03-20 10:51:26 +01:00
Laurent Destailleur
082da101e2
Merge pull request #13202 from dolibit-ut/patch-5 
Update README
 2020-02-26 05:15:01 +01:00
UT from dolibit
2543f3f21b
Update README 2020-02-25 13:37:39 +01:00
UT from dolibit
e60a6ee13d
add composer entry 
add entry of sub-directories:
* composer
To test an upgrade of a lib.
 2020-02-25 13:29:24 +01:00
Alexandre SPANGARO
d6d3fff9dc Merge branch 'develop' into 10.0_intracommreport 2020-02-03 21:15:07 +01:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
3823070d33 Fix package rpm 2020-01-29 20:11:18 +01:00
Laurent Destailleur
34829644ed Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/projet/tasks/time.php
 2020-01-15 13:38:28 +01:00
Laurent Destailleur
db17a08144 Fix distrib in ping 2020-01-15 12:52:04 +01:00
Laurent Destailleur
5772dce460 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/functions.lib.php
 2020-01-15 12:09:21 +01:00
Laurent Destailleur
68169b6df0 Fix debian package 2020-01-13 14:43:27 +01:00
Laurent Destailleur
ab4e0fe99c FIX #12758 2020-01-13 14:38:01 +01:00
Laurent Destailleur
b7b87929d0
Merge branch 'develop' into hotfix/docker-ziparchive 2020-01-10 00:08:27 +01:00
Laurent De Coninck
dc364af635
make the docker supports ZipArchive 2020-01-09 09:53:39 +01:00
Alexandre SPANGARO
c664a1e42d Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-12-31 08:34:37 +01:00
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
Alexandre SPANGARO
8b8aaafc05 Merge branch 'develop' into 10.0_intracommreport 2019-07-20 05:47:31 +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
Alexandre SPANGARO
9da91c06ed Merge branch 'develop' into 10.0_intracommreport 2019-06-26 15:11:43 +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
Laurent Destailleur
6790930283 Add info on signature generator 2019-06-25 23:11:49 +02:00
Alexandre SPANGARO
4a84dcaa62 Merge remote-tracking branch 'upstream/develop' into 10.0_intracommreport 2019-06-23 21:47:34 +02:00
Philippe GRAND
f12a9c27da all http addresses should be https now 2019-06-23 15:27:11 +02:00
Philippe GRAND
fc379616b4 all http addresses should be https now 2019-06-23 15:26:13 +02:00
Alexandre SPANGARO
abfb708044 Merge branch 'develop' into 10.0_intracommreport 2019-06-19 21:43:40 +02:00
Regis Houssin
fd263cb316 FIX add v10 in virtualmin script 2019-06-18 07:15:59 +02:00
Laurent Destailleur
5144992eea Fix packager 2019-06-03 11:51:15 +02:00
Laurent Destailleur
5c2b585705 Fix packager 2019-06-03 11:50:20 +02:00
Laurent Destailleur
281c69f59a Prepare package 10.0 2019-06-03 11:33:04 +02:00
Alexandre SPANGARO
a239e0e81f WIP Admin 2019-05-20 13:33:54 +02:00
Laurent Destailleur
e84e3ef01f Move module into external module 2019-05-19 19:15:18 +02:00
Laurent Destailleur
399ffb2dcc Fix phpcs 2019-05-16 14:38:01 +02:00
Laurent Destailleur
4a69541419 Several bug fixes using phpstan 2019-05-15 18:59:46 +02:00
Laurent Destailleur
aaeb7dc9d6 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/holiday.php
	htdocs/comm/propal/list.php
	htdocs/commande/list.php
	htdocs/filefunc.inc.php
	htdocs/product/list.php
 2019-05-10 17:45:33 +02:00
Laurent Destailleur
bf3de83c5d Fix typo 2019-05-09 12:45:14 +02:00
Laurent Destailleur
5aa7382aee Fix packager for 10.0 2019-05-09 12:42:57 +02:00
Laurent Destailleur
b8b55fb748 WIP Add IFTTT module 2019-02-28 10:30:27 +01:00
Laurent Destailleur
fbdbb6343c Enhance changelog builder tool 2019-02-15 16:04:29 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
 2019-02-08 11:26:08 +01:00
Laurent Destailleur
3a5fc8f0c3 NEW Add protection to avoid packaging if files non indexed exists into 
dir.
 2019-02-08 10:41:11 +01:00
Frédéric FRANCE
f5b2cf75f2
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
fd67253e40 Clean package 2019-01-31 13:16:54 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
ecc30b8ffe Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
 2019-01-27 18:27:58 +01:00
Laurent Destailleur
97545af1fd Translation 2019-01-27 18:26:18 +01:00
Frédéric FRANCE
13f37204f6
wip 2019-01-27 13:23:32 +01:00
Laurent Destailleur
6867a8a88a Typo 2019-01-26 13:46:59 +01:00
Laurent Destailleur
43694f9384 FIX Compatibility with windows 10 2019-01-26 13:32:36 +01:00
Laurent Destailleur
97cc414b29 Update doliwamp 2019-01-26 12:35:02 +01:00
Laurent Destailleur
61290013dd Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-26 01:46:41 +01:00
Laurent Destailleur
89420dde62 Fix translation 2019-01-26 01:44:28 +01:00
Philippe GRAND
35ceb805dd update with html5 compliant code 2019-01-21 21:06:36 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
 2019-01-20 20:36:45 +01:00
Laurent Destailleur
9a6517a3bd Try to trap apache log 2019-01-19 17:38:05 +01:00
Laurent Destailleur
300889f53a # WARNING: head commit changed in the meantime 
Fix
 2019-01-19 13:22:38 +01:00
Laurent Destailleur
92eeff7a26 Fix packager and doc 2019-01-18 13:12:09 +01:00
Laurent Destailleur
5b037d87cb Update doc 2019-01-17 20:04:44 +01:00
Laurent Destailleur
2e55bdf087 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-17 19:11:18 +01:00
Laurent Destailleur
16220891f2 Clean package 2019-01-17 01:16:03 +01:00
Laurent Destailleur
b79aafc6e0 Add missing command 2019-01-16 20:57:41 +01:00
Laurent Destailleur
1345a63c8c Update doc 2019-01-16 20:56:11 +01:00
Philippe Grand
dfceecc04f
Update index.php.install 2019-01-16 19:14:24 +01:00
Philippe GRAND
ab23fe044a update with html5 compliant code 2019-01-16 17:34:36 +01:00
Laurent Destailleur
ae834416e9 Fix add include for binary 2018-12-04 17:35:22 +01:00
Regis Houssin
dcbb7c49fc FIX wrong value for instal lock 2018-12-03 13:31:28 +01:00
Regis Houssin
a2f514d4a1 FIX possibility to force install lock with GET/POST or script 2018-12-03 13:12:42 +01:00
Laurent De Coninck
0f45ed0a8c fix docker image creation + xdebug 
Fix the PHP image creation + adding xdebug

[see: X]
 2018-11-30 13:04:06 +01:00
Laurent Destailleur
0ce17e0617 Fix packager 2018-11-19 10:05:09 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
 2018-11-03 19:15:52 +01:00
Laurent Destailleur
6c4a2728ca Fix build 2018-10-31 12:33:08 +01:00
Regis Houssin
9589f69574 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
develop_email

Conflicts:
	htdocs/core/modules/facture/doc/doc_generic_invoice_odt.modules.php
 2018-10-30 18:29:28 +01:00
Laurent Destailleur
d8bf635530 Prepare module 2018-10-29 11:21:57 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
2ce7429735 Remove Google advert 2018-10-26 12:09:52 +02:00
Laurent Destailleur
96fce2828e Prepare 9.0 2018-10-16 17:02:36 +02:00
Laurent Destailleur
b8eaeb7c62 Clean build files 2018-10-11 09:22:09 +02:00
Laurent Destailleur
a8385c0255 Translation 2018-10-01 11:30:20 +02:00
Laurent Destailleur
5c712a6cd3
Merge branch 'develop' into trimtrailing 2018-08-16 00:47:09 +02:00
Laurent Destailleur
ec56ad752c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2018-08-15 14:26:38 +02:00
Laurent Destailleur
a866f94716 Fix package 2018-08-13 23:25:27 +02:00
Frédéric FRANCE
6cb0fb10d6
trim trailing 2018-07-26 19:05:34 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
db59fca9ac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-06-05 18:23:09 +02:00
Laurent Destailleur
8400614c3d Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-06-05 18:22:47 +02:00
Laurent Destailleur
426eb178f2 Merge branch '5.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2018-06-05 18:22:28 +02:00
Laurent Destailleur
8785d69548 Do not load database handler 2018-06-05 18:21:56 +02:00
Laurent Destailleur
2e2cc55350 Backport fix of file checker generation 2018-05-29 12:15:28 +02:00
Laurent Destailleur
95e3c5a4b1 Backport fix of file list check generation 2018-05-29 12:13:58 +02:00
Alexandre SPANGARO
675ae97f99 Update module assets (Add asset directory & langs) 2018-05-13 21:52:11 +02:00
Laurent Destailleur
5fe8249706 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2018-05-05 23:22:04 +02:00
Laurent Destailleur
8e729c2021 Add param autostable into generate_filelist_xml.php 2018-05-05 23:12:31 +02:00