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

8885 commits

This branch
This branch
All branches
Author SHA1 Message Date
Cram42 a8b6a4a259 Allow passing "template" param 2022-11-02 16:04:40 +08:00
Cram42 a60ee7736b Add P-touch TZe 12mm Tape Example 2022-11-02 12:22:55 +08:00
Cram42 d0eb3cfc9b Merge branch 'feature-label2' into develop 2022-11-02 10:09:46 +08:00
Cram42 19150aeb44 Add P-touch TZe 24mm Tape Example 2022-11-02 10:09:11 +08:00
Cram42 cde2ba7720 Fix: Oops 2022-11-02 09:51:02 +08: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
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 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