ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,026 Commits 84 Branches 293 Tags
34276984f35e3ad79283fbb94f96dbbb0dfd446a
Commit Graph

1099 Commits

Author SHA1 Message Date
snipe 59b2b8c63e Switch to hash version for more consistent cookie resets 2015-11-25 02:47:21 -08:00
snipe 20490986c6 Fixes #1325 - zenbra striping and borders on table for money value clarity 2015-11-24 23:43:10 -08:00
snipe 64eecc8df7 Added image to model listing view for #1370 2015-11-24 23:24:20 -08:00
snipe 0f33bad1b6 Commented out version of export all 
This still works sorta wonky, and only exports 50 per page. Possibly related to https://github.com/wenzhixin/bootstrap-table/issues/1576
 2015-11-24 23:15:01 -08:00
snipe 99391d0179 Fixes #1332 - added location to accessories 2015-11-24 22:43:13 -08:00
snipe 904ddddce9 Removed consumable search sicne it doesn't do anything yet 2015-11-24 22:20:13 -08:00
snipe b39c53a5ea Closes #1375 - More data in consumables detail view 2015-11-24 21:58:30 -08:00
snipe 287c7735b6 Added CSRF token for upload 2015-11-24 19:37:59 -08:00
snipe a3dbd87f9f Fixed weird company table styles 2015-11-24 13:47:43 -08:00
snipe 6d42d2c614 Fixed bootstrap class for button 2015-11-24 13:44:58 -08:00
snipe a777499c0b Fixes #1376 - added new fields to consumables view 2015-11-24 13:30:05 -08:00
snipe 256f33e6b4 Company/category search on accessories 2015-11-24 12:08:49 -08:00
snipe f6e2654609 Added searching on company name, ordering on company name for PR #1321 2015-11-24 11:47:34 -08:00
snipe e60c0e3b4d Warning message about EOL 2015-11-23 21:04:41 -08:00
snipe 120c8394bb Fixes #1380 - groups pagination 2015-11-23 19:18:00 -08:00
snipe 4a49e6f471 Added popover code 2015-11-23 17:43:43 -08:00
snipe 61107769e8 Add user ID and make company name hidden by default 2015-11-23 15:18:10 -08:00
snipe f87a25bf3f Moved company down further, since it's not used as often 2015-11-23 14:44:08 -08:00
snipe 4ae02c1fb3 Merge pull request #1321 from Ahimta/multiple-companies 
Add support for multiple companies
 2015-11-23 14:40:37 -08:00
snipe 9ec132acde Small fixed for LDAP in settings table 2015-11-23 14:33:00 -08:00
Walter 6ea3bedb9e set decryption and set pword in migraiton 2015-11-22 23:08:18 -05:00
Walter 840e5b1523 Revert "begin work on idap import button" 
This reverts commit 3942fd1869.
 2015-11-22 11:10:36 -05:00
Walter 1ee3f29d2e Revert "working on ldap import button" 
This reverts commit 113dfc9c24.
 2015-11-22 11:02:19 -05:00
Walter 6b26640077 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings 2015-11-22 11:01:07 -05:00
Abdullah Alansari e4a634a8a3 Merge remote-tracking branch 'upstream/develop' into multiple-companies 2015-11-21 11:27:00 +03:00
Abdullah Alansari 86a174201e Only users with no company or supers can manage users' companies 2015-11-21 04:30:15 +03:00
snipe 01b574069a Fixes #1362 - status labels losing type on edit 2015-11-20 09:20:14 -08:00
Abdullah Alansari fe44846c1b Fix: only super users can change multiple companies support option 2015-11-19 09:17:50 +03:00
Wahlstedt, Walter 113dfc9c24 working on ldap import button 
add route for button
added button and open/close for form
 2015-11-18 16:22:04 -05:00
Walter 3942fd1869 begin work on idap import button 2015-11-18 12:11:42 -05:00
Abdullah Alansari d2423b2fc8 Show company name for the remaining entities 2015-11-18 19:15:56 +03:00
Wahlstedt, Walter 73a183677d Revert "add escaping to ldap fields in blades" 
This reverts commit 1d24450dcd.
 2015-11-17 16:12:24 -05:00
Wahlstedt, Walter 1d24450dcd add escaping to ldap fields in blades 2015-11-17 16:06:55 -05:00
Wahlstedt, Walter ac44140d83 fix edit blades 2015-11-17 10:50:39 -05:00
Wahlstedt, Walter c8ecddba54 Revert "Set required fields if ldap is enabled" 
This reverts commit 2f69be03d3.
 2015-11-17 10:47:59 -05:00
Wahlstedt, Walter 2f69be03d3 Set required fields if ldap is enabled 2015-11-17 10:46:29 -05:00
Wahlstedt, Walter 63cd0c1ae1 Merge remote-tracking branch 'refs/remotes/snipe/develop' into features/ldap-settings 2015-11-17 10:11:38 -05:00
Wahlstedt, Walter 8a014d4bd3 update ldap integration 2015-11-17 10:00:06 -05:00
Wahlstedt, Walter 8793a04869 add ldap integration to settings page. 2015-11-17 09:59:20 -05:00
Wahlstedt, Walter d72df21b3b Update migration and blades 2015-11-16 16:31:43 -05:00
Wahlstedt, Walter 937249b960 enable ldap import if data exists in database 2015-11-16 12:38:47 -05:00
Wahlstedt, Walter 50ea6c66f9 LDAP Settings update 
update ldap field names
add ldap fields to controllers
add ldap fields to migration
add lang fields
update edit page
 2015-11-16 11:30:51 -05:00
Abdullah Alansari b202e01205 Add full multiple companies support 
Added as an option in settings.
When enabled, users (including admins) who are assigned
to companies have access only to their companies' assets.
 2015-11-16 06:03:27 +03:00
Abdullah Alansari 23d10a8f7f Make company field optional 
Company field is now optional for the user,
although still required in the controllers.
 2015-11-13 09:19:18 +03:00
Abdullah Alansari d8df61bd32 Merge remote-tracking branch 'upstream/develop' into multiple-companies 
Conflicts:
	app/controllers/admin/UsersController.php
	app/views/backend/hardware/index.blade.php
 2015-11-12 09:30:11 +03:00
Walter d9cd4a4da0 setting up views for ldap 2015-11-11 23:03:46 -05:00
snipe a0599712a6 Show model image if available and no asset image 2015-11-11 16:06:07 -08:00
snipe 7297a6031e Merge pull request #1330 from mtucker6784/develop 
Images for devices on the Assets datatable page.
 2015-11-11 15:51:31 -08:00
snipe 75bd29b027 Added cookie expiration for sorting/filtering 2015-11-11 14:50:17 -08:00
Walter 464f11c398 setting up bones for ldap settings 
add migration
add ldap settings to settings controller
add ldap fields edit settings views
 2015-11-09 22:09:09 -05:00