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

668 commits

Author SHA1 Message Date
snipe b17af38d8e
Merge pull request #12901 from Godmartinz/user_total_cost 
Added users total cost of assets to user profile
 2023-09-05 13:52:34 +01:00
snipe a62e2f092b
Merge pull request #13498 from marcusmoore/feature/add-checkin-date-range-filter-to-custom-asset-report 
Added last check in column and filter to custom asset report
 2023-09-05 13:22:15 +01:00
snipe 83b178f5b2 Added model name and number to dynamic url 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-31 18:03:32 +01:00
Godfrey Martinez d86c63cf23
Merge branch 'ignore_encrypt_and_other_changes' into fix-companyable 2023-08-28 19:38:16 -07:00
Godfrey M 74f45a4473 reworks company queries for asset history 2023-08-28 19:35:46 -07:00
snipe 844fe0938c Added link to the help docs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-26 17:42:56 +01:00
Ivan Nieto Vivanco 7bfb5a0667 Disable the Checkin All Seats button if License is not reassignable 2023-08-23 16:36:06 -06:00
snipe 79b330f492
Merge pull request #13400 from inietov/fixes/asset_acceptance_user_error 
Fixed Asset acceptance error when user company and asset company don't match
 2023-08-22 15:49:56 +01:00
snipe a48762c64d
Merge pull request #13496 from snipe/features/setting_for_name_order 
Fixed #13495 added setting for name order
 2023-08-22 12:50:58 +01:00
snipe 23237e5cd3 Removed unused translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-22 12:50:32 +01:00
snipe fea11ec7f1
Merge pull request #12761 from spencerrlongg/bulk_edit_custom_fields 
Bulk Editing Custom Fields
 2023-08-22 12:40:18 +01:00
Marcus Moore c332b98456 Add last checkin options to report front end 2023-08-21 13:44:49 -07:00
Godfrey M 5076b45a0d adds id to history info 2023-08-21 13:40:39 -07:00
snipe c39579b170 New strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:25 +01:00
Ivan Nieto Vivanco 25c58a8486 Fix typo in language variable name 2023-08-15 14:17:39 -06:00
snipe 253975ce72 Updated translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:55 +01:00
snipe e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Ivan Nieto Vivanco 71cb16118d Change error string for a better (?) one 2023-08-14 20:52:00 -06:00
Ivan Nieto Vivanco d365565b6d Add message in the acceptance assets view to indicate when the user can\'t accept nor deny the asset 2023-08-14 20:51:04 -06:00
snipe a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
Ivan Nieto Vivanco 9ca163e8cf Stop asset acceptances from shown to user if full company support is enabled and companies not match 2023-08-02 19:22:35 -06:00
Marcus Moore 65de9c5e07
Extract translation strings 2023-08-01 15:21:49 -07:00
Grant Le Roux b1464e028c
Merge branch 'develop' into develop 2023-07-31 07:57:29 +08:00
snipe a01cb26aac
Merge pull request #12940 from akemidx/delete_asset_from_view_page 
Delete button on asset view page
 2023-07-25 12:11:35 +01:00
akemidx e289e95721 no ? needed 2023-07-24 17:22:10 -04:00
akemidx b082d27c42 removing :item 2023-07-24 17:12:12 -04:00
snipe 7f761000b4 Use slightly less terrifying and more accurate language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-21 14:46:39 +01:00
snipe 33fd904c18
Merge pull request #13330 from akemidx/merge_users_typo 
merge users page typo fix
 2023-07-19 10:26:57 +01:00
akemidx 064e696521 merge users page typo fix 2023-07-18 15:33:33 -04:00
snipe 3078cab7ee Added ability to show/hide custom fields in list views by default 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-14 09:09:43 +01:00
snipe 4027acee46
Merge pull request #13184 from akemidx/department_in_side_bar 
User department now visible in side pane of asset view page
 2023-07-13 21:01:48 +01:00
akemidx d0212d4bda formatting fix 2023-06-29 15:39:19 -04:00
slong753 826ea0ded8 move colon to blade based on a comment 2023-06-29 10:40:04 -05:00
snipe a3096e1b47
Merge pull request #13219 from inietov/features/cancel_request_asset 
Cancel requested assets without checkin/out [ch-17606]
 2023-06-29 16:18:13 +01:00
akemidx af03b9f140 user department clarification & translation for that phrase. will be used in a later PR 2023-06-28 17:45:13 -04:00
slong753 8923206ac8 translation string 2023-06-28 13:08:34 -05:00
Ivan Nieto Vivanco 85e717bc4e Fix cancel button style and translate title 2023-06-28 10:38:44 -06:00
snipe 161f4c8d83
Merge pull request #13045 from akemidx/feature/sc-23261 
Checkin/out info on side bar
 2023-06-28 16:41:21 +01:00
slong753 8b8e7cb5ee couple translation strings 2023-06-28 10:17:28 -05:00
Marcus Moore b0177d513a
Fix translation 2023-06-27 12:37:19 -07:00
slong753 8cbff0179c translation strings 2023-06-26 16:35:53 -05:00
snipe 157a4341ea
Merge pull request #13041 from snipe/features/refactor_importer_for_localization 
Refactor importer for localization
 2023-06-13 18:12:07 +01:00
