DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 13:44:06 -08:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity
8894 commits 101 branches 268 tags 320 MiB
Commit graph

8894 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 04b6f023ae Use new upload string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:57:50 -07:00
snipe 3c7d63c060 Disallow uploads if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:52:23 -07:00
snipe 7cb1ca8754 Fixed image path to show preview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:51:48 -07:00
snipe 6d5ace0458
Merge pull request #12049 from uberbrady/improve_scim_externalid_support 
Fixed writes to the `externalId` from SCIM
 2022-11-02 15:43:55 -07:00
snipe 6f14355cbc
Merge pull request #12060 from snipe/features/added_accessories_file_uploads 
Added accessories file uploads
 2022-11-01 19:51:38 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 2f9e097854
Merge pull request #12059 from snipe/fixes/consumables_files_translations 
Use the generic file uploads strings
 2022-11-01 19:32:35 -07:00
snipe 97aeb1fcec Use the generic file uploads strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:31:23 -07:00
snipe e6d259bac0
Merge pull request #12058 from snipe/features/added_uploads_to_components 
Added uploads to components
 2022-11-01 19:30:17 -07:00
snipe 8887d40b86 Added gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:29:21 -07:00
snipe 3d8e0b707e Fixed component file route controller names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:29:13 -07:00
snipe 71a7176a6e Updated component blade 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:57 -07:00
snipe def89bfa0c Added some generic file translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:49 -07:00
snipe f1cb7ee410 Fixed some translations 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:28:39 -07:00
snipe 84c0f50266 Added ComponentFilesController 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:10:04 -07:00
snipe f51b312843 Added component routes for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:51 -07:00
snipe 3d3a4b02fc Added helper method for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:34 -07:00
snipe 276f534ded Updated permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:21 -07:00
snipe 1d47d9e52b
Merge pull request #12057 from snipe/features/add_uploads_to_components 
Added uploads to components
 2022-11-01 19:07:42 -07:00
snipe 2106b64da6 Fixed some layout issues 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:06:49 -07:00
snipe fa79a6c15f Skip storage:: facade on missing images 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 18:19:13 -07:00
snipe 761da534f3 Updated consumables UI to allow uploads and display files 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:53:08 -07:00
snipe b362951c95 Added consumables permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:45 -07:00
snipe 25f69a7bd2 Added consumable methods for uploads 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:28 -07:00
snipe f6a6478804 Added consumable uploads gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:04 -07:00
snipe 3282702c73 Added consumables upload routes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:51:53 -07:00
Brady Wetherington 4e5c878b73 Needed to fix the way we write externalId from SCIM 2022-10-31 19:15:08 -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