Commit Graph

29707 Commits

Author SHA1 Message Date
Laurent Destailleur
cd514693c5 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-05 13:23:22 +01:00
Laurent Destailleur
c60a2ff76f Fix: new lines not correctly outputed 2011-11-05 13:22:00 +01:00
Laurent Destailleur
f16b751642 Fix: Missing menu icons 2011-11-05 13:11:10 +01:00
Regis Houssin
40c39fb8ad Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/functions.lib.php
2011-11-05 12:52:40 +01:00
Regis Houssin
356409bd72 Fix: add json_decode function for old PHP 2011-11-05 12:45:13 +01:00
Laurent Destailleur
fd9e0d8643 Qual: Removed code that must be stored into external modules 2011-11-05 12:34:54 +01:00
Regis Houssin
97f0130861 Fix: best json_encode function for old PHP
Fix: remove unused function php2js
2011-11-05 11:50:56 +01:00
Laurent Destailleur
97573659c2 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-05 03:18:19 +01:00
Laurent Destailleur
c819b3b87c Fix: Must work with PHP 5.* 2011-11-05 03:15:35 +01:00
Laurent Destailleur
de8018a5f0 Fix: Error management 2011-11-05 03:15:11 +01:00
Regis Houssin
4482c6ac0a Fix: change for external modules
Fix: add osx files in gitignore
2011-11-05 00:24:13 +08:00
Regis Houssin
4dc318c9fd Fix: translation 2011-11-04 11:09:13 +01:00
Regis Houssin
9be80725d0 Fix: increase size of fields 2011-11-04 10:22:14 +01:00
Regis Houssin
6bbc1a1a77 Fix: move transverse mode parameters in conf.php 2011-11-04 09:09:53 +01:00
Regis Houssin
0c5648dd6f Fix: indent 2011-11-04 08:29:10 +01:00
Regis Houssin
1b568deaf6 Fix: avoid warning 2011-11-04 08:21:47 +01:00
Laurent Destailleur
61fc8b6081 Fix: Wrong field 2011-11-04 02:53:31 +01:00
Laurent Destailleur
68ece6228b Fix admin login creation 2011-11-04 02:00:19 +01:00
Laurent Destailleur
fbdb483510 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-04 00:28:53 +01:00
Laurent Destailleur
c16c09a451 Qual: Mutualize code to delete previews 2011-11-04 00:27:30 +01:00
Regis Houssin
7c54bf489d Fix: problem with multicompany 2011-11-03 18:39:06 +01:00
Regis Houssin
42e608bd63 Fix: chmod 644 2011-11-03 18:03:52 +01:00
Regis Houssin
fdaadc31da Fix: uniform code
Fix: entity filter
2011-11-03 17:38:04 +01:00
Regis Houssin
832b78911c Fix: optimize code 2011-11-03 11:49:22 +01:00
Regis Houssin
ea94610492 Fix: security
Add another restriction
2011-11-03 10:35:52 +01:00
Regis Houssin
9cc3bf0f87 Fix: security
"javascript" is not necessary for send javascript code
2011-11-03 10:07:09 +01:00
Laurent Destailleur
d872f4d389 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-03 02:02:50 +01:00
Laurent Destailleur
7f0cca8fb9 Look: Enhancements into themes. 2011-11-03 01:59:13 +01:00
Regis Houssin
504cce5a95 Merge pull request #44 from simnandez/develop
Fix: [bug 227] LocalTaxes: Suppliers calculate problem
2011-11-02 14:58:29 -07:00
Laurent Destailleur
9444e8d63d Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/admin/boxes.php
	htdocs/admin/ihm.php
	htdocs/core/lib/usergroups.lib.php
	htdocs/main.inc.php
2011-11-02 22:51:52 +01:00
Laurent Destailleur
253a21eb33 Perf: Little optimization 2011-11-02 22:41:34 +01:00
Laurent Destailleur
ee92964ef7 Security: Fix more security holes 2011-11-02 22:15:59 +01:00
Juanjo Menent
2f7365043c Fix: [bug 227] LocalTaxes: Suppliers calculate problem 2011-11-02 21:06:21 +01:00
Regis Houssin
0c8e4b8f1b Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git
into develop

Conflicts:
	htdocs/user/index.php
	htdocs/user/info.php
	htdocs/user/note.php
	htdocs/user/param_ihm.php
2011-11-02 20:29:27 +01:00
Regis Houssin
921a379740 Fix: security 2011-11-02 20:24:51 +01:00
Laurent Destailleur
7f4944da31 Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-02 20:18:48 +01:00
Laurent Destailleur
074939b4ff Security: A lot of security fixes 2011-11-02 20:17:55 +01:00
Laurent Destailleur
5b5ac9cbe2 Fix: Add missing entries 2011-11-02 19:15:29 +01:00
Laurent Destailleur
d394fb621a Fix: Try to fix trigger tha change password 2011-11-02 18:05:45 +01:00
Laurent Destailleur
388706a354 Fix: Format error 2011-11-02 18:02:31 +01:00
Laurent Destailleur
4d52faeaaf Doxygen 2011-11-02 14:15:56 +01:00
Laurent Destailleur
e6d27e0731 Doxygen 2011-11-02 14:15:44 +01:00
Laurent Destailleur
dcd97bb1cf Better error management 2011-11-02 14:15:14 +01:00
Laurent Destailleur
e764f2137d Doxygen 2011-11-02 14:14:46 +01:00
Laurent Destailleur
2bffe2a174 Qual: Clean code: Removed code of external modules 2011-11-01 23:22:10 +01:00
Laurent Destailleur
4c95c486f6 Qual: Removed hardcoded code for external module. Replaced by hook. 2011-11-01 18:36:06 +01:00
Laurent Destailleur
0cd241d3a3 Move translation keys 2011-11-01 18:33:14 +01:00
Laurent Destailleur
c00b67209f New: Clear code 2011-11-01 18:32:48 +01:00
Laurent Destailleur
eba302c00f Merge branch 'develop' of ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-11-01 15:36:59 +01:00
Laurent Destailleur
4a49d32689 Fix: Removed warning 2011-11-01 15:34:11 +01:00