snipe 7ae260b489 More license translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-01 19:51:06 +01:00
snipe 13e8f91a59 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-29 18:18:46 -04:00
snipe 47fa490e8a More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:28:23 -07:00
snipe 35794c8ba2 More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:48 -07:00
snipe 511d83cc47 Added/fixed a few more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:52:42 -07:00
snipe 0ea29a0224 Updated translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:21:36 -07:00
akemidx deca80ba71 checkin/out info on side bar 2023-05-17 13:17:48 -04:00
Godfrey M 46d6783fc5 adds translation to checkout notification 2023-05-15 09:01:30 -07:00
akemidx ba4fc146e2 Merge branch 'delete_asset_from_view_page' of https://github.com/akemidx/snipe-it into delete_asset_from_view_page 2023-05-10 19:30:11 -04:00
akemidx 1916594d27 fixing translation 2023-05-10 19:16:11 -04:00
snipe 7c77f4a697 Extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:10:53 -07:00
akemidx 537aa04c9a
Merge branch 'develop' into delete_asset_from_view_page 2023-05-10 09:30:54 -04:00
snipe 27e0484072 I lied. Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:12:22 -07:00
snipe ec76de607b Final google login tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 03:08:29 -07:00
snipe ed370a0104 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:47:28 -07:00
snipe b99640ecb2 Added ends_with validation message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:40:55 -07:00
snipe f3c977aa9d Nicer button 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:37:01 -07:00
snipe 3c00f68bda Added translation string for google auth failure 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:18:50 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
akemidx 67105528d1 Buttons on the accessory view page 2023-05-03 16:31:56 -04:00
snipe b716f9f55e
Merge pull request #12916 from snipe/features/auto_add_to_fieldset 
Added ability to auto-add fields to new fieldsets
 2023-05-03 11:04:33 -07:00
snipe 4a643c1252
Merge pull request #12880 from Godmartinz/asset_total_cost 
Added component costs to asset view
 2023-05-03 10:49:03 -07:00
akemidx ad7a1d6c3b edits from Github comments 2023-05-01 15:50:48 -04:00
akemidx b1e68be545 delete button progress 2023-04-27 18:58:59 -04:00
snipe 54a766c4f9 Added dynamic warranty URL to manufacturers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 16:39:15 -07:00
snipe 7c0ef581c5 Added help text to the now-dynamic manufacturer URLS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 15:12:36 -07:00
snipe d6ea5de5b8 Merge remote-tracking branch 'origin/develop' into features/auto_add_to_fieldset 2023-04-25 22:20:50 -07:00
snipe 4954b50280 Added new strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-25 15:57:46 -07:00
Godfrey M cb68f41d9c added ldap_location to settings 2023-04-25 11:44:04 -07:00
Godfrey M 6872f8da7b adding total cost to user view 2023-04-19 17:31:09 -07:00
Godfrey M bd212b3108 adds component costs to asset view 2023-04-19 16:35:06 -07:00
snipe 92f516484e Small tooltip improvements for undeployable items 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 12:54:06 -07:00
snipe 4d9d75379f Improved translation string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 11:39:16 -07:00
snipe df7b19bc1e Removed unused validations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 04:35:06 -07:00
snipe 4d09021e9c Compact tooltip for un-deletable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:19 -07:00
snipe beba31afbf Added tooltip for disabled delete buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:44:09 -07:00
snipe 3e53870b37 Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 02:00:13 -07:00
snipe 725adebffe Translate log message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:12 -07:00
snipe 25a83c2915 Removed moved translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:02:01 -07:00
snipe 3f4159f058 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:52 -07:00
snipe dd78d2fc66 Added language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-16 15:23:51 -07:00
snipe b690ed97d5 Fixed unclosed parens in translation file 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-13 12:05:06 -07:00
snipe 358b0548fa Added string for translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 22:03:26 -07:00
snipe 4840046f44 Check for available quantity on consumables before checkout 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 20:38:02 -07:00
snipe a9bb2f78cc Fixed borked English string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:11:35 -07:00
snipe 383d48fd9c
Merge pull request #12787 from Godmartinz/accessory_unavailable_message 
Added unavailable message to prevent over-checkout of Accessories
 2023-04-06 15:05:18 -07:00
snipe c1daac153b Updated string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:17:47 -07:00
snipe 506021dbe3 Remove iCheck calls, fixed some bootstrap HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:03:41 -07:00
Godfrey M b038fe8f2e adds unavailable message to overcheckout 2023-04-05 10:00:39 -07:00
snipe 76b9608de3 Typo fix 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:18:40 -07:00
snipe 1ea813a1c5 Updated strings to trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 18:54:59 -07:00
snipe 9146850ffe Added string for emailing user credentials 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:31 -07:00
snipe 9ca5285781
Merge pull request #12762 from spencerrlongg/feature/sc-20304 
Bulk Restore from Deleted
 2023-03-30 12:37:50 -07:00
slong753 0f72554a9f translations for messages 2023-03-30 13:57:18 -05:00
slong753 b84eaaf61a translations done 2023-03-30 13:48:05 -05:00
snipe 10c1e923dc
Merge pull request #12764 from marcusmoore/fixes/importer-fix 
Fixes potential unwanted overwrites in asset imports
 2023-03-30 09:40:58 -07:00
slong753 d033733fc0 oops, remove a couple things 2023-03-29 18:30:39 -05:00
slong753 e4c76f454c this is good, just needs translations done in view 2023-03-29 18:24:56 -05:00