DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11984 commits 97 branches 266 tags 291 MiB
Commit graph

795 commits

Author SHA1 Message Date
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 574b0184fc Updated Zulu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:35 -07:00
snipe 9db5e328c9 Updated Chinese Traditional 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:28 -07:00
snipe 0a77216b6f Updated Chinese Traditional, Hong Kong 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:57:03 -07:00
snipe 44b4274a49 Updated Chinese Simplified 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:56:43 -07:00
snipe 7711540514 Updated Vietnamese 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:55:47 -07:00
snipe 4d7b2b5747 Updated Urdu (Pakistan) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:55:06 -07:00
snipe 6f92144b96 Updated Ukrainian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:54:41 -07:00
snipe 8446f456ab Updated Turkish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:54:06 -07:00
snipe d5b4971371 Updated Tagalog 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:53:35 -07:00
snipe 0686e1e7c4 Updated Thai 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:52:36 -07:00
snipe 6143f28bb9 Updated Tamil 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:52:03 -07:00
snipe 0e2dd5d76c Updated Swedish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:51:37 -07:00
snipe eae5e7b35d Updated Serbian (Latin) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:51:15 -07:00
snipe 4f8dc54872 Updated Slovenian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:50:34 -07:00
snipe 81129ed91f Updated Slovak 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:49:54 -07:00
snipe 48dff4681b Updated Sinhala 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:48:25 -07:00
snipe 40bb5bb4f0 Updated Russian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:47:56 -07:00
snipe 51f1ad6693 Updated Romanian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:46:22 -07:00
snipe ca49923371 Updated Portuguese, European 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:54 -07:00
snipe d9d3d11cc6 Updated Portuguese, Brazilan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:42 -07:00
snipe b7537a73b2 Updated Polish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:45:10 -07:00
snipe 98aa8623d3 Updated Norwegian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:44:48 -07:00
snipe aa9420cbad Updated Dutch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:44:15 -07:00
snipe 9b7ab63277 Updated Malay 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:43:38 -07:00
snipe d588b2905d Updated Mongolian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:43:12 -07:00
snipe c176f3d030 Updated Malayalam 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:42:40 -07:00
snipe 173e2add88 Updated Macedonian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:42:14 -07:00
snipe 359d8d0e08 Updated Maori 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:41:36 -07:00
snipe 2ea03f66a2 Updated Latvian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:40:55 -07:00
snipe d2301dae63 Updated Lithuanian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:40:21 -07:00
snipe e24a9ccf1c Updated Korean 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:39:35 -07:00
snipe 227d7e75a3 Updated Japanese 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:38:59 -07:00
snipe 8befc23178 Updated Inuktitut 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:38:17 -07:00
snipe 9eac3c2e64 Updated Italian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:37:42 -07:00
snipe 4c220df181 Updated Icelandic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:36:58 -07:00
snipe 0703d037d6 Updated Indonesian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:35:48 -07:00
snipe 28498857c2 Updated Hungarian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:35:12 -07:00
snipe 7c4e73d660 Updated Croatian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:34:31 -07:00
snipe c42c9cc832 Updated Hebrew 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:33:41 -07:00
snipe 7cebbf48ee Updated Irish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:32:55 -07:00
snipe 70745952b9 Updated French 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:32:12 -07:00
snipe 807509030c Updated Filipino 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:27:32 -07:00
snipe 0a673f4ffe Updated Finnish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:27:01 -07:00
snipe f1caf69f05 Updated Persian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:26:15 -07:00
snipe 86532746b1 Updated Estonian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:25:35 -07:00
snipe 94035e5e4b Updated Spanish, Venezuela 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:24:19 -07:00
snipe 5a84a1d15c Updated Spanish, Mexico 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:23:41 -07:00
snipe 48c924e0b2 Updated Spanish, Spain 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:23:16 -07:00
snipe 54deaf18d1 Updated Spanish, Colombia 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:22:57 -07:00
snipe 4f3617d271 Updated Indonesian English 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:21:43 -07:00
snipe 096be6e095 Updated British English 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:21:33 -07:00
snipe 02601a95e0 Updated Greek 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:20:09 -07:00
snipe 70653419cd Updated German Informal 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:19:24 -07:00
snipe 8f258d8454 Updated German 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:18:50 -07:00
snipe 9f26a30256 Updated Danish 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:18:16 -07:00
snipe 0b392286ce Updated Welsh 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:17:33 -07:00
snipe 5f56b30d19 Updated Czech 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:16:42 -07:00
snipe ba7d8f1c07 Updated Catalan 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:15:38 -07:00
snipe e391c1322c Updated Bulgarian 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:14:50 -07:00
snipe f634640425 Updated Arabic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:13:56 -07:00
snipe 4bcc1c6aa9 Updated Amharic 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:12:55 -07:00
snipe 88b98e6cf7 Updated Afrikaans 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 19:11:43 -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
Marcus Moore 863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -07:00
Joe Ferguson d667ae53ed
Add missing strings to Step 2 preflight 2023-03-28 10:30:35 -05:00
Marcus Moore 9d2c4a4dee
Update webhook message 2023-03-23 10:38:35 -07:00
snipe e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -07:00
snipe f29e813332 Translated “Clear & Save” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:35 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
akemidx bb7b655fd2 translating screen reader lines 2023-03-21 16:02:34 -04:00
akemidx 3134279a95 small edits 2023-03-21 15:48:53 -04:00
snipe 071a642509 Changed phrasing in translatons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:15:28 -07:00
snipe e47fc9527b Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:50:02 -07:00
snipe fb54a21e12 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:22 -07:00
snipe d3d26cb988 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:03 -07:00
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07:00
snipe fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
snipe 5a709a83e7 Small UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 09:38:30 -07:00
Godfrey M 1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Godfrey M 27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
Godfrey M 82504c9764 updates alerts to notifications in notification settings 2023-03-13 09:51:25 -07:00
snipe a6f4e53e2b Added translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:49 -08:00
akemidx cd9f2f7fb7 datestamp for print all assigned form generation 2023-03-08 14:56:14 -05:00
Godfrey M 15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
snipe 19d19a4c42 Updated language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:18:32 -08:00
snipe e55d02fd59 Added new string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:53:53 -08:00
Godfrey M 69944853f9 more translations 2023-03-07 15:57:58 -08:00
Godfrey M 35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -08:00
snipe 16bd2cde0f Updated string for file not found 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 15:09:45 -08:00
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
akemidx 25f3e4d41a Adding ability to see boolean values when using normal export 2023-02-28 16:01:23 -05:00
Godfrey M e8fc895e51 "adds variables, but still not working" 2023-02-27 09:19:59 -08:00
snipe 8e72da42e8
Merge pull request #12406 from akemidx/vip_tag 
Added a checkbox to notate VIP status
 2023-02-23 12:23:29 -08:00