cbb2151f1a
Allow re-use of usernames
2015-11-24 12:29:25 -08:00
61107769e8
Add user ID and make company name hidden by default
2015-11-23 15:18:10 -08:00
4ae02c1fb3
Merge pull request #1321 from Ahimta/multiple-companies
...
Add support for multiple companies
2015-11-23 14:40:37 -08:00
5445a7d16b
Scope users like other companyables
...
Note that the User model doesn't use global scope,
global models can have unexpected results that
would very likely break many parts of the application
2015-11-21 11:23:42 +03:00
86a174201e
Only users with no company or supers can manage users' companies
2015-11-21 04:30:15 +03:00
8e44421788
added Crypt class and set ldap_pword field to longText
2015-11-17 15:20:55 -05:00
e031239cf0
Removed escaping, add sometimes required, add encrypt ldap password
2015-11-17 13:49:59 -05:00
50ea6c66f9
LDAP Settings update
...
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
2015-11-16 11:30:51 -05:00
30e8555148
updating users controller to work with database fields
2015-11-15 22:48:56 -05:00
23d10a8f7f
Make company field optional
...
Company field is now optional for the user,
although still required in the controllers.
2015-11-13 09:19:18 +03:00
d8df61bd32
Merge remote-tracking branch 'upstream/develop' into multiple-companies
...
Conflicts:
app/controllers/admin/UsersController.php
app/views/backend/hardware/index.blade.php
2015-11-12 09:30:11 +03:00
306d8ebaf7
Fixes #1317 - regression issue in bulk delete
2015-11-07 15:40:25 -08:00
6bf2a2875f
Add initial support for multiple companies
...
You can find screenshots and other files
related to the feature on Dropbox here:
https://www.dropbox.com/sh/wugnzqepwgzwlnh/AAAwNWA5hIKrP0y2VTu-LMHHa?dl=0
https://github.com/snipe/snipe-it/issues/23
2015-11-07 15:22:10 +03:00
a760a7575a
Added user notes back in
2015-11-02 19:28:51 -08:00
0745ec1502
Fixed scope for users
2015-11-02 19:26:10 -08:00
9731727095
Sorting for #1266
2015-11-02 19:17:20 -08:00
440bc1a4b4
Fixes bug in people display
2015-10-21 23:15:35 -07:00
348a566f89
More responsive fixes
2015-10-21 18:05:03 -07:00
cab5dba7c2
Only show manager name if a manager is listed
2015-10-21 14:49:39 -07:00
03e36736c2
Nicer responsive display
2015-10-20 22:11:06 -07:00
c346dbaff6
Location search, deleted users for #1266
2015-10-20 21:50:58 -07:00
b39e617e96
Added inelegant nobr for actions column for #1266
2015-10-20 20:02:18 -07:00
93bd9120cc
Updated orderby for #1266
2015-10-20 19:57:31 -07:00
f4d882606a
New getDataTable method for Bootstrap tables
2015-10-20 19:51:28 -07:00
75af50def1
Accessories fix for #1204
2015-10-06 15:58:03 -07:00
ec80c99a48
Fixes #1204
2015-10-06 15:50:49 -07:00
abd0acbe9d
Add username to user's list view
2015-09-15 09:58:56 -07:00
960be7c5ae
Replace hardcoded location with a user selection.
2015-08-21 10:40:18 -04:00
e916fdcc89
Fixes #1092 , setting LDAP_OPT_REFERRALS to 0 for Active Directory
2015-08-20 15:54:42 -07:00
e8f11919f7
Fixes #1077 - ordering of dropdown menus
2015-08-19 10:43:52 -07:00
7dd50eddfa
Nicer error messages on validation fail for LDAP
2015-08-14 22:57:32 -07:00
e49cfb4bde
Fixed validation on LDAP
2015-08-14 22:10:05 -07:00
729795364b
Merge branch 'develop' of https://github.com/aalaily/snipe-it into aalaily-develop
...
# Conflicts:
# app/controllers/admin/UsersController.php
2015-08-14 21:36:09 -07:00
ee46b223c9
Added LDAP options
2015-08-14 21:33:48 -07:00
23bde13665
Corrected a typo and remove some testing code
2015-08-15 00:29:38 -04:00
3dfbd8a4f0
Added a check for the "active" LDAP flag. Since this field is optional, it's important to check whether or not it's set, otherwise, the functionality will be unusable.
2015-08-15 00:27:56 -04:00
80fb7a4c13
Fixed author's name :P
2015-08-14 21:22:49 -07:00
a57a465147
Removed port number
2015-08-14 20:58:47 -07:00
e14ebd0daa
Improved error messages and error handling
2015-08-14 20:50:01 -07:00
229432af5e
LDAP authentication hook
2015-08-14 14:30:38 -04:00
54d95c510b
Update the code to reflect a possible active flag in LDAP
2015-08-14 10:31:40 -04:00
07171498a9
Modified the code so that the LDAP field names can now be defined and fetched from the configuration file
2015-08-14 00:17:26 -04:00
1fc83443db
Check if the variables coming in from LDAP are set.
2015-08-13 15:48:03 -04:00
c17bbe9dfe
Commented out the loop break.
2015-08-13 15:10:40 -04:00
59617083c9
Fixed the break portion
2015-08-13 15:07:15 -04:00
d167f31af0
Fixed indents
2015-08-13 15:06:04 -04:00
5574ea89bb
Removed the references to the LOG class
2015-08-13 13:39:20 -04:00
afd94ff52a
Added functions for LDAP
2015-08-13 13:20:13 -04:00
ed2d7310f8
Fixed unsuspend icon
2015-08-13 00:39:52 -07:00
7fa9e49880
Activate user created on modal create
2015-08-12 21:50:04 -07:00
snipe