DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
10829 commits 101 branches 268 tags 320 MiB
Commit graph

3535 commits

Author SHA1 Message Date
snipe 7a425f8a49
Merge pull request #13093 from NojoudAlshehri/features/added_asset_tag_colum_in_requestable_assets 
feature: Added asset_tag column in requestable assets page
 2023-06-15 19:37:18 +01:00
snipe 21a27f43a9
Merge pull request #13158 from Godmartinz/asset_maint_warranty_bug 
Added warranty confirmation to asset maintenance table
 2023-06-15 19:34:16 +01:00
snipe 004992086e
Merge pull request #13098 from ak-piracha/feature/snipe-13049-status-label-chart-color 
Fixed #13098: Status Label Chart Color, resets to default when editing a Status Label
 2023-06-15 16:55:32 +01: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 0bb8cc63c5 Updated translation strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-13 17:12:01 +01:00
Godfrey M fc86530c94 uses the trueFalseFormatter now 2023-06-13 09:10:42 -07:00
Godfrey M 69325beddb adds warranty confirmation to asset maintenance table 2023-06-12 11:03:32 -07:00
NojoudAlshehri d06bdc2db4
Fix of typo in an HTML tag 2023-06-07 13:46:17 +07:00
snipe 7ae260b489 More license translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-01 19:51:06 +01:00
ak-piracha daf6bcb6d5 follow best practices when working with blade and javascript 2023-06-01 11:07:21 +09:30
snipe 13e8f91a59 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-29 18:18:46 -04:00
ak-piracha 825a9a384d Fixed 2023-05-29 14:07:53 +09:30
NojoudAlshehri 980cb53efa
Added asset_tag column in requestable assets page 2023-05-27 07:05:59 +07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
snipe 064dbdd3d4 Fixed missing brace from conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:23 -07:00
snipe 9086cb5310
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block 2023-05-24 15:56:01 -07:00
snipe 47fa490e8a More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 19:28:23 -07:00
snipe 80e8022c76
Merge pull request #13044 from Godmartinz/bug/sc-23260_multi_select_example_text 
Bug/sc 23260 multi select example text
 2023-05-23 14:45:55 -07:00
snipe 35794c8ba2 More translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-23 12:57:48 -07:00
Godfrey M 68a43cb590 fixes mobile nav bar and notification position 2023-05-23 12:43:32 -07:00
Ivan Nieto Vivanco 6df9a33eab Add a condition to check if images should be shown in notification 2023-05-22 16:24:16 -06: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
snipe b7149d8339 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:20:38 -07:00
Godfrey M 608d07d03c adds overflow-wrap to asset info table 2023-05-17 13:08:53 -07:00
Godfrey M addd806653 testing overflow solutions 2023-05-17 10:47:50 -07:00
Godfrey M fe60309dfd adds padding to multi select2 inputs 2023-05-17 10:19:25 -07:00
Godfrey M 448472b6d3 testing input paddings 2023-05-17 09:45:45 -07:00
snipe 7012018e22 Removed todo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:30:17 -07:00
snipe 3cbb4620c3
Merge pull request #13008 from Godmartinz/importer_happy_changes 
Added standardized colors to the importer
 2023-05-16 17:26:32 -07:00
snipe f1575d2020
Merge pull request #13024 from Godmartinz/adds_localization_to_checkout_notif 
adds translation to checkout notification
 2023-05-16 17:25:50 -07:00
snipe b9b9eb86d9
Merge pull request #13036 from snipe/features/multiselect_locations_custom_report 
Added multi-select option for location, more to custom report
 2023-05-16 16:29:13 -07:00
snipe fe92667812 Use actions text in backups table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 16:02:48 -07:00
snipe 02cacf76c6 Additional multi-select options for custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 13:58:21 -07:00
Godfrey M 46d6783fc5 adds translation to checkout notification 2023-05-15 09:01:30 -07:00
Godfrey M 763176c86b standardizes the importer colors no matter the theme 2023-05-10 14:52:08 -07:00
snipe 0f3b77ee2d Added multi-select option to custom report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 14:45:31 -07:00
snipe a49257ad4b Wrong eval 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:16:59 -07:00
snipe c6eef86661 Fixed multiselect for companies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 13:15:22 -07:00
snipe 23e3d18931 Used brackets for multiselect company 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 12:35:30 -07:00
snipe 9f39d71f16
Merge pull request #12831 from Godmartinz/adds_multi_select_to_custom_report 
Added Multiselect of companies for custom reports
 2023-05-10 11:36:21 -07:00
snipe b8a59cc2d8
Merge branch 'master' into develop 2023-05-10 09:32:26 -07:00
snipe 7c77f4a697 Extra debugging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:10:53 -07: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 14da8934c5 Few more login page tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:53:11 -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 788c03ef57 Hide client secret if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 02:22:49 -07:00