lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
35,770 Commits 43 Branches 150 Tags 886 MiB
3dcd0d2ac8
Commit Graph

937 Commits

Author SHA1 Message Date
Laurent Destailleur
45a6717dd3 Merge pull request #752 from FHenry/develop 
task #768  &  task #769
 2013-03-18 05:02:38 -07:00
fhenry
9e46a55bbf Taking account remark on pull request 2013-03-17 22:26:06 +01:00
fhenry
07bc0cd09e Taking account remark 
1f5ebb594a
 2013-03-16 17:01:17 +01:00
Laurent Destailleur
55f9879a6c Replace table with div. Prepare work for android application. 2013-03-16 14:53:15 +01:00
fhenry
1f5ebb594a [ task #769 ] WYSIWYG for user signature 2013-03-16 09:43:09 +01:00
Laurent Destailleur
fc3483a4bb Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/webservices/server_user.php
 2013-03-12 14:55:13 +01:00
Laurent Destailleur
fdbd3bf36b Fix: lastname 2013-03-11 17:41:38 +01:00
Laurent Destailleur
746e005726 Fix: Fix ton of regression due to field name change 2013-03-09 20:34:38 +01:00
Laurent Destailleur
7bbbc32af9 Fix: Missing style and typo error 2013-03-09 17:08:19 +01:00
Laurent Destailleur
b8a330ee80 Merge pull request #693 from atm-maxime/develop 
LDAP : update user sync + add groups sync and users associated to group ...
 2013-02-26 11:02:43 -08:00
Laurent Destailleur
4fd8143ecc Merge remote-tracking branch 'origin/3.3' into develop 2013-02-25 20:24:34 +01:00
Maxime Kohlhaas
1eddf95d95 LDAP : update user sync + add groups sync and users associated to group + add fetch by name on group class 2013-02-25 16:46:31 +01:00
Grand Philippe
6adc9eb7f2 english language standardization 2013-02-23 17:40:28 +01:00
Grand Philippe
a237be0d24 english language standardization 2013-02-23 15:26:39 +01:00
Grand Philippe
5d8dea788c fix: change name with lastname 2013-02-23 14:17:52 +01:00
Grand Philippe
9fc18d23e7 fix: change name with lastname 2013-02-23 13:59:17 +01:00
Grand Philippe
7c2a4500d6 fix: change name with lastname 2013-02-23 12:30:01 +01:00
Grand Philippe
15f8b588d6 english standardization 2013-02-23 11:54:46 +01:00
Grand Philippe
869a014d32 english standardization 2013-02-23 11:42:12 +01:00
fhenry
aa473fa3e3 Fix bug #730 2013-02-22 09:42:02 +01:00
Laurent Destailleur
ec3dab23ca Fix: Page title 2013-02-21 10:22:33 +01:00
Laurent Destailleur
2852aded3a New: Add button collapse/expand for menu, category and user views. 2013-02-20 21:16:31 +01:00
Laurent Destailleur
9ddd6215f8 Qual: Replace native code with jquery plugin treeview. 2013-02-19 20:15:30 +01:00
Laurent Destailleur
7367a2472c Look: Mor CSS3 2013-02-19 13:24:32 +01:00
Laurent Destailleur
da7b5e352f Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/langs/fr_FR/admin.lang
	
New: Add function dol_set_focus('#xxx')
 2013-02-18 15:01:00 +01:00
Laurent Destailleur
50decdd941 Fix: When creating user on other entity, no way to read user 
after creation.
 2013-02-16 21:06:15 +01:00
Laurent Destailleur
b1ee14ce60 New: Can define a hierarchical responsible on users. 2013-02-15 18:39:27 +01:00
Laurent Destailleur
145573ea79 Qual: Removed useless code for old modules. There is hook now to do same 
job.
 2013-02-15 17:37:30 +01:00
Laurent Destailleur
6bbac00c22 Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/user/fiche.php
 2013-02-12 15:17:22 +01:00
Laurent Destailleur
c7a6ee492d New: Add push from Philippe to manager user hierarchy. 2013-02-11 20:45:36 +01:00
Laurent Destailleur
26c66a11ed Fix: Bug 701 2013-01-31 10:21:34 +01:00
Maxime Kohlhaas
66376f1c83 Bug # 701 : A user can only be set admin by an admin 2013-01-31 09:56:52 +01:00
Maxime Kohlhaas
a3027d4590 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop 2013-01-30 16:50:32 +01:00
Maxime Kohlhaas
faccc978b4 LDAP : start implementing user update function after LDAP connexion 2013-01-30 16:50:28 +01:00
Laurent Destailleur
2300b9d3db Merge remote-tracking branch 'origin/3.3' into develop 2013-01-30 15:25:02 +01:00
fhenry
96efa87708 Fix bug 
"A user can always read its own card" false today for external user even
if user get right to change his won info
 2013-01-29 20:05:08 +01:00
Laurent Destailleur
56e11e52fa New: hookmanager class is used frequently and is a factory object, so we 
can move it during init of environment and use it globally.
 2013-01-25 19:12:54 +01:00
Maxime Kohlhaas
7facbf7aa2 Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 18:12:29 +01:00
Maxime Kohlhaas
8ab450f69b Multicompany restriction for transverse mode not used anymore. RestrictedArea is enough 2013-01-24 17:54:51 +01:00
Laurent Destailleur
a7d41d74e8 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-23 18:09:05 +01:00
Laurent Destailleur
5e42a9ff8a Fix: Revert again another fix that was not correct. It was no more 
possible to edit a user even if user has permission for.
If module multicompany does not exists (standard mode), no
other test must be added to the if, except the $canxxx test.
 2013-01-23 18:08:11 +01:00
Regis Houssin
beea9c2ec4 Fix: use the users entity 2013-01-23 15:44:51 +01:00
Regis Houssin
9203cce485 Fix: use the users entity 2013-01-23 15:41:17 +01:00
Regis Houssin
4a0bc90d5a Fix: only once superadmin and an admin can not delete/modify a 
superadmin
 2013-01-23 15:27:36 +01:00
Regis Houssin
459adb146c Fix: only once superadmin and an admin can not delete/modify a 
superadmin
 2013-01-23 15:26:18 +01:00
Regis Houssin
b12101a650 Fix: only once superadmin if no multicompany setup 2013-01-23 15:11:33 +01:00
Laurent Destailleur
abb6daf2dc Merge remote-tracking branch 'origin/3.3' into develop 
Conflicts:
	htdocs/core/boxes/box_activity.php
 2013-01-19 16:29:16 +01:00
Laurent Destailleur
0e13b3872d Fix: Removed warnings 2013-01-19 14:32:37 +01:00
Laurent Destailleur
2b8aa54f68 Merge remote-tracking branch 'origin/3.3' into develop 2013-01-17 10:32:49 +01:00
Laurent Destailleur
3685911bfa Merge pull request #616 from FHenry/3.3 
Fix bug [ bug #694 ] Set security permision to user belong to group
 2013-01-16 11:45:33 -08:00