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
