DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
10831 commits 101 branches 268 tags 288 MiB
Commit graph

10831 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe f890e1f8b1
Merge pull request #13171 from snipe/features/importer/allow_update_by_user_id 
Accept user ID as authoratative field for updates
 2023-06-15 20:08:20 +01:00
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 09d65f810e
Merge pull request #13124 from m4us1ne/fix_dompdf_chroot 
Fixed #12434: Include Docker Specific Paths for dompdf chroot
 2023-06-15 19:32:34 +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 6c684bccd0 Accept user ID as authoratative field for updates 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-15 10:02:05 +01:00
Godfrey M ee50906e44 attempt to add warranty to api controller 2023-06-13 11:20:55 -07: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 f1bf7267f7
Merge pull request #13164 from snipe/localizations/updated_strings 
Updated translation strings
 2023-06-13 17:24:01 +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
snipe d1ab139b0f Add @qay21 as a contributor 2023-06-12 14:05:43 +01:00
snipe dc43985884 Applied #13143 to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-12 14:05:26 +01:00
Lukas Jung 9fca8c2438 Fixed #12434: Include Docker Specific Paths for dompdf chroot 2023-06-09 11:00:46 +02:00
snipe c78c69700f Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:49:55 +01:00
snipe 4775eef392
Merge pull request #13140 from snipe/security/misc_libraries 
Updated libraries and dev assets
 2023-06-08 08:48:55 +01:00
snipe 14727700ab Updated libraries and dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:48:18 +01:00
snipe a6b1320b39 Add @stefanstidlffg as a contributor 2023-06-08 08:11:34 +01:00
snipe 4672f6a699
Merge pull request #13139 from snipe/security/updated_webpack 
Updated webpack, added new dev assets
 2023-06-08 08:11:07 +01:00
snipe 03233465c7 Updated webpack, added new dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:10:12 +01:00
snipe 8a72056bfd
Merge pull request #13123 from osterr-forschungsforderungsges-mbh/fix-slack-notifications 
fix slack channel notifications
 2023-06-08 05:51:08 +01:00
snipe adb2757532 Add @NojoudAlshehri as a contributor 2023-06-07 16:52:22 +01:00
snipe b57730ee9d Added missing assets_fields declaration 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-07 15:52:18 +01:00
snipe 9335bf7033
Merge pull request #13122 from marcusmoore/fixes/increase-consumable-factory-name-length 
Fixes potentially invalid name in consumable factory
 2023-06-07 11:43:13 +01:00
snipe 45b76c4c75
Merge pull request #13127 from NojoudAlshehri/fixes/typo-in-a-html-tag 
Fix of typo in an HTML tag
 2023-06-07 09:21:51 +01:00
NojoudAlshehri d06bdc2db4
Fix of typo in an HTML tag 2023-06-07 13:46:17 +07:00
Stefan Stidl ad8c36a51a fix: slack channel 2023-06-06 10:30:01 +02:00
Marcus Moore d3a0bacb98
Get name as a string and not an array 2023-06-05 12:57:09 -07:00
Marcus Moore 371d11305b
Ensure consumable name is valid in factory 2023-06-05 12:17:44 -07:00
snipe 7ae260b489 More license translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-01 19:51:06 +01:00
snipe ff480a7247
Merge pull request #13114 from inietov/fixes/broken_sorting_manufacturers 
Fixed Broken order by manufacturer in Assets table [sc-23313]
 2023-06-01 19:40:16 +01:00
Ivan Nieto Vivanco f9a20bc917 Replace join with left join in pertinent eloquent query 2023-06-01 12:08:51 -06:00
ak-piracha daf6bcb6d5 follow best practices when working with blade and javascript 2023-06-01 11:07:21 +09:30
snipe e431cd5146
Merge pull request #13085 from inietov/fixes/checkboxes_not_holding_value 
Fixed #12978 Custom Field Checkboxes not holding assigned values
 2023-05-31 10:55:37 -04:00
snipe 35942361b6 Add @ak-piracha as a contributor 2023-05-31 15:51:39 +01:00
snipe 596b510a25
Merge pull request #13108 from ak-piracha/fixes/component_delete_showing_in_assest 
Fixes: issue #13073: deleted component addearing in asset component t…
 2023-05-31 10:50:34 -04:00
ak-piracha 1cdf089306 Fixes: issue #13073: deleted component addearing in asset component tab fixed 2023-05-31 00:11:11 +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 60d2046b6d Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:13:33 -07:00
snipe 67e0eb3193
Merge pull request #13046 from Godmartinz/asset_info_overflow 
Added Asset info overflow-wrap
 2023-05-24 16:13:01 -07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
snipe fb5e33c50f Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:03:15 -07:00
snipe d7f4fa146b Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:28 -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 cc07921608 Updated dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 15:59:52 -07:00
snipe 267a0ffc59
Merge pull request #13077 from Godmartinz/fix_unclickable_nav_bar_and_notifcation_block 
fixes mobile nav bar and notification position
 2023-05-24 15:58:27 -07:00
snipe 9086cb5310
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block 2023-05-24 15:56:01 -07:00