mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-02-05 16:05:44 +00:00
Code Issues Projects Releases Wiki Activity
8,854 Commits 87 Branches 232 Tags
0bc0a116aa052d9d18ecfc80502c034e6ddbfd25
Commit Graph

8854 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
snipe
0bc0a116aa Merge pull request #12035 from snipe/features/added_new_tab_to_locations 
Features/added new tab to locations
 2022-10-26 00:32:07 -07:00
snipe
e670ffe349 Added Assets Assigned to tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:16:06 -07:00
snipe
a94f1c4a64 Cleaned up and added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:15:52 -07:00
snipe
b503b672ba Merge pull request #11951 from Godmartinz/AccessKey_shortcuts 
adds shortcuts for listing, creating, and saving
 2022-10-25 15:53:57 -07:00
snipe
bc023a2566 Add @eltociear as a contributor 2022-10-25 15:46:07 -07:00
snipe
2f7e22be1e Fixed all-contributors type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-25 15:46:07 -07:00
snipe
9409965239 Merge pull request #11928 from eltociear/patch-1 
Fix typo in Dockerfile.fpm-alpine
 2022-10-25 15:45:42 -07:00
snipe
f54c92ade2 Merge pull request #12028 from StarlessNights/feature/add-memcached-php-extensions-to-docker-images 
Fixed #12027: Add memcached php extensions to docker images
 2022-10-25 15:42:15 -07:00
snipe
9e08936cbc Merge pull request #12030 from uberbrady/scim_externalid_support 
Added externalId support to SCIM integration
 2022-10-25 14:51:52 -07:00
Brady Wetherington
cd385e0865 Set scim_externalid to nullable, default null 2022-10-25 14:38:19 -07:00
Brady Wetherington
1e3281c76c Add externalId support to SCIM integration 2022-10-25 14:19:01 -07:00
Iisakki Jaakkola
af4d62759f Added php memcached extension to docker Alpine image. 2022-10-25 16:16:25 +03:00
Iisakki Jaakkola
9452973845 Added php memcached extension to the docker image. 2022-10-25 16:16:25 +03:00
snipe
3b16157d6b Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 17:43:53 -07:00
snipe
ae430959a4 Merge pull request #12015 from snipe/fixes/revert_processing_button 
Changed button icon for importer
 2022-10-21 17:00:22 -07:00
snipe
85a85082b7 Changed button icon for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-21 16:59:19 -07:00
snipe
5acb493efd Merge pull request #12008 from snipe/features/add_default_loc_to_location_view 
Added default tab to locations
 2022-10-21 16:43:24 -07:00
snipe
515b14a001 Updated JS to better handle input IDs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:21:09 -07:00
snipe
4eed2baa31 Added default tab to locations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-20 19:06:58 -07:00
snipe
453f2c3b0e Merge pull request #12006 from uberbrady/ldap_manager_cache 
Added cache manager lookups in LDAP for performance boost
 2022-10-20 17:06:23 -07:00
Brady Wetherington
bc78d341a0 Caches manager lookups in LDAP for performance boost 2022-10-20 16:52:40 -07:00
snipe
edf191b724 Merge pull request #11995 from uberbrady/ldap_manager_fix 
Fixed: Okta LDAP Manager Attribute - Try to better-handle LDAP Manager settings
 2022-10-19 19:04:10 -07:00
Brady Wetherington
12d86bd6e2 Erroneous line-break removal - re-add 2022-10-19 19:01:52 -07:00
Brady Wetherington
c4f11de90d Remove incorrect comment. 2022-10-19 18:49:19 -07:00
Brady Wetherington
8fb61cf5f8 Try to better handle LDAP Manager settings that don't line up with what we expect 2022-10-19 18:36:16 -07:00
snipe
23e613f903 Fixed kit parse error on model edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-18 15:00:33 -07:00
snipe
f1c82ca732 Merge pull request #11988 from snipe/fixes/wrong_icons_for_mobile_location_view 
Fixed wrong icons for mobile view for locations listing
 2022-10-17 20:14:01 -07:00
snipe
2543fa6b98 Fixed user icon for tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:04:42 -07:00
snipe
7c34652da0 Fixed incorrect icons for mobile view on location tabs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-17 20:02:27 -07:00
snipe
1ec303931a Merge pull request #11986 from Godmartinz/FD31357_depreciation 
Fixes the calc of months and fixes typo of the word depreciation
 2022-10-17 14:44:46 -07:00
Godfrey M
d359bcb88d adds proper spacing 2022-10-17 13:15:10 -07:00
Godfrey M
28059c878a gets the proper amount of months and fixes typo of the word depreciation 2022-10-17 11:16:29 -07:00
snipe
b7bcfaccc9 Merge pull request #11834 from uberbrady/try_catch_notifications 
try/catch wrap notifications on checkin/checkout
 2022-10-13 14:20:22 -07:00
snipe
0303df4b25 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 13:19:51 -07:00
snipe
8c6aaec9ce Merge pull request #11971 from snipe/localization/new_translations 
Added new translations
 2022-10-13 13:06:16 -07:00
snipe
fb228d6ded Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:57:10 -07:00
snipe
1360ce90a5 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:52:45 -07:00
snipe
3549afe157 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:43:24 -07:00
snipe
cfb780b20b Remove unused files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:39:10 -07:00
snipe
eb9f17122e Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:21:09 -07:00
snipe
2ef45afb2b Removed extraneous files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 12:18:57 -07:00
snipe
ecc6bd8a24 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:24:31 -07:00
snipe
80279a95ae Merge pull request #11964 from snipe/fixes/audit_admin_presenting 
Use admin ID for audit log notification
 2022-10-12 16:00:50 -07:00
snipe
ac055c01dc Use admin ID for audit log notification 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 15:59:43 -07:00
snipe
5ff72420a6 Set branch back to develop 
I hads to switch branches because the automated GH action script always targets masterb

Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 11:00:06 -07:00
snipe
55b33c1042 Merge pull request #11944 from snipe/dependabot/github_actions/actions/checkout-3.1.0 
Bump actions/checkout from 2 to 3.1.0
 2022-10-12 10:59:21 -07:00
snipe
a499a92bb7 Added @nh314 as a contributor 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 10:57:50 -07:00
snipe
e7ae7742b0 Merge pull request #11949 from nh314/Remove-required-mark 
Remove required mark
 2022-10-12 10:55:49 -07:00
snipe
98f2e0271b Merge pull request #11942 from nh314/develop 
Correct comparison logic
 2022-10-12 10:55:29 -07:00
snipe
cd43fc50fb Merge pull request #11960 from snipe/fixes/better_validation_for_ldap_filter 
Sets nullable attribute on validation
 2022-10-12 10:53:08 -07:00