lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
16540 commits 1 branch 0 tags 220 MiB
Commit graph

16540 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tobias Regnery
4e0bcac1a1 Furhter validation for scoped locations 
There is a new validator introduced that checks on object update (assets, users, etc.) if the company matches the locations company.
In case of the creation of a new location it must be checked that the parent matches the own company.
On updating a location a check for every related object must be made to see if the company matches the location.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-24 11:12:11 +01:00
Tobias Regnery
6921df9334 Check for inconsistencies before activating scoped locations 
Before activating scoped location all locations and their related objects will be checked.
If there are locations with different companies than the related objects error out.

Because this operation is quite slow, bail out on the first inconsistent entry.
There is a new artisan command introduced that checks every location.

Depending on the size of the database, this will take very long.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-23 15:26:04 +01:00
snipe
b6f05bff1f
Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
snipe
7e65d68392
Merge pull request #16089 from snipe/fixes/15017_card_view 
Fixes #15017 - card view for mobile
 2025-01-17 17:04:04 +00:00
snipe
b3d35beeb9 Fixes #15017 - card view for mobile 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:58:30 +00:00
snipe
fed7c2dc16 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:38:04 +00:00
snipe
79951c3f17 Set support footer to on in reset demo script 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:37:00 +00:00
snipe
221ffb446c Fixed #15946 - added comtent type to webhook test 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-17 16:36:43 +00:00
snipe
57f80290a1
Merge pull request #16081 from marcusmoore/fixes/zerofill-count-on-setup 2025-01-16 21:22:02 +00:00
Marcus Moore
4b2ede7a71
Use 0 for zerofill_count if nothing provided 2025-01-16 12:20:14 -08:00
snipe
5e465fa417 Merge remote-tracking branch 'origin/master' into develop 2025-01-16 19:06:02 +00:00
snipe
de5d66f5d2 Comment out ad-hoc note button for now 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-16 19:05:52 +00:00
Marcus Moore
96379d0a62
Use provided zerofill_count 2025-01-15 16:39:50 -08:00
snipe
bbc9ed5778 Fixed audit date default on bulk audit 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:28:50 +00:00
snipe
1d0c156d2e Increased due for checkin warning 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:12:18 +00:00
snipe
7de5e2e7ef One more audot field increase 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:11:22 +00:00
snipe
8d935b34eb Fixed audit interval input width 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:07:53 +00:00
snipe
9830959f11 Fixed input width on audit interval 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-15 22:07:15 +00:00
snipe
37b39956b5
Merge pull request #16071 from snipe/bug/sc-28149 2025-01-14 14:35:24 +00:00
snipe
9a4fd81c70 Use correct icon for ad-hoc notes on assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-14 14:34:17 +00:00
snipe
0bb2e98af3 Built assets 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-14 12:33:59 +00:00
snipe
1c8d94c953
Merge pull request #15525 from akemidx/updated_ad_hoc_notes 2025-01-14 11:33:21 +00:00
snipe
ca11efd3ee
Merge pull request #16036 from Godmartinz/unaccepted_assets_reports_memory_fix 2025-01-13 22:23:30 +00:00
snipe
4a6a94a50e
Merge pull request #16010 from AnouarTouati/dev-container-fixes 2025-01-13 22:23:13 +00:00
snipe
2d65b38155
Merge pull request #16011 from AnouarTouati/dev-docker-improv 2025-01-13 21:00:04 +00:00
snipe
587449ef97
Merge pull request #15981 from akemidx/bug/sc-27551 2025-01-13 17:35:58 +00:00
snipe
06ffac9d7d
Merge pull request #16046 from uberbrady/ldap_asset_location_switch_fix 2025-01-13 17:33:13 +00:00
snipe
e32ed03f66
Merge pull request #16061 from snipe/moved_keywords_on_admin_settings 2025-01-13 17:10:01 +00:00
snipe
a7543b407f Added a few more words 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:07:22 +00:00
snipe
98b1ba1e39 Moved keywords in lang file 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 17:04:48 +00:00
snipe
e03ed7567a
Merge pull request #15747 from NebelKreis/feature/custom-data-options-for-2d-barcode 2025-01-13 15:20:56 +00:00
Nebel
9f0581275b
Merge branch 'develop' into feature/custom-data-options-for-2d-barcode 2025-01-13 15:49:32 +01:00
snipe
3f5c166417 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-01-13 13:59:41 +00:00
snipe
cf091377b6 Add @brlin-tw as a contributor 2025-01-13 13:59:34 +00:00
snipe
0cc7a7014f
Merge pull request #16053 from brlin-tw/patch-1 
Fixed #16054: fix incorrect compose service name in the APP_KEY generation command of the Docker env file
 2025-01-13 13:59:05 +00:00
snipe
4790ad53e3 Updated font-awesome to 6.7.2 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-13 13:57:45 +00:00
snipe
62dc075834 Add @aHVzY2g as a contributor 2025-01-13 13:55:28 +00:00
snipe
41da04cd22
Merge pull request #16018 from aHVzY2g/patch-3 2025-01-13 13:55:04 +00:00
Marlon Spangenberg
0c4fc56b80 increased label/field size to 2.5, reduced supported fields to 3 2025-01-13 12:20:56 +01:00
Marlon Spangenberg
907f0553d4 moved label value into the same line, changed label font to freemono 2025-01-13 12:14:30 +01:00
snipe
224f04db6c
Merge pull request #16050 from Godmartinz/inactive-slack-hook 
Adds try/catch around notification failing with an inactive webhook for better user experience
 2025-01-10 11:23:41 +00:00
snipe
f0bcf78941
Merge pull request #16051 from marcusmoore/testing/checkoutable-acceptance-factory-fix 
Update related asset when checkout acceptance created via factory
 2025-01-10 11:22:50 +00:00
林博仁 Buo-ren Lin
c08a4a2b0a Fixed #16054: fix incorrect compose service name in the APP_KEY generation command of the Docker env file 
This resolves the following error:

```
$ docker compose run --rm snipe-it php artisan key:generate --show
no such service: snipe-it
```

and is also how it is done in the documentation.

Fixes #16054.

Refer-to: APP_KEY | Docker | Snipe-IT documentation <https://snipe-it.readme.io/docs/docker#app_key>
Signed-off-by: Buo-ren Lin (OSSII) <buoren.lin@ossii.com.tw>
 2025-01-10 11:29:49 +08:00
Marcus Moore
8597984787
Update asset's assigned_to and assigned_type after creating 2025-01-09 15:09:57 -08:00
Godfrey M
001ccf1ce9 adds translation string instead of hardcoded message 2025-01-09 14:47:07 -08:00
Godfrey M
082a974ee3 changed from redirect with error to with warning 2025-01-09 14:26:54 -08:00
Godfrey M
152c23b8f3 changed log from warning to error 2025-01-09 12:55:25 -08:00
Godfrey M
b635822a85 add try/catch around notification failing for inactive slack hooks 2025-01-09 12:51:54 -08:00
snipe
ec85e4b5b0 Upgrade less from 4.2.0 to 4.2.1 #15996 
Signed-off-by: snipe <snipe@snipe.net>
 2025-01-09 20:42:04 +00:00
snipe
1acb7e0fe4 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2025-01-09 20:38:47 +00:00