Commit Graph

582 Commits

Author SHA1 Message Date
Aladin Alaily 960be7c5ae Replace hardcoded location with a user selection. 2015-08-21 10:40:18 -04:00
snipe e916fdcc89 Fixes #1092, setting LDAP_OPT_REFERRALS to 0 for Active Directory 2015-08-20 15:54:42 -07:00
snipe c7b0ecfac8 Slack notification for requested assets 2015-08-19 17:51:35 -07:00
snipe d47198086f Added notes search to licenses 2015-08-19 17:23:55 -07:00
snipe e63d62d2c8 Fixes #1083 2015-08-19 12:33:16 -07:00
snipe 45c4624d5f Fixes #1081 2015-08-19 11:14:03 -07:00
snipe 70a7a11324 Switched to user list 2015-08-19 10:54:50 -07:00
snipe e8f11919f7 Fixes #1077 - ordering of dropdown menus 2015-08-19 10:43:52 -07:00
snipe 1d976ff926 Fixes #1078 2015-08-19 10:23:01 -07:00
snipe 21bb2f8b44 Updated language string for asset request 2015-08-17 11:11:09 -07:00
snipe 7dd50eddfa Nicer error messages on validation fail for LDAP 2015-08-14 22:57:32 -07:00
snipe e49cfb4bde Fixed validation on LDAP 2015-08-14 22:10:05 -07:00
snipe 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
snipe ee46b223c9 Added LDAP options 2015-08-14 21:33:48 -07:00
Aladin Alaily 23bde13665 Corrected a typo and remove some testing code 2015-08-15 00:29:38 -04:00
Aladin Alaily 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
snipe 80fb7a4c13 Fixed author's name :P 2015-08-14 21:22:49 -07:00
snipe a57a465147 Removed port number 2015-08-14 20:58:47 -07:00
snipe e14ebd0daa Improved error messages and error handling 2015-08-14 20:50:01 -07:00
Aladin Alaily 229432af5e LDAP authentication hook 2015-08-14 14:30:38 -04:00
Aladin Alaily 43efe4e80b LDAP authentication hook 2015-08-14 14:29:32 -04:00
Aladin Alaily 54d95c510b Update the code to reflect a possible active flag in LDAP 2015-08-14 10:31:40 -04:00
Aladin Alaily 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
Aladin Alaily 2dbeb1aeb5 Merge remote-tracking branch 'upstream/develop' into develop 2015-08-13 16:34:20 -04:00
snipe 4fcf70872f Fixes #1054 2015-08-13 13:24:38 -07:00
Aladin Alaily 1fc83443db Check if the variables coming in from LDAP are set. 2015-08-13 15:48:03 -04:00
Aladin Alaily c17bbe9dfe Commented out the loop break. 2015-08-13 15:10:40 -04:00
Aladin Alaily 59617083c9 Fixed the break portion 2015-08-13 15:07:15 -04:00
Aladin Alaily d167f31af0 Fixed indents 2015-08-13 15:06:04 -04:00
Aladin Alaily 5574ea89bb Removed the references to the LOG class 2015-08-13 13:39:20 -04:00
Aladin Alaily afd94ff52a Added functions for LDAP 2015-08-13 13:20:13 -04:00
snipe c5e5930c1b Make sure lock passwords isn't true before emailing 2015-08-13 00:54:57 -07:00
snipe ed2d7310f8 Fixed unsuspend icon 2015-08-13 00:39:52 -07:00
snipe c839f0cbc8 Added ability to select status type 2015-08-12 22:33:56 -07:00
snipe a832346bfb Added statuslabel type helper 2015-08-12 22:33:31 -07:00
snipe 7fa9e49880 Activate user created on modal create 2015-08-12 21:50:04 -07:00
snipe e91c1942f8 Save modelno in API 2015-08-12 20:58:44 -07:00
snipe 315f02905a Pull all lists into helper functions for consistency 2015-08-12 20:58:18 -07:00
snipe f7874ec106 Refactored assets controller and model for cleaner code 2015-08-12 18:19:53 -07:00
root b576fce1f7 Modified files for accessory report. 2015-08-11 16:35:18 -07:00
snipe c476eda868 Removed link on location until location view is fixed 2015-08-11 13:20:58 -07:00
snipe 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
Vincent Sposato 3ebbd030e7 Fixed issue with Asset model 2015-08-07 18:52:19 -04:00
Brady Wetherington 7ae226635f First rough pass at asset acceptance report 2015-08-07 18:50:55 -04:00
Vincent Sposato 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
snipe 9540db424a Fixes #948 - validate on model name+modelno+manufacturer combination 2015-08-06 05:58:50 -07:00
snipe 84d81184fa Fixes #1009 - Add MAC address to search 2015-08-06 05:13:27 -07:00
snipe 106ed6a9a0 Added location to user listing 2015-08-06 03:59:23 -07:00
snipe 449ad4f86b Fixes #1014 - error if no assets are unaccepted 2015-08-04 13:22:13 -07:00
snipe 3c730c691b Fixes #1010 - better errors on large file uploads 2015-08-04 12:45:17 -07:00