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
2dbeb1aeb5
Merge remote-tracking branch 'upstream/develop' into develop
2015-08-13 16:34:20 -04:00
4fcf70872f
Fixes #1054
2015-08-13 13:24:38 -07: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
c5e5930c1b
Make sure lock passwords isn't true before emailing
2015-08-13 00:54:57 -07:00
ed2d7310f8
Fixed unsuspend icon
2015-08-13 00:39:52 -07:00
c839f0cbc8
Added ability to select status type
2015-08-12 22:33:56 -07:00
a832346bfb
Added statuslabel type helper
2015-08-12 22:33:31 -07:00
7fa9e49880
Activate user created on modal create
2015-08-12 21:50:04 -07:00
e91c1942f8
Save modelno in API
2015-08-12 20:58:44 -07:00
315f02905a
Pull all lists into helper functions for consistency
2015-08-12 20:58:18 -07:00
f7874ec106
Refactored assets controller and model for cleaner code
2015-08-12 18:19:53 -07:00
b576fce1f7
Modified files for accessory report.
2015-08-11 16:35:18 -07:00
c476eda868
Removed link on location until location view is fixed
2015-08-11 13:20:58 -07:00
b3249dcf48
Merge remote-tracking branch 'origin/develop' into 2.0
...
# Conflicts:
# app/controllers/admin/UsersController.php
# app/models/Model.php
# app/views/backend/hardware/edit.blade.php
# app/views/backend/users/index.blade.php
# composer.lock
2015-08-11 13:20:25 -07:00
3ebbd030e7
Fixed issue with Asset model
2015-08-07 18:52:19 -04:00
7ae226635f
First rough pass at asset acceptance report
2015-08-07 18:50:55 -04:00
afbe23c214
Attempting to make the unaccepted assets report use more Eloquent features rather than a raw query
...
Updated the migration to include the migration of existing data - still have issue with a fresh load, as seeded data isn't there until after the migrations occur
Removed the artisan command
2015-08-07 18:50:55 -04:00
9540db424a
Fixes #948 - validate on model name+modelno+manufacturer combination
2015-08-06 05:58:50 -07:00
84d81184fa
Fixes #1009 - Add MAC address to search
2015-08-06 05:13:27 -07:00
106ed6a9a0
Added location to user listing
2015-08-06 03:59:23 -07:00
449ad4f86b
Fixes #1014 - error if no assets are unaccepted
2015-08-04 13:22:13 -07:00
3c730c691b
Fixes #1010 - better errors on large file uploads
2015-08-04 12:45:17 -07:00
24edf81b27
Merge branch 'feature/865_AssetsNotAcceptedReport' of github.com:vsposato/snipe-it into feature/865_AssetsNotAcceptedReport
2015-08-01 12:29:29 -04:00
b195934a4a
Finished building out the report, and refactoring to make the code more expressive
...
Need to finish writing the code to track threads
2015-08-01 12:20:49 -04:00
794dc5998a
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-08-01 12:20:48 -04:00
8f68bdb318
Working through getting the dataset correctly from the asset logs so that we can generate a report
2015-08-01 12:17:13 -04:00
e560cc2ee2
Working on the Actionlog and ReportsController - still having issues getting data back the way I want
2015-07-31 19:29:44 -04:00
305c22f72d
Added request to dashboard
2015-07-30 14:59:24 -07:00
78835a8b1f
Add requestable as bulk-edit option
2015-07-30 14:32:25 -07:00
948c443829
Fix for edit/clone
2015-07-29 20:50:23 -07:00
8c30c5d879
Fixed issue in routes file
2015-07-29 19:09:32 -04:00
20f94ce418
Closing brackets are helpful
2015-07-29 14:27:03 -04:00
cced7a93a5
Update AssetsController.php
2015-07-29 14:25:49 -04:00
6430f7a4a7
Update AssetsController.php
2015-07-29 14:24:30 -04:00
snipe