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
|
1e9cb6b1d4
|
Qual: A translation file must not be loaded into class constructors, but
at output level.
|
2013-01-15 17:06:53 +01:00 |
|
Laurent Destailleur
|
11bb3d0137
|
Fix: Several fixes into boxes management: boxes was loaded twice, logs
were wrong, global conf missing.
|
2013-01-15 11:35:10 +01:00 |
|
Laurent Destailleur
|
49313fff3b
|
Fix: External user should not see boxes of modules not allowed to
external users.
|
2013-01-14 13:06:08 +01:00 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Laurent Destailleur
|
5a99076cf5
|
Fix: Clean amarok style. Removed hard coded length of close cells.
|
2012-12-14 18:35:50 +01:00 |
|
Regis Houssin
|
5270ec06cb
|
Fix: compatibility with multicompany transverse mode
|
2012-09-07 17:20:12 +02:00 |
|
Marcos García
|
5a73c32f46
|
Migrated ClassName to __construct() function
Changed $DB to $db
lower-cased "Class"
|
2012-07-30 17:17:33 +02:00 |
|
Regis Houssin
|
41789458c5
|
Fix: warning again and again...
|
2012-07-09 18:09:44 +02:00 |
|
Laurent Destailleur
|
d59848e18e
|
New: Enhance box management
|
2012-03-17 21:32:10 +01:00 |
|
Laurent Destailleur
|
97b176ba8d
|
Doxygen
|
2012-01-26 13:49:15 +01:00 |
|
Laurent Destailleur
|
b1a7cd82be
|
Doxygen
|
2012-01-25 23:41:51 +01:00 |
|
Laurent Destailleur
|
6fb994d296
|
Qual: Removed phpcs warnings
|
2011-11-23 18:28:14 +01:00 |
|
Regis Houssin
|
3338649316
|
[task #217] Move core files in core directory
|
2011-10-24 14:11:49 +02:00 |
|