Laurent Destailleur
|
14ab409ca9
|
Merge remote-tracking branch 'origin/3.6' into develop
Conflicts:
htdocs/admin/stock.php
htdocs/admin/system/index.php
htdocs/comm/fiche.php
htdocs/core/lib/admin.lib.php
htdocs/core/lib/holiday.lib.php
htdocs/core/lib/pdf.lib.php
htdocs/core/login/functions_forceuser.php
htdocs/core/login/functions_http.php
htdocs/core/menus/standard/auguria.lib.php
htdocs/core/modules/livraison/pdf/pdf_typhon.modules.php
htdocs/filefunc.inc.php
htdocs/holiday/define_holiday.php
htdocs/opensurvey/fonctions.php
htdocs/societe/canvas/actions_card_common.class.php
test/phpunit/CompanyBankAccountTest.php
test/phpunit/ExportTest.php
test/phpunit/FactureTest.php
test/phpunit/FunctionsLibTest.php
test/phpunit/PropalTest.php
test/phpunit/SocieteTest.php
test/phpunit/WebservicesInvoicesTest.php
test/phpunit/WebservicesThirdpartyTest.php
|
2014-09-28 02:14:32 +02:00 |
|
Laurent Destailleur
|
e8b7c9c6bd
|
Fix: doxygen
|
2014-09-27 16:00:11 +02:00 |
|
Marcos García de La Fuente
|
ec661d0c6c
|
Removed index.php and replaced them with blank index.html as it is more appropriate
|
2014-07-12 23:18:57 +02:00 |
|
Laurent Destailleur
|
93f1392e87
|
Fix: Bugs reported by scrutinizer
|
2014-05-26 09:07:18 +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
|
f7fe25e408
|
Uniformize code to prepare mass update
|
2014-02-27 10:37:23 +01:00 |
|
Grand Philippe
|
6fb6b916c7
|
english language standardization
|
2013-02-27 11:24:50 +01:00 |
|
Grand Philippe
|
19201a1015
|
english standardization
|
2013-02-22 11:32:19 +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 |
|
Regis Houssin
|
b838895db9
|
Fix: change for a neutral email
|
2012-12-30 15:13:49 +01:00 |
|
Regis Houssin
|
fc1cc95d08
|
Fix: bad path
|
2012-10-03 08:54:21 +02:00 |
|
Grand Philippe
|
0215ce9122
|
add canvas to adherents module
|
2012-10-01 10:05:03 +02:00 |
|