DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-22 16:57:38 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8868 commits 89 branches 265 tags 290 MiB
Commit graph

8868 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 3282702c73 Added consumables upload routes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:51:53 -07:00
snipe a930661150 Check for valid category 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-31 12:16:39 -07:00
snipe 7cb4740359
Merge pull request #11766 from snipe/fixes/wtf_method_names_derp 
Fixed (?) method name?
 2022-10-26 17:39:11 -07:00
snipe d0b9e956df
Merge pull request #12042 from snipe/fixes/added_missing_hashed_password_string 
Corrected string for invalid current password
 2022-10-26 12:20:35 -07:00
snipe c1eee2cc72 Corrected string for invalid current password 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 12:18:29 -07:00
snipe 73f30c0a41
Merge pull request #12041 from snipe/features/reflect_status_label_color_in_sidenav 
Fixed #12009 - Added ability to reflect color in sidenav if one is given
 2022-10-26 10:58:19 -07:00
snipe c233d7fb1c Removed extra spaces 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:51:06 -07:00
snipe dea0fcefbd Reflect color in sidenav if one is given 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 10:48:42 -07:00
snipe 476a5cbc02 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:49:50 -07:00
snipe 73f61ce032
Merge pull request #12040 from snipe/fixes/locations_asset_count 
Renamed column back to assets_count for legacy
 2022-10-26 09:43:01 -07:00
snipe 12c7223bcd Renamed column back to assets_count for legacy 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:39:03 -07:00
snipe b7efb58733
Merge pull request #12038 from snipe/fixes/clear_expected_checkin_on_checkin_action 
Added - set `expected_checkin` to `null` on user bulk checkin and delete
 2022-10-26 00:56:43 -07:00
snipe 28b0d8cf0f Null expected_checkin on user bulk checkin and delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 00:54:37 -07:00
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