DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8925 commits 101 branches 268 tags 288 MiB
Commit graph

8925 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 23cbee9493 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-11-03 14:18:55 -07:00
snipe 7c21158680 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:18:13 -07:00
snipe 30f4af3ac2 Merge remote-tracking branch 'origin/develop' 2022-11-03 14:14:23 -07:00
snipe b1fa50cde2
Merge pull request #12067 from snipe/fixes/modelfile_image_path 
Fixed model file image path/variable
 2022-11-03 14:13:54 -07:00
snipe 236684ec92 Fixed model file image path/variable 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:12:49 -07:00
snipe c45e777324 Merge remote-tracking branch 'origin/develop' 2022-11-03 14:10:08 -07:00
snipe 53499b1e29
Merge pull request #12066 from snipe/fixes/small_uploads_fixes 
Fixed - small uploads fixes
 2022-11-03 14:08:52 -07:00
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 52e33a8b0e Merge remote-tracking branch 'origin/develop' 2022-11-03 13:27:21 -07:00
snipe 0f5fbb6a04 Re-added gitignore 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 13:27:06 -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 5711706367 Merge remote-tracking branch 'origin/develop' 2022-10-31 12:17:06 -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 9f8f028484 Merge remote-tracking branch 'origin/develop' 2022-10-26 12:21:20 -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 f32183d51b Merge remote-tracking branch 'origin/develop' 2022-10-26 10:58:52 -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 38678d4646 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-10-26 09:50:44 -07:00
snipe 476a5cbc02 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:49:50 -07:00
snipe bc4c6abe06 Merge remote-tracking branch 'origin/develop' 2022-10-26 09:43:33 -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