ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,395 Commits 84 Branches 293 Tags
80fb7a4c13b3df18ea73a1360e98217876753439
Commit Graph

98 Commits

Author SHA1 Message Date
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 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 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 ed2d7310f8 Fixed unsuspend icon 2015-08-13 00:39:52 -07:00
snipe 7fa9e49880 Activate user created on modal create 2015-08-12 21:50:04 -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
snipe 106ed6a9a0 Added location to user listing 2015-08-06 03:59:23 -07:00
snipe e4ad1011da Merge pull request #969 from snipe/inline_adding 
Inline adding of dependent drop-down contents on asset-creation
 2015-07-27 23:39:07 -07:00
Brady Wetherington de8180ec70 Abililty to inline-add things when you are creating a new asset 2015-07-27 23:27:45 -07:00
madd15 5e7bfe314a Fix missing ] 2015-07-27 21:20:19 +09:30
snipe a099d16714 Only send email if an email address was given 2015-07-26 22:08:26 -07:00
snipe b32e3a3475 Shwo username instead of email 2015-07-26 21:21:42 -07:00
snipe 5701b4d38e Return accessories as well 2015-07-25 00:05:59 -07:00
snipe 23866bce26 Use redirect to route instead of back because POST 2015-07-24 23:08:33 -07:00
snipe 6dea227c3e Fixes #851 - bulk user delete 2015-07-24 22:37:15 -07:00
snipe fbb55c14d6 Merge remote-tracking branch 'origin/develop' into 2.0 
# Conflicts:
#	app/controllers/admin/AssetsController.php
 2015-07-24 15:56:10 -07:00
snipe e455b2af6e Only update email if password locking isn't set to true 2015-07-23 12:30:44 -07:00
snipe d26c40b26e Fixed issue where email not saved on edit 2015-07-23 12:28:26 -07:00
Brady Wetherington c683c1c57e Revert "Merge branch 'feature/857_AssetRepairUpgradeTracking' of https://github.com/vsposato/snipe-it into vsposato-feature/857_AssetRepairUpgradeTracking" 
This reverts commit 41b711740a, reversing
changes made to 55309bfaef.

It also un-reverts reversions that were done inadvertently.
 2015-07-20 17:12:28 -07:00
snipe 775a38880e Revert "Starter controller for bulk edit/delete" 
This reverts commit 55309bfaef.
 2015-07-20 16:35:16 -07:00
snipe 55309bfaef Starter controller for bulk edit/delete 2015-07-17 14:13:27 -07:00
madd15 1fcd36e4ac Change user list to include email address 2015-07-16 10:25:13 +09:30
madd15 1e730078c1 Add file uploads to Users 2015-07-10 09:23:34 +09:30
snipe 15e1774a13 Centered checkboxes for select all 2015-07-09 03:57:20 -07:00
snipe 6524ac3678 Beginning of #851 - no controller methods yet, but still troubleshooting stupid datatables errors. 
[Error] TypeError: undefined is not an object (evaluating 'f.nTf=a[b].cell')
	jb (jquery.dataTables.min.js, line 24)
	ga (jquery.dataTables.min.js, line 45)
	(anonymous function) (jquery.dataTables.min.js, line 92)
	each (jquery-latest.js, line 383)
	each (jquery-latest.js, line 136)
	o (jquery.dataTables.min.js, line 82)
	(anonymous function) (users, line 371)
	fire (jquery-latest.js, line 3119)
	fireWith (jquery-latest.js, line 3231)
	ready (jquery-latest.js, line 3443)
	completed (jquery-latest.js, line 3474)
 2015-07-09 03:09:18 -07:00
madd15 7a0b3a7350 Allow saving of Username and Email changes 
I noted that i was unable to change the username or email fields, but also that the username validation would not allow the form to save as it was checking against itself for being unique.
 2015-07-02 12:16:01 +09:30
snipe bb7ce83c48 Merge remote-tracking branch 'origin/develop' into 2.0 2015-06-30 22:42:00 -07:00
snipe f2abbd0e8f Deny editing users on demo 2015-06-30 22:10:23 -07:00
snipe edfa064fd4 Disable emailing imported users if demo mode 2015-06-23 18:38:21 -07:00
snipe bf3cb73070 Include location ID on user import 2015-06-23 15:05:11 -07:00
snipe 28a9f90a72 Lazy eager load history for optimized queries 2015-06-23 13:44:49 -07:00
snipe 826d3ccae8 Eager loading user info 2015-06-22 17:57:55 -07:00
snipe ec10526d69 Center envelope in user listing 2015-06-18 15:00:32 -07:00
snipe 16ec68e0b6 Hide email icon if no email address is provided 2015-06-16 01:45:34 -07:00
snipe d943408f44 Location and email not required, username required 2015-06-15 18:39:34 -07:00
snipe c4375f9fbc Merge remote-tracking branch 'origin/develop' into 1.3.0 
# Conflicts:
#	app/controllers/admin/UsersController.php
 2015-06-15 11:30:40 -07:00
snipe 7820efc121 Fixes #822 and #847 - added notes field on import for MySQL strict mode 2015-06-15 11:20:09 -07:00
snipe d0189fb076 Added consumables to user matrix for #782 2015-06-09 20:05:24 -07:00
snipe 2540ac09ec Fixes #822 2015-06-09 16:02:10 -07:00
snipe 71febc1c81 Added accessories and location 2015-05-04 13:31:47 -07:00