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

..

ajax

Fix: add generic edit in place select input

2011-10-31 14:34:11 +01:00

boxes

Uniformize constructor

2011-10-27 02:10:23 +02:00

class

Qual: Removed hardcoded code for external module. Replaced by hook.

2011-11-01 18:36:06 +01:00

db

Security: A lot of security fixes

2011-11-02 20:17:55 +01:00

filemanagerdol

Fix: add empty index files

2011-10-24 15:27:10 +02:00

js

Fix: css problem

2011-10-31 18:38:17 +01:00

lib

Merge branch 'develop' of git+ssh://git@github.com/Dolibarr/dolibarr.git

2011-11-02 20:29:27 +01:00

login

[task 189] Move Error* key from other.lang into errors.lang files

2011-10-29 23:52:05 +02:00

menus

Qual: Uniformize variable name

2011-10-30 17:26:55 +01:00

modules

Fix: translation

2011-11-01 15:18:33 +01:00

tpl

Fix: DST is correctly detected

2011-11-01 04:57:45 +01:00

triggers

Qual: move ajax response in /core/ajax directory

2011-10-25 19:03:12 +02:00

admin_extrafields.inc.php

[task #216] Move lib in core directory

2011-10-24 11:25:54 +02:00

antispamimage.php

Move common files in core directory

2011-10-24 10:29:33 +02:00

datepicker.php

Move common files in core directory

2011-10-24 10:29:33 +02:00

doxygen.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

index.php

Fix: Avoid errors into rpm packages

2011-07-31 21:24:20 +00:00

photos_resize.php

[task #216] Move lib in core directory

2011-10-24 12:59:44 +02:00

tools.php

Fix: remove obsolete tags (in progress)

2011-08-27 15:14:31 +00:00