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

86 Commits

Author SHA1 Message Date
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
snipe 5e7a4e8193 Fixes #599 - show groups in user list 2015-05-04 01:44:49 -07:00
snipe bbcc8aa9ac Update groups if unlocked 2015-03-25 14:26:12 -07:00
snipe 865c302f71 Prevent changing user email/pass/groups if locked 2015-03-25 14:26:00 -07:00
madd15 161d72390b Update edit for notes field 2015-03-18 16:50:15 +10:30
snipe a341db4cf7 Prevent delete when password lock is active 2015-03-17 17:29:48 -07:00
snipe c00086c740 Fix eager loading for user throttle 2015-03-17 15:36:11 -07:00
snipe c2c0196a3d Eager loading managers, licenses 2015-03-17 14:58:15 -07:00
snipe 46c1f2a28b Server side datatables for user view - needs fix for deleted users 2015-03-16 17:33:41 -07:00
madd15 eb5d4983de more model functionality and icons 2015-02-27 00:53:16 +10:30
snipe ca1351b704 Switched to all FA 2015-02-25 18:14:51 -08:00
snipe 097bb38a23 Fixes #163 - accept acceptance + eula 
TODO: Language strings, check that the accepting user is the one that should be allowed to accept.
 2015-02-24 22:15:36 -08:00
snipe e04ac89c5a Added expiring warrantee alerts 2015-02-24 02:07:33 -08:00