3fd9df62f4
Redirect back to user listing on save
2016-01-27 20:48:34 -08:00
0896ca6517
Fixes #1670 - first name validates for one letter
2016-01-22 10:40:16 -08:00
7da0ffc325
Fixes #1623 - disallow admins to edit permissions on users
2016-01-13 06:51:56 -08:00
b30edfd9d6
Use locations dropdown
2016-01-13 04:50:55 -08:00
dad816ba25
Removed debugging echo
2016-01-11 18:48:33 -08:00
4037200fad
Additional fields for user import
2016-01-11 18:39:40 -08:00
9800786485
Fixes #1597 and allows non-numeric employee number
2016-01-11 18:16:52 -08:00
3e2fc13af5
Updated the LDAP import to get the correct email field setting.
2016-01-07 10:03:42 -06:00
2f4e54c8a6
Merge remote-tracking branch 'origin/develop'
2015-12-30 15:47:00 -08:00
506af72d83
Superadmin check in bulk delete users
2015-12-29 20:03:08 -08:00
23da312fff
Put deleted_at back in users collection for restore functionality
2015-12-29 19:35:31 -08:00
8742bf26b4
Merge pull request #1521 from twistedR/enhancement/ldap-self-signed-cert-support
...
Add option to allow ignoring SSL Cert verification.
2015-12-29 11:34:07 -08:00
aeeb273d4c
Merge pull request #1423 from thehereward/develop
...
TidyUp: Remove unreachable code.
2015-12-29 10:15:36 -08:00
0cb3a9265e
Fix PHPDocs that contained incorrect params tags.
2015-12-24 11:20:05 +00:00
96a5f437f2
Add option to allow ignoring SSL Cert verification.
2015-12-24 02:17:06 -05:00
72f3b459c5
Merge branch 'hotfixes/user_import_company_id' into develop
...
Conflicts:
app/config/version.php
2015-12-08 23:00:27 -08:00
3d8733c612
Comment out company ID for now until we can handle it more smartly
2015-12-08 22:59:22 -08:00
6aa3e21b4c
TidyUp: Surpress errors on unreachable statements with link to discussion on github.
2015-12-04 08:09:01 +00:00
be3c8e4515
Fixes #1440 - make employee number searchable/sortable
2015-12-03 02:07:20 -08:00
535263788d
Fixed dumb indenting
2015-11-24 20:20:34 -08:00
b99c138cb0
Fixes #1369 - fixed searching/sorting on location
2015-11-24 12:48:41 -08:00
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
snipe