DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 14:39:49 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11488 commits 101 branches 268 tags 288 MiB
Commit graph

358 commits

Author SHA1 Message Date
snipe 725adebffe Translate log message 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:07:12 -07:00
snipe 3f4159f058 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-18 01:01:52 -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
Godfrey M b038fe8f2e adds unavailable message to overcheckout 2023-04-05 10:00:39 -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
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
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
snipe 32922e6461 Use corrected language string 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 16:39:52 -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
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
akemidx a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04: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
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
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
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
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08: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 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
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
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
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
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
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 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 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
akemidx f3e57d7dc0 fixing PR 2022-12-13 16:00:59 -05: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 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
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 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 dcab1381e7 Check for licenses.files permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-16 14:00:27 -07:00
Godfrey M 193b31e427 select options working, testing sync then done 2022-08-31 12:58:33 -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 095dd3ecf2 Added configuration, PAT test strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-02 20:19:28 -07:00
snipe 32010d5387 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:27 -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 e471aa8639 adds button to email user list of assets from profile 2022-06-29 11:15:15 -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
Ivan Nieto Vivanco 7976401aa2 Add error message when the default customfield values can't be validated 2022-06-22 22:17:05 -05: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 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