Commit graph

951 commits

Author SHA1 Message Date
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 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
snipe 4bf1566d2a
Merge pull request #12124 from Godmartinz/feature/sc-16946/add-checkbox-to-allow-skipping-a-user-during
Adds Boolean to Users Table for Auto Assigning Licenses
2023-02-21 20:10:46 -08:00
snipe 0c3115553e
Merge branch 'develop' into vip_tag 2023-02-21 20:03:49 -08:00
snipe 942fee4d43
Merge pull request #12447 from akemidx/user_setup_translation
FIXED: Translations on the User Creation setup page
2023-02-21 19:53:00 -08:00
snipe 29158dece5 Two more translations
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:19:34 -08:00
snipe 04d3938f0c Updated the general translation file with new strings
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:04:13 -08:00
snipe f109218e16 Re-added dropped translations from CrowdIn
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 09:00:10 -08:00
snipe a0b05bac8d Updated translations with new strings and new translations
Signed-off-by: snipe <snipe@snipe.net>
2023-02-21 03:54:55 -08:00
akemidx dfc2aa35f4
Update general.php 2023-02-17 12:51:58 -05:00
snipe 27e5832a28 Use existing slack translations
Signed-off-by: snipe <snipe@snipe.net>
2023-02-15 14:06:52 -08:00
snipe de4f7bd274
Merge pull request #12408 from snipe/fixes/stricter_date_rectrictions_on_validation
Enforce Y-m-d as date format for date fields
2023-02-15 12:54:22 -08:00
snipe 1520c9c6a7
Merge pull request #12506 from marcusmoore/fix/use-translation-strings-for-importer-errors
Use translation strings for importer exceptions
2023-02-13 14:17:47 -08:00
Marcus Moore 4bdb1cf552
Improve error message wording 2023-02-13 13:34:20 -08:00
Marcus Moore 2349f54013
Use translation strings for importer exceptions 2023-02-13 13:30:36 -08:00
akemidx 5714824aa7 translations for the layout setup 2023-02-09 17:24:34 -05:00
snipe a4a3c03a7c
Merge pull request #12478 from inietov/fixes/added_translation_strings_inventory_report
Fixed #12064 Mail-Template missing translation strings
2023-02-08 10:02:19 -08:00
snipe 16fcc6dc44 Fixed UI bug where download button was missing for non-images
Signed-off-by: snipe <snipe@snipe.net>
2023-02-07 18:40:00 -08:00
Ivan Nieto Vivanco 49b6a1cc53 Adds translation strings to theinventory report sent to users 2023-02-07 18:29:19 -06:00
snipe bbf6e5e69e
Merge pull request #12421 from akemidx/hardware_blades_translations
Fixed: translations added for the hardware blades
2023-02-02 13:02:46 -08:00
akemidx 29851c626f
Merge branch 'develop' into user_setup_translation 2023-02-02 14:34:09 -05:00
snipe 78dca7fd32 Handle missing userfiles more gracefully
Signed-off-by: snipe <snipe@snipe.net>
2023-02-02 10:49:36 -08:00
akemidx 69c38bf686 translations on the User Creation page 2023-02-01 20:32:16 -05:00
snipe d9cdb92014
Merge branch 'develop' into vip_tag 2023-02-01 16:03:23 -08:00
snipe 2da4578aa5
Merge branch 'develop' into slack_message 2023-02-01 13:43:09 -08:00
snipe 1a8fb5bcfe
Merge pull request #12423 from snipe/features/edit_fieldset_name
Fixed #12418 - added ability to edit custom field names via GUI
2023-02-01 13:39:39 -08:00
akemidx 3702dd87ce fixing pr 2023-02-01 16:10:30 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
akemidx a8643e5d35 cleaning up/adding variable 2023-02-01 15:55:16 -05:00
snipe 583a0412fe Added edit fieldsets translations
Signed-off-by: snipe <snipe@snipe.net>
2023-01-26 17:03:23 -08:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05:00
snipe a61ccbb965 Added very clunky but better error messages on that validation for date_format
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:33:49 -08:00
snipe 91394f7262 Removed duplicate comment section
Signed-off-by: snipe <snipe@snipe.net>
2023-01-24 17:23:06 -08:00
akemidx 3ba79600fb checkin limit for the components checkin 2023-01-24 18:17:49 -05:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
cram42 c2c009a018
Merge branch 'develop' into develop 2023-01-24 09:53:42 +08:00
akemidx 25996cbe03 translating the quick info printed out on accept x eula blades 2023-01-23 16:18:21 -05:00
snipe 33fe2b57f7 Added new byod strings
Signed-off-by: snipe <snipe@snipe.net>
2023-01-18 13:10:48 -08:00
Godfrey M 6fbb484dfd renames db column for auto_assign boolean, rewords trans string, default value of 1 now 2023-01-18 08:43:03 -08:00
snipe 50cc69c427 Added South Sudan to country list
Signed-off-by: snipe <snipe@snipe.net>
2023-01-13 13:23:57 -08:00
snipe d508374c57 Disallowed category type change string
Signed-off-by: snipe <snipe@snipe.net>
2023-01-10 16:15:51 -08:00
Brady Wetherington cbffd105a2 Fix LDAP default group feature 2023-01-09 15:23:19 -08:00
snipe 014eab3abc Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
2023-01-09 11:09:26 -08:00
snipe 9c63f426d9 Added missing translation string
Signed-off-by: snipe <snipe@snipe.net>
2023-01-04 14:09:14 -08:00
snipe b77d5801fa English is hard, apparently
Signed-off-by: snipe <snipe@snipe.net>
2023-01-04 13:56:16 -08:00
snipe d187174f00
Merge pull request #12090 from Godmartinz/deparmtnet_name_validator
Added: validation for department names at Company locations
2022-12-22 11:29:12 -08:00
snipe 227fef76ee
Merge pull request #11736 from Godmartinz/gh6508_ldap_default_group
Adds a permission group selection for directory sync
2022-12-15 11:06:53 -08:00
Godfrey M 2e228ccb0b redid a few things. should be good now :) 2022-12-15 10:45:42 -08:00
snipe fabefa61b0
Merge pull request #12243 from akemidx/new_grey_out_when_no_assets
Created method in users.php for adding up all assigned to user and pr…
2022-12-13 14:00:48 -08:00
akemidx f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05:00
snipe c432fb9d70
Merge pull request #12181 from Godmartinz/gh12163_asset_age
Adds asset age to asset index and asset view pages
2022-12-13 10:28:17 -08:00
snipe 00ed197651 Fixed #12215 - string for “Hello, :name” in pt-BR was using %
Signed-off-by: snipe <snipe@snipe.net>
2022-12-08 17:21:55 -08:00
akemi 55f5e7866d edits for PR 2022-11-29 15:59:36 -05:00
akemi 39e06a8856 Update to PR#12119, adding inventory notification to messages and changing code to be dynamicaly translated 2022-11-28 14:16:22 -05:00
Godfrey M 8d861cfd82 adds age to the asset table 2022-11-28 10:59:18 -08:00
Godfrey M 90828e3a87 fixes variable name 2022-11-15 15:51:52 -08:00
Godfrey M 45636b8114 adds should_autoassign boolean to users table 2022-11-15 15:42:57 -08:00
Cram42 a4b93d4bbd Create Field Definitions helper control 2022-11-10 19:20:18 +08:00
Godfrey M 92ae271292 adds validation for department names at Company locations 2022-11-09 13:11:33 -08:00
snipe b95d24b5eb Additional translations
Signed-off-by: snipe <snipe@snipe.net>
2022-11-08 15:27:44 +00:00
Cram42 4bb40adfce Add Asset Tag as separate supported feature 2022-11-02 16:07:50 +08:00
snipe def89bfa0c Added some generic file translations
Signed-off-by: snipe <snipe@snipe.net>
2022-11-01 19:28:49 -07:00
Cram42 6b2fe582ca Merge branch 'feature-label2' into develop 2022-11-01 20:12:28 +08:00
Cram42 d37605ff18 Add localization strings 2022-11-01 20:01:18 +08:00
snipe e670ffe349 Added Assets Assigned to tab
Signed-off-by: snipe <snipe@snipe.net>
2022-10-26 00:16:06 -07:00
Godfrey M f9ac447dd1 adds default group to LDAP 2022-10-18 15:18:09 -07:00
snipe 1360ce90a5 Updated strings
Signed-off-by: snipe <snipe@snipe.net>
2022-10-13 12:52:45 -07:00
snipe 3549afe157 Added strings
Signed-off-by: snipe <snipe@snipe.net>
2022-10-13 12:43:24 -07:00
snipe cfb780b20b Remove unused files
Signed-off-by: snipe <snipe@snipe.net>
2022-10-13 12:39:10 -07:00
snipe 2ef45afb2b Removed extraneous files
Signed-off-by: snipe <snipe@snipe.net>
2022-10-13 12:18:57 -07:00
snipe 5ba01728d9 More text tweaking
Signed-off-by: snipe <snipe@snipe.net>
2022-10-11 12:51:25 -07:00
snipe ae0eb378e4 Additional clarification
Signed-off-by: snipe <snipe@snipe.net>
2022-10-11 12:43:54 -07:00
snipe ad8a2387f0 Updated help text to be more clear
Signed-off-by: snipe <snipe@snipe.net>
2022-10-11 12:38:37 -07:00
snipe d23e178c62 Adde language strings
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 16:56:10 -07:00
snipe 018f71a157 Switched to translations for better autoglossonym support
Signed-off-by: snipe <snipe@snipe.net>
2022-10-05 11:46:42 -07:00
snipe 81d2a3acda Updated lnaguage strings
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 17:48:43 -07:00
snipe ba0483b33e Phrasing!
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 16:21:10 -07:00
snipe 97b9f96030 Added nag alert for unaccepted assets
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 16:16:21 -07:00
snipe 891b5b2882 Added routes, language
Signed-off-by: snipe <snipe@snipe.net>
2022-10-04 15:45:25 -07:00
snipe 70c766e8b3 Added setting to choose dashboard type
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 04:16:46 -07:00
snipe 0b2ce7be07 Fixed #11521 - switch to using status meta from status label name
Signed-off-by: snipe <snipe@snipe.net>
2022-09-29 03:48:58 -07:00
snipe dcab1381e7 Check for licenses.files permissions
Signed-off-by: snipe <snipe@snipe.net>
2022-09-16 14:00:27 -07:00
snipe 24910433a1 Fixed 500 when depreciation is set but no purchase_date
Signed-off-by: snipe <snipe@snipe.net>
2022-09-15 15:39:47 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -07:00
snipe dcbd407698
Merge pull request #11661 from inietov/fixes/notifications_asset_acceptance
Send notifications when Acceptance Assets actions occur [sc-9917]
2022-08-30 12:14:58 -07:00
Godfrey M fc6fefdb4e adds migration, variables, checkbox,working on groups 2022-08-25 15:19:38 -07:00
snipe 2c68ec927a Use trans_choice for string
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:30:59 -07:00
snipe 70bb4cd746 Added translation
Signed-off-by: snipe <snipe@snipe.net>
2022-08-11 18:25:15 -07:00
Ivan Nieto Vivanco 509bbbc685 Create Notifications classes for accepted and declined and add some necesary lang strings 2022-08-11 13:01:21 -05:00
snipe 9db0b038a5 Updated translation strings
Signed-off-by: snipe <snipe@snipe.net>
2022-08-08 15:29:28 -07:00
snipe 095dd3ecf2 Added configuration, PAT test strings
Signed-off-by: snipe <snipe@snipe.net>
2022-08-02 20:19:28 -07:00
Godfrey M e150ab58e9 reworded trans 2022-08-02 10:31:06 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe 25cc46e416 Fixed button string
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 18:01:41 -07:00
snipe 32010d5387 Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 17:57:27 -07:00
snipe b7c7e6c623 Added/updated language strings
Signed-off-by: snipe <snipe@snipe.net>
2022-07-20 17:56:58 -07: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
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
Godfrey M 75844c5942 adds a checkbox to exclude archived assets from custom reports 2022-07-11 09:56:58 -07:00
snipe ef17fd41f7
Merge branch 'develop' into develop 2022-07-05 16:26:53 -07:00
snipe dae53a1128 Updated translations
Signed-off-by: snipe <snipe@snipe.net>
2022-07-05 16:18:53 -07:00
Daniel Reeder 7772ef22db Quick typo fix 2022-07-04 21:57:54 +00: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 df1e2687d6 Updated languages
Signed-off-by: snipe <snipe@snipe.net>
2022-06-30 17:35:02 -07:00
Godfrey M e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -07:00
snipe ed95adb45c Show model files on hardware page
Signed-off-by: snipe <snipe@snipe.net>
2022-06-28 16:17:46 -07:00
snipe 9355689dd4 Nicer output for custom fields error
Signed-off-by: snipe <snipe@snipe.net>
2022-06-27 11:52:51 -07:00
snipe d70b36750c
Merge pull request #10967 from veenone/fix/hide_optional_field_on_create_asset
Fixes #8155 -  improve the workflow during asset creation
2022-06-24 18:53:07 -07:00
snipe 8c85d7bc97
Merge pull request #11370 from inietov/fixes/customfields_default_values_not_validating
Adds validation to custom fields' default values
2022-06-24 18:11:16 -07:00
snipe 657039882c Added purge and backup strings
Signed-off-by: snipe <snipe@snipe.net>
2022-06-24 15:48:46 -07:00
snipe 77bf28bcb6 Disallow purge
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 20:11:43 -07:00
snipe 86d2c2b153 Small naming changes
Signed-off-by: snipe <snipe@snipe.net>
2022-06-23 19:11:59 -07:00
Ivan Nieto Vivanco 7976401aa2 Add error message when the default customfield values can't be validated 2022-06-22 22:17:05 -05:00
snipe 2f258a3e3d Make the strings match
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:48:22 -07:00
snipe 1b6df232aa Updated string
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 18:41:02 -07:00
snipe de048e1009 Updated language
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 16:13:59 -07:00
snipe d4c53945d9 Tweaked language
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:19:49 -07:00
snipe 21875100b6 Fixed missing password.token string and checked for user existing before trying to reset
Signed-off-by: snipe <snipe@snipe.net>
2022-06-21 14:15:38 -07:00
snipe 6ea722d41e
Merge pull request #11271 from inietov/fixes/bulk_delete_not_checking_assignedto_type
Fix typo in language files
2022-06-13 19:24:08 -07:00
Godfrey M c8bc0eff11 fixes translation references in the users ldap blade 2022-06-08 09:52:55 -07:00
Ivan Nieto Vivanco 44f4f20187 Only fix typo in 'en' file 2022-06-07 19:09:59 -05:00
Ivan Nieto Vivanco 792b18f845 Return language files to previous state 2022-06-07 19:09:03 -05:00
Ivan Nieto Vivanco 064f4b3fc6 Fix typo in language files 2022-06-07 16:30:18 -05:00
snipe 5bc5e9f108 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	resources/lang/en/admin/locations/general.php
2022-06-05 17:14:31 -07:00
snipe 985e683896 Small display improvements
Signed-off-by: snipe <snipe@snipe.net>
2022-06-05 16:59:53 -07:00
snipe 514db05770 Merge remote-tracking branch 'origin/develop' 2022-06-03 13:29:04 -07:00
snipe 7ca617f077
Merge pull request #11246 from snipe/fixes/clearer_placeholder_text_for_ldap
Added explicit “Example:” text in placeholders
2022-06-03 13:28:40 -07:00
snipe 54f828743e Merge remote-tracking branch 'origin/develop' 2022-06-03 12:54:13 -07:00
snipe 3071a83ae0 Added the validation strings for user creation password options
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 12:00:56 -07:00
snipe 1c4864a3cc Added explicit “Example:” text in placeholders
Signed-off-by: snipe <snipe@snipe.net>
2022-06-03 11:25:18 -07:00
snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
2022-05-24 15:10:46 -07:00
snipe 5be7dee3d3 Updated language strings
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 15:07:14 -07:00
snipe 5d83516659 Fixed typoe on maintenance screen
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:15:01 -07:00
snipe 67616dbcf4 Updated language strings from activated to able to login
Signed-off-by: snipe <snipe@snipe.net>
2022-05-24 13:12:02 -07:00
snipe 891009dc67 Nicer formatting for buttons in bulk user edit
Signed-off-by: snipe <snipe@snipe.net>
2022-05-18 15:35:57 -07:00
snipe 0f9559c1ff Fixed #11124 - updated maintenance page
Signed-off-by: snipe <snipe@snipe.net>
2022-05-17 19:01:37 -07:00
snipe 5030c7e5ff Added missing backups help string
Signed-off-by: snipe <snipe@snipe.net>
2022-05-14 10:24:03 -07:00
snipe 3a31104b5c Fixed #11052 - add file sizes to upload displays
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 19:33:14 -07:00
snipe 6b27c0311d Updated help text on groups for more info on deselecting
Signed-off-by: snipe <snipe@snipe.net>
2022-05-13 05:23:12 -07:00
Godfrey M 33b1ab3658 prevents values for assets being negative through validation 2022-05-10 16:19:06 -07:00
snipe d5edb0908b Added translation string to the correct file this time
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 14:07:05 -07:00
snipe 2982d78899 Added translation for no assets selected
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 05:42:02 -07:00
snipe caef98d36d Patched #11025 to develop
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 02:06:12 -07:00
snipe 784bf4d784 Merge remote-tracking branch 'origin/master' into develop
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	.github/ISSUE_TEMPLATE/feature_request.yml
#	app/Http/Controllers/CustomFieldsetsController.php
#	app/Http/Controllers/ReportsController.php
#	config/version.php
#	package-lock.json
#	package.json
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
#	resources/views/users/print.blade.php
#	webpack.mix.js
2022-05-06 01:52:43 -07:00
snipe c0e9393092 Fixed #10890 - use translation strings in user asset printout
Signed-off-by: snipe <snipe@snipe.net>
2022-05-06 01:30:58 -07:00