Commit Graph

598 Commits

Author SHA1 Message Date
snipe 4abe93ae2e Call the artisan command to do import, show output 2015-09-23 02:36:16 -07:00
snipe 586c04354e Starter asset import routes 2015-09-22 20:23:00 -07:00
snipe fe765b3c9c Fixed not found error message string 2015-09-17 13:59:43 -07:00
snipe abd0acbe9d Add username to user's list view 2015-09-15 09:58:56 -07:00
snipe 911e9092f9 Prevent group altering from trolling douchebags 2015-09-15 02:46:40 -07:00
snipe 06c9076c2f Prevent generating backups, deleting files and file downloads in demo mode 2015-09-15 02:32:19 -07:00
snipe b8fa5abadf Disable manual backup on demo 2015-09-15 02:25:53 -07:00
snipe c12139e624 Added generate and delete backups 2015-09-15 02:05:51 -07:00
snipe fcec12f3b2 Allow asset-level EOL to override model level if given 2015-09-14 15:48:42 -07:00
snipe 2c54c93859 Fixes #1170 - barcode alternative 2015-09-11 16:13:44 -07:00
snipe 8c2ee9e96c Fixes #1167 - don't allow double checkin 2015-09-10 11:49:43 -07:00
snipe 680b189709 Fixes #1151 - additional LDAP option 2015-09-09 14:01:17 -07:00
snipe 650f86406d Added custom CSS field in settings 2015-09-09 13:17:36 -07:00
snipe da10a9a2aa Fixes #1130 - don't try to send email if email is not provided with the user 2015-08-28 12:15:07 -07:00
snipe da6770c9d9 Fixes #1102 - default currency stored as htmlentities in the DB 2015-08-21 18:11:23 -07:00
snipe 7dd2b3d580 Fixes #1104 2015-08-21 16:00:03 -07:00
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