Commit Graph

29689 Commits

Author SHA1 Message Date
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
Regis Houssin
7bb76a8cb2 Fix: translation 2011-11-01 15:18:33 +01:00
Laurent Destailleur
bb9dd1be10 Fix: db connexion not closed 2011-11-01 15:06:03 +01:00
Laurent Destailleur
13552bb3a4 Minor fix into action management 2011-11-01 15:05:42 +01:00
Laurent Destailleur
2996ee7639 New: Add trigger ACTION_DELETE and ACTION_MODIFY
Fix: LOG_ERROR must be LOG_ERR
2011-11-01 13:22:39 +01:00
Laurent Destailleur
28d6fc03f9 New: Add ref_ext on actions 2011-11-01 04:58:47 +01:00
Laurent Destailleur
ecb6c1e67d Fix: DST is correctly detected 2011-11-01 04:57:45 +01:00
Laurent Destailleur
8c42f48ad7 New: Add ref_ext on actions 2011-11-10 04:07:38 +01:00
Laurent Destailleur
b8e73966f2 Fix: Usage of FirePHP does not erase set_include_path done 2011-11-01 02:31:33 +01:00
Regis Houssin
dfcc0cff0c Fix: security 2011-10-31 18:52:25 +01:00
Regis Houssin
9f4ab4c1b1 Fix: css problem
New: add change year and month in jQuery datepicker
2011-10-31 18:38:17 +01:00
Regis Houssin
d9eb4cbeb9 New: add edit in place with ckeditor
Fix: remove unused jQuery plugin ckeip
2011-10-31 16:57:10 +01:00
Regis Houssin
61bb08dfa5 Fix: optimize css 2011-10-31 15:23:18 +01:00
Regis Houssin
891eae77d2 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-31 14:34:26 +01:00
Regis Houssin
419eb248c1 Fix: add generic edit in place select input 2011-10-31 14:34:11 +01:00
Laurent Destailleur
7c7d03b718 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2011-10-31 12:03:52 +01:00
Laurent Destailleur
dd029009c7 Exclude file into gitignore 2011-10-31 12:03:33 +01:00
Regis Houssin
eeedf86067 delete unknown files 2011-10-31 11:59:47 +01:00
Regis Houssin
23636b46a6 Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git into develop 2011-10-31 11:54:18 +01:00