Commit Graph

35344 Commits

Author SHA1 Message Date
jfefe
428ba7feaf Fix : bad sql request for cp field 2013-02-26 12:41:52 +01:00
Laurent Destailleur
4fd8143ecc Merge remote-tracking branch 'origin/3.3' into develop 2013-02-25 20:24:34 +01:00
Laurent Destailleur
c4948ea3db Fix: It seems foreign key is not deleted sometimes. To be sure, we force
delete also at end.
2013-02-25 20:23:44 +01:00
Laurent Destailleur
e776e849ce Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-25 20:17:56 +01:00
Laurent Destailleur
c44f6004dd Doc 2013-02-25 20:17:41 +01:00
Laurent Destailleur
43a248b88b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop

Conflicts:
	ChangeLog
2013-02-25 13:01:56 +01:00
Laurent Destailleur
2dc4b91521 New: Function plimit of databases drivers accept -1 as value (it means
default value set into conf->liste_limit).
2013-02-25 12:51:38 +01:00
Laurent Destailleur
00e8f78b77 Merge pull request #692 from atm-maxime/develop
LDAP sync improvements
2013-02-25 03:36:37 -08:00
Maxime Kohlhaas
428f844b4d LDAP : add option to get data as an array 2013-02-25 11:57:52 +01:00
Maxime Kohlhaas
cfa1a41a16 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-02-25 11:54:26 +01:00
Maxime Kohlhaas
0358ef4918 LDAP : sync script now updates or create user 2013-02-25 11:53:56 +01:00
Laurent Destailleur
7e34d6c99c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-25 11:00:26 +01:00
Laurent Destailleur
48a7d79647 Update screenshot 2013-02-25 11:00:08 +01:00
Laurent Destailleur
b9ead08968 Merge pull request #691 from grandoc/develop
english language standardization
2013-02-25 01:32:26 -08:00
Laurent Destailleur
e748f07806 Qual: Using divs instead of tables 2013-02-25 10:31:47 +01:00
Grand Philippe
ffeb066b1b Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 10:30:48 +01:00
Laurent Destailleur
ae322ba17f Qual: Better init of default lang 2013-02-25 10:17:38 +01:00
Grand Philippe
eddf910438 fix issue with english language standardization 2013-02-25 10:00:09 +01:00
Grand Philippe
b081589129 english language standardization 2013-02-25 09:52:24 +01:00
Grand Philippe
6decab1847 english language standardization 2013-02-25 09:17:38 +01:00
Grand Philippe
d27568d3d0 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-25 08:16:43 +01:00
Laurent Destailleur
b61c576343 Qual: Still work onto menu management rewrite. 2013-02-24 21:16:36 +01:00
Laurent Destailleur
7238c5156e New: Update jquery mobile lib 2013-02-24 19:33:06 +01:00
Laurent Destailleur
b4329cb5d2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 18:22:57 +01:00
Laurent Destailleur
24eab5b8fd New: Add page with seach only boxes. 2013-02-24 18:22:28 +01:00
Laurent Destailleur
234e171e9d New: Add option dol_hide_topmenu and dol_hide_leftmenu onto login page. 2013-02-24 18:16:26 +01:00
Laurent Destailleur
fe4ef69360 Fix: Duplicate form 2013-02-24 18:08:52 +01:00
Laurent Destailleur
a6378ab0bb Cleaner HTML code 2013-02-24 18:08:27 +01:00
Grand Philippe
cb28300d7e fix error commit 2013-02-24 17:17:25 +01:00
philippe
43b01010d1 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr.git into develop 2013-02-24 17:09:12 +01:00
Grand Philippe
86de772b31 english language standardization 2013-02-24 17:08:52 +01:00
Laurent Destailleur
7aca87ea40 Merge pull request #690 from frederic34/develop
WIP : Carrier Admin sql data migration
2013-02-24 07:45:44 -08:00
Laurent Destailleur
800bcb44fa Merge pull request #689 from grandoc/develop
english language standardization
2013-02-24 07:45:20 -08:00
Grand Philippe
dfae543d5e english language standardization 2013-02-24 15:57:02 +01:00
Grand Philippe
8c765ace99 Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 15:30:39 +01:00
Laurent Destailleur
3baf8a6c00 New: Use div instead of tables into login page. 2013-02-24 14:57:49 +01:00
Laurent Destailleur
6b20370ffa Fix: Check consitency of option NOREQUIREXXX 2013-02-24 14:54:08 +01:00
Grand Philippe
7596096b89 some fix for english language standardization 2013-02-24 14:46:00 +01:00
Grand Philippe
067cb0a409 some fix for english language standardization 2013-02-24 14:32:15 +01:00
Grand Philippe
36ce7a9a10 some fix for english language standardization 2013-02-24 14:11:09 +01:00
Laurent Destailleur
0b61c740a9 Fix: To be sure to start onto an selected top menu 2013-02-24 13:57:17 +01:00
Grand Philippe
77544de01a some fix for english language standardization 2013-02-24 12:50:05 +01:00
Grand Philippe
5d3ab26463 some fix for english language standardization 2013-02-24 12:26:01 +01:00
Grand Philippe
9175f241ff Merge branch 'develop' of git://github.com/Dolibarr/dolibarr into develop 2013-02-24 10:10:52 +01:00
Laurent Destailleur
08bde6faa5 Fix: Do not load menu when not required. 2013-02-24 03:45:19 +01:00
Laurent Destailleur
50de5a944a Fix: compatibility with new menu manager 2013-02-24 03:29:03 +01:00
Laurent Destailleur
d3c2d088a9 New: Add url to get menu only. Work on progress. 2013-02-24 02:55:25 +01:00
Laurent Destailleur
cd56fa61e6 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-02-24 02:47:47 +01:00
Laurent Destailleur
d31306609c Fix: Bad translation if error 2013-02-24 02:47:30 +01:00
Laurent Destailleur
d786e8ca6e Code comment 2013-02-24 02:42:37 +01:00