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
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

322 Commits

Author SHA1 Message Date
Laurent Destailleur
b8969edcc5 Prepare 3.6.1 2014-09-27 12:34:45 +02:00
Laurent Destailleur
0514fa02d5 Clean path dolibarr_main_url_root to avoid duplicate /. 2014-08-06 00:06:27 +02:00
Laurent Destailleur
db091896a5 Prepare 3.6. 
Use google adsense tag of foundation for doxygen doc pages.

Version is no more encoded int odoxygen.

Merge remote-tracking branch 'origin/3.5' into 3.6

Conflicts:
	ChangeLog
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/compta/facture/impayees.php
	htdocs/filefunc.inc.php
 2014-07-26 18:10:51 +02:00
Laurent Destailleur
a8547e9c4d Fix: [ bug #1523 ] suite bug #1334 : filtre et ordre de tri conjoints ne 
s'appliquent pas
 2014-07-26 17:30:10 +02:00
Laurent Destailleur
e2790895ad Prepare 3.7 development. 2014-06-26 21:48:57 +02:00
Laurent Destailleur
5853b9eb30 Merge branch 'bug-1416' of github.com:marcosgdf/dolibarr into 
marcosgdf-bug-1416

Conflicts:
	ChangeLog
 2014-06-10 01:37:43 +02:00
Laurent Destailleur
fd271d7c92 Fix: Missing to set version to beta 2014-05-14 14:09:57 +02:00
Laurent Destailleur
1c6c79811d Prepare version 3.5.3 2014-05-06 16:09:13 +02:00
Raphaël Doursenaud
f8f502d013 Removed closing php tag 
http://php.net/manual/en/language.basic-syntax.phptags.php
 2014-05-03 18:18:44 +02:00
Laurent Destailleur
c8f63d6160 Fix: Prepare for 3.5.2 2014-03-14 00:17:39 +01:00
Laurent Destailleur
6a84a7f935 Prepare version 3.5.1 2014-02-08 13:56:28 +01:00
Laurent Destailleur
0bdcda50c6 Merge remote-tracking branch 'origin/3.4' into 3.5 
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
 2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
 2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377 Fix: Update doc and packager for doliwamp 
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
 2013-12-31 15:41:25 +01:00
Laurent Destailleur
247c49e094 Prepare 3.5.0 release 2013-12-31 15:17:10 +01:00
Laurent Destailleur
b8141ef2db Prepare 3.6 dev 2013-11-22 19:32:36 +01:00
Laurent Destailleur
db9e9a3372 Prepare 3.5.0 beta 2013-11-07 00:41:27 +01:00
Laurent Destailleur
84b36d1230 Prepare for 3.4.2 2013-11-01 17:24:09 +01:00
Laurent Destailleur
8203971614 Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated 
Conflicts:
	htdocs/filefunc.inc.php
 2013-10-23 18:33:56 +02:00
Laurent Destailleur
2dad13a5c4 Try to fix bug [ bug #1072 ] Wrong DOL_URL_ROOT value calculated 2013-10-23 17:47:46 +02:00
Laurent Destailleur
04752dbfbe Doxygen: More comments 2013-09-18 17:59:57 +02:00
Laurent Destailleur
f45be6a2a7 Prepare for 3.4.1 
Merge remote-tracking branch 'origin/3.3' into 3.4

Conflicts:
	build/debian/changelog
 2013-09-06 01:37:07 +02:00
Laurent Destailleur
afae841ae4 Fix: Permissions on files 2013-08-06 00:36:21 +02:00
Laurent Destailleur
ae9c3cd780 Prepare 3.3.4 2013-07-26 16:43:06 +02:00
Laurent Destailleur
b5820315f9 Fix: Correct permissions on files 2013-07-13 10:34:19 +02:00
Laurent Destailleur
f94f516a12 Clean code for managing alternate root dirs. 2013-07-09 23:46:31 +02:00
Laurent Destailleur
0de1fe893a Prepare 3.4 2013-07-07 13:30:30 +02:00
Laurent Destailleur
7b5e0678db New: Make some changes to allow usage of alternative 
$dolibarr_main_url_root variables.
Can now use several alternative path. Fix several bugs with all code.
 2013-07-07 03:26:51 +02:00
Laurent Destailleur
187feff7d5 Prepare 3.3.3 2013-06-25 20:40:22 +02:00
Laurent Destailleur
701d8485ef Merge remote-tracking branch 'origin/3.4' into develop 2013-05-24 19:00:16 +02:00
Laurent Destailleur
961ce6e3e2 Fix: Removed error blocking redirect 2013-05-21 19:53:10 +02:00
Laurent Destailleur
6c4e47514d Merge remote-tracking branch 'origin/3.4' into develop 
Conflicts:
	htdocs/holiday/fiche.php
 2013-05-11 15:26:24 +02:00
Laurent Destailleur
9e847884d1 Prepare dev branch 2013-05-03 18:41:14 +02:00
Laurent Destailleur
0b228b3a87 Merge remote-tracking branch 'origin/3.3' into 3.4 
Conflicts:
	htdocs/user/perms.php
 2013-05-03 18:33:05 +02:00
Laurent Destailleur
723bd6f750 Fix: [ bug #872 ] Erreur sur page Accueil Commerciale avec pgsql 
(3.4-beta).
Fix: Permission tab was not visible for external users.
 2013-05-03 16:10:28 +02:00
Laurent Destailleur
97de97de9d Prepare branch 3.4 2013-05-03 10:17:46 +02:00
Laurent Destailleur
7dce8d2306 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	build/debian/changelog
	build/doxygen/dolibarr-doxygen.doxyfile
	build/exe/doliwamp/doliwamp.iss
	build/launchpad/README
	build/makepack-dolibarr.pl
	build/perl/virtualmin/dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/core/modules/syslog/mod_syslog_file.php
	htdocs/filefunc.inc.php
	htdocs/product/class/product.class.php
 2013-04-23 14:04:56 +02:00
Laurent Destailleur
dbc2eddcba Prepare for 3.3.2 2013-04-23 12:09:21 +02:00
Laurent Destailleur
89365786a8 New: enhance tool fixdosfiles.sh 
Convert DOS files to unix
 2013-03-30 14:27:13 +01:00
Laurent Destailleur
3e5ee3b00a Fix: PHPUnit tests are back. 2013-03-09 18:55:57 +01:00
Laurent Destailleur
924d01249c Prepare 3.3.1 maintenance release 2013-03-02 16:12:06 +01:00
Laurent Destailleur
df2fde3a68 Prepare 3.3 release 2013-02-17 17:17:19 +01:00
Laurent Destailleur
935f2d9bd8 Add TODO 2013-02-11 21:23:25 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
a5b174eccc Fix: Architecture of getCurrency was wrong. Cache was not stored 
correctly and dict file loaded several times. There was also bug on PHP
without mb_string function.
Now function is a method of $langs object. All bug fixes.
 2013-01-18 15:57:11 +01:00
Laurent Destailleur
d11cee399a Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	COPYRIGHT
	htdocs/core/tpl/freeproductline_create.tpl.php
	htdocs/core/tpl/predefinedproductline_create.tpl.php
	htdocs/install/mysql/tables/llx_c_availability.sql
 2013-01-16 15:45:17 +01:00
Laurent Destailleur
8d206fdfb0 Prepare move to other licence. For the moment all answers for licence 
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
 2013-01-16 15:36:08 +01:00
Laurent Destailleur
db923b9814 Fix: Removed warning 2013-01-15 15:44:42 +01:00
Laurent Destailleur
0c6c2eca8a Fix: Removed warning 2013-01-15 13:11:36 +01:00
Laurent Destailleur
ec8b260bf6 New: Prepare 3.4 branch 
New: Add hook for agenda, info and category tabs
 2013-01-12 14:34:16 +01:00
Regis Houssin
b838895db9 Fix: change for a neutral email 2012-12-30 15:13:49 +01:00
Regis Houssin
5740c7e694 Fix: change for a neutral email 2012-12-30 15:11:07 +01:00
Laurent Destailleur
11ab579639 Fix: Several fixes to avoid PDF lib conflicts. 2012-12-19 13:06:45 +01:00
Laurent Destailleur
19d5458ded Prepare freeze of 3.3 2012-12-18 14:21:56 +01:00
Laurent Destailleur
38b1c540ef Fix: Bad url forging 2012-12-12 00:49:32 +01:00
Laurent Destailleur
e3d07621eb Fuck git. Restore another lost commit. 2012-12-04 20:51:45 +01:00
Laurent Destailleur
4136c27516 RESTORE CODE WITH ID D2adaf7. The Merge daacf79 as lost more than 50 
commits !
 2012-12-01 15:45:05 +01:00
Laurent Destailleur
624c0fa040 Fix: Restore compatibility with FPDF. 2012-11-30 20:31:43 +01:00
Laurent Destailleur
f9ceb78f58 Beautify instal pg. 
Fix: Debian package
 2012-10-07 20:04:07 +02:00
Regis Houssin
9d67b04076 New: add possibility to force entity in login page 2012-09-05 19:22:03 +02:00
Laurent Destailleur
92fb64d112 Fix: PHP 5.2 compatibility 2012-09-05 10:11:18 +02:00
Regis Houssin
f4d75e87d3 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git 
into task498_objectline

Conflicts:
	htdocs/core/class/commonobject.class.php
 2012-08-23 07:53:48 +02:00
Marcos García
9b3c89ac47 Removed parenthesis from all include and include_once and replaced with single quotes 2012-08-23 02:40:41 +02:00
Marcos García
ea119c45a2 Lower-cased all <?PHP 2012-08-22 23:27:53 +02:00
Regis Houssin
2ae1d3d3b5 New: [ task #498 ] 2012-08-22 17:42:40 +02:00
Regis Houssin
fb23364511 Fix: uniformize code 2012-07-23 16:10:54 +02:00
Regis Houssin
1f98c2cfc4 Fix: add possibility to use strict mode for debugging 2012-07-09 10:24:33 +02:00
Regis Houssin
1842fd3058 Fix: restore parameters 2012-07-09 10:10:21 +02:00
Regis Houssin
cd7bf41ae0 Fix: php 5.4 strict mode warning 2012-07-09 10:08:56 +02:00
Laurent Destailleur
f09dfe8864 Fix: removed warning 2012-07-08 16:54:08 +02:00
Laurent Destailleur
a23df4f407 Qual: Removed deprecated var 
New: Can add global js
 2012-06-12 18:35:29 +02:00
Laurent Destailleur
d60061f682 Fix: pagecode when using postgresql 
Conflicts:
	htdocs/support/inc.php
 2012-05-06 15:36:53 +02:00
Laurent Destailleur
edb3178def Fix: Bad declaration of error_reporting 2012-04-28 18:47:54 +02:00
Laurent Destailleur
8ea079ed96 New: Prepare change to allow usage of print sheet for any purpose (not 
only
memeber module).
Qual: Remove duplicate declaration of version.
 2012-04-28 16:37:58 +02:00
Regis Houssin
f0f74a7d92 Fix: disable php display errors with $dolibarr_main_prod 2012-04-15 09:30:40 +02:00
Laurent Destailleur
1ec9125ff9 Move to 3.3 alpha 2012-04-09 16:51:17 +02:00
Laurent Destailleur
cbe2e3c15c Preapre 3.2.0 2012-04-04 17:54:11 +02:00
Regis Houssin
a56a3946a4 Fix: clean parameters 2012-03-07 14:21:49 +01:00
Laurent Destailleur
61175c2543 Work on debian/rpm package 2012-02-18 14:55:41 +01:00
Laurent Destailleur
7afcee03b9 Work on debian package 2012-02-18 03:29:43 +01:00
Laurent Destailleur
036e578e0f Move security function into security.lib.php 
Split security.lib.php into 2 files: One always loaded, the other for
rare functions.
 2012-02-12 17:41:28 +01:00
Laurent Destailleur
7b527e085d Add more test to prepare option for rounding lines 2012-02-06 00:07:48 +01:00
Laurent Destailleur
63c3cb2d48 Work on debian package 2012-01-29 20:57:40 +01:00
Laurent Destailleur
382c6554b4 New: Work on debian packaging to use default ckeditor package 2012-01-14 02:06:05 +01:00
Laurent Destailleur
ebf8a6eef4 artichow was used only for captcha generation so i replaced with 
dolibarr code to allow to remove completely artichow (artichow project
is dead).
 2012-01-07 23:31:25 +01:00
Laurent Destailleur
d019f732b8 Fix: Removed warning 2012-01-04 13:26:06 +01:00
Laurent Destailleur
d06ae60a4a New: Tuffy font is now useless. 2011-12-28 01:03:10 +01:00
Laurent Destailleur
f680dc7df2 Try to clean external libs. 2011-12-04 13:59:44 +01:00
Laurent Destailleur
9d1a008768 Qual: Clean code for barcode 2011-11-27 22:55:49 +01:00
Regis Houssin
6bbc1a1a77 Fix: move transverse mode parameters in conf.php 2011-11-04 09:09:53 +01:00
Laurent Destailleur
784f696c85 Qual: Some fixes to make working with PHP option error_reporting 
E_STRICT
 2011-10-29 19:50:25 +02:00
Regis Houssin
56d6cbe56f [task #216] Move lib in core directory 2011-10-24 12:59:44 +02:00
Regis Houssin
c65238b773 [task #216] Move lib in core directory 2011-10-24 10:45:06 +02:00
Laurent Destailleur
4e302faa07 Qual: Centralise declaratin of external lib artichow at one location. 2011-09-23 23:36:55 +00:00
Regis Houssin
5efe1cd470 Fix: Perl-style comments are not allowed. Use "// Comment." or "/* comment */" instead. 2011-09-20 10:30:56 +00:00
Regis Houssin
567b4565f9 Fix: avoid phpunit error 2011-09-19 22:36:38 +00:00
Laurent Destailleur
abde2eff49 Fix: definition of DOL_DOCUMENT_ROOT mus be done only into environment include files and never into class files. 2011-09-07 13:27:50 +00:00
Regis Houssin
b50f9867e8 Fix: include security.lib.php by default 2011-09-06 07:41:14 +00:00
Regis Houssin
726d9581dd Fix: remove obsolete tags (in progress) 2011-08-27 14:24:16 +00:00
Laurent Destailleur
32f3684043 Prepare new version 2011-08-11 20:54:08 +00:00
Laurent Destailleur
3ff83a3bb3 Fix: Pb in package with install.lock 2011-08-04 12:07:29 +00:00
Laurent Destailleur
37ead2f97e Fix: Avoid errors into rpm packages 2011-07-31 23:19:04 +00:00
Laurent Destailleur
53e157912b Fix: Code could not works for debian packages 2011-07-30 10:23:24 +00:00
Laurent Destailleur
477cd46f81 Enhance debian package 2011-07-21 22:11:30 +00:00
Laurent Destailleur
c5260bdbcd Prepare 3.1 beta 2011-07-13 21:19:58 +00:00
Regis Houssin
6d98ba7d3f Test git to cvs synchro 2011-06-28 12:25:43 +00:00
Laurent Destailleur
4d65503352 New: Enhance form to post a new member 2011-06-26 18:53:16 +00:00
Laurent Destailleur
022ad8755f Removed useless code 2011-03-29 09:12:49 +00:00
Laurent Destailleur
fcf4bcdc1d Can use javascript files with full http link 2011-03-28 20:29:14 +00:00
Laurent Destailleur
57c45c2442 Qual: Removed deprecated code 2011-03-26 10:46:27 +00:00
Laurent Destailleur
29bfeabcee Fix: Alt url 2011-03-20 19:52:50 +00:00
Laurent Destailleur
245866a9c0 Autodetect url relative path 2011-02-26 09:16:31 +00:00
Laurent Destailleur
d4a49a1e93 Fix: If autodetect fails, we use config 2011-02-26 02:51:10 +00:00
Regis Houssin
b03b1923ed Fix: bad test 2011-02-25 09:10:20 +00:00
Laurent Destailleur
c4d7e87e2c Autodetect url relative path 2011-02-23 18:20:57 +00:00
Laurent Destailleur
cadb0c66e0 Fix: autodetect url parts 2011-02-23 18:01:02 +00:00
Regis Houssin
62465a1cc5 Fix: disable, not stable 2011-02-23 14:37:37 +00:00
Laurent Destailleur
d31dbaf85a Now dolibarr_main_url_root is detected automatically. Value in conf file is used only to forge links to show for external access. 2011-02-23 12:24:09 +00:00
Laurent Destailleur
f91de5949c HEAD contains 3.1 alpha 2011-01-23 16:42:42 +00:00
Laurent Destailleur
1c2d166b14 Prepare 3.0 beta 2011-01-16 01:52:48 +00:00
Laurent Destailleur
b934beecaa Fix: Definition of alt url should use same syntax than main url (so full url or relative, works in both cases). 2011-01-14 20:55:45 +00:00
Laurent Destailleur
20991abe04 Fix: Another try to make usage of alt feature working. 2010-12-29 12:13:36 +00:00