DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8554 commits 102 branches 268 tags 288 MiB
Commit graph

2369 commits

Author SHA1 Message Date
snipe 5feea17f8d
Revert "Prevent to delete a user if still has consumables associated to them" 2022-08-14 13:42:14 -07:00
snipe 60d1578a01
Merge pull request #11663 from inietov/fixes/user_cant_be_deleted_if_has_consumables 
Prevent to delete a user if still has consumables associated to them
 2022-08-14 13:41:09 -07:00
Ivan Nieto Vivanco db53a00d3f Prevent to delete a user if still has consumables associated to them 2022-08-11 17:01:52 -05:00
Godfrey M 814992eb7d allows company and location ids to be null 2022-08-11 12:47:40 -07:00
snipe ef099aa644 Reverted notes to note since pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 16:09:56 -07:00
snipe acd666fdf5 Added notes to user consumables tab 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:34:07 -07:00
snipe 512348cc5a Added withInput() 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:15:09 -07:00
snipe e3293151a2 Added note on checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:59 -07:00
snipe 3ec77724d8 Added note pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:34 -07:00
snipe 024a014298 Changed notes to note 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 15:04:19 -07:00
snipe e7c47408a7 Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:57:42 -07:00
snipe 637604dfaf Fixed #8928 - add URL and ID to custom asset report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-10 13:51:47 -07:00
Godfrey M 92e6ea96b2 if eol is missing from asset model monthly depreciation will be recalculated 2022-08-09 15:05:15 -07:00
snipe 9acfceba29 Added relations to report search 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 23:50:10 -07:00
snipe cc92d342ea Added deleted at value 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:37 -07:00
snipe 02caa13222 Removed debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:30 -07:00
snipe 975b4dee2f Added deleted header 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:58:17 -07:00
snipe 8e18ce74b2 Update method name 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 19:12:18 -07:00
snipe 1b657ee995
Merge pull request #11601 from vickyjaura183/bugfix/error_404_bulkcheckout 
Error 404 fixed on submitting without mandatory field
 2022-08-02 17:19:22 -07:00
snipe e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports 
Adds options to include Deleted assets to custom asset reports
 2022-08-02 10:33:57 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
vishalkumar183 96b40a5edd Error 404 fixed on sumitting witout mandtory field 2022-08-02 18:44:16 +05:30
snipe af7ccf3beb Handle logout route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:17:40 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe 78097df7ff Aplpies current time to checkin date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-21 21:45:25 -07:00
snipe 7313bca403 Checkin without deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:19 -07:00
snipe 6428dc5cd2 Removed duplicate supplier_id 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-13 13:08:15 -07:00
mikeroq f21824a8e2 Changed comparing the action type from translated in presenter to actual value 2022-07-12 17:59:03 -05:00
snipe 0ccd7e09de
Merge pull request #11488 from Godmartinz/feature/sc-19107/add-box-to-custom-reports-to-not-include 
adds a checkbox to exclude archived assets from custom reports
 2022-07-12 12:59:18 -07:00
Godfrey M 27039325f3 removed comments, because I forgot 2022-07-12 12:41:07 -07:00
Godfrey M 58c54cc3dc uses notArchived scope instead now 2022-07-12 12:20:11 -07:00
Godfrey M 48349071ed accounts for status_id as well 2022-07-12 09:46:44 -07:00
mikeroq 5efe45226d Fixes Email List of All Assigned being "successful" when the user has no email 
Added check in view to disable button if there is no email
Added translation for title on disabled button and for email check in controller
Fixed missing trans for user not found message
 2022-07-11 20:02:10 -05:00
snipe bb091760af Fixedd unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-11 17:11:28 -07:00
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
snipe 2518e2f0ee Removed > 300 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 17:09:56 -07:00
snipe 43e370f35a Move migrations further up 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-08 16:40:51 -07:00
snipe ee4f355e49 Changed logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-05 17:58:45 -07:00
mikeroq be8869978d Added import for Setting model 2022-07-04 07:29:01 -05:00
snipe 92d46edca3 Cleaned up logging output 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-01 13:33:58 -07:00
snipe 45c616639c Replicates #11444 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-01 11:21:02 -07:00
snipe 4e547a3639 Fixed typos :( 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:06:36 -07:00
snipe b910db0617 Fixed #11393 - reject acceptance if no file is present 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 21:01:58 -07:00
snipe 25cb32ca6a Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 18:51:44 -07:00
snipe 1a423a252b Derp 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:22:58 -07:00
snipe 7591f3f092 Added auth filter check regex 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:15:49 -07:00
snipe 2cace3c73a Added LDAP warnings on page load 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-30 15:08:12 -07:00