DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9279 commits 101 branches 268 tags 288 MiB
Commit graph

9279 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Cram42 d0eb3cfc9b Merge branch 'feature-label2' into develop 2022-11-02 10:09:46 +08: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
Cram42 19150aeb44 Add P-touch TZe 24mm Tape Example 2022-11-02 10:09:11 +08: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
Cram42 cde2ba7720 Fix: Oops 2022-11-02 09:51:02 +08: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
Cram42 6b2fe582ca Merge branch 'feature-label2' into develop 2022-11-01 20:12:28 +08:00
cram42 7e2546b31f
Merge branch 'snipe:develop' into develop 2022-11-01 20:04:59 +08:00
Cram42 7b29ddd283 Tie into tag generation 2022-11-01 20:02:12 +08:00
Cram42 d37605ff18 Add localization strings 2022-11-01 20:01:18 +08:00
Cram42 6de48b4dc8 Implement settings for labels 2022-11-01 20:00:53 +08:00
Cram42 5558a005b9 Implement API for labels 2022-11-01 19:57:51 +08:00
Cram42 bb09f0168f Create Label View/Generator 2022-11-01 19:56:53 +08:00
Cram42 4ed728d954 Add template to simulate legacy label 2022-11-01 19:54:00 +08:00
Cram42 bbecdb6768 Add QR example 2022-11-01 19:53:11 +08:00
Cram42 df89406987 Create Label model and example 2022-11-01 19:52:34 +08:00
Cram42 7c355cef2d Add helper to convert between units of measurement 2022-11-01 19:49:57 +08:00
Cram42 35536b5dbd Require tecnickcom/tcpdf 2022-11-01 19:47:59 +08: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
Cram42 0e69e4248c Fix: Multiple outputs at hardware/{id}/label 2022-10-27 08:12:42 +08: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
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 de856d6045 Merge remote-tracking branch 'origin/develop' 2022-10-26 00:57:17 -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 88ae8858e8 Merge remote-tracking branch 'origin/develop' 2022-10-26 00:32:39 -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