DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 10:34:08 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
12647 commits 96 branches 267 tags 295 MiB
Commit graph

12647 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 9ad73ed09a Bump docker/login-action from 2 to 3 (#13619) 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:13:09 +01:00
snipe 68fa6d57ca
Merge pull request #13613 from snipe/features/reorder_columns 
Added column re-ordering
 2023-09-18 22:10:09 +01:00
snipe f14e3422b4 Made develop the target branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:09:43 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 21:53:34 +01:00
snipe 8bdecb1da9 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-09-15 20:32:05 +01:00
snipe 52f9c786be
Merge pull request #13612 from snipe/fixes/re_add_sticky_header 
Fixed regression that disabled sticky headers
 2023-09-15 20:29:24 +01:00
snipe 3ba8b60f54 Fixed regression that disabled sticky headers 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 20:28:28 +01:00
snipe 341f711385 Merge remote-tracking branch 'origin/develop' 2023-09-15 15:43:48 +01:00
snipe eb406547c4
Merge pull request #13610 from snipe/fixes/disallow_sorting_on_age 
Fixes #13609 - disallow sorting on age
 2023-09-15 15:26:55 +01:00
snipe 0b562d2f55 Fixes #13609 - disallow sorting on age 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 15:25:52 +01:00
snipe 131ccaa5b9
Merge pull request #12869 from Godmartinz/bug/sc-23134 
Fixed footer sizing issue
 2023-09-15 14:31:07 +01:00
snipe 9bd357e2d4 Merge remote-tracking branch 'origin/develop' 2023-09-15 12:52:59 +01:00
snipe 054d8763fb
Merge pull request #13608 from snipe/bug/sc-15287 
Use relative path in backups for cleaner directory structure
 2023-09-15 12:51:49 +01:00
snipe 52a77f4c31 Use relative path in backups for cleaner directory structure 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 12:50:00 +01:00
snipe cce90c6ce0 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-09-15 09:43:25 +01:00
snipe 4e0e1a2c85 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 09:42:27 +01:00
snipe 8a8afef81b
Merge pull request #13606 from snipe/feature/sc-23705 
Fixed #13592 - unable to delete model from view page
 2023-09-15 01:11:49 +01:00
snipe 860e7791ff Fixed #13592 - unable to delete model from view page 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 23:35:44 +01:00
snipe 20da6cccbc Merge remote-tracking branch 'origin/develop' 2023-09-14 22:57:04 +01:00
snipe a013ddf541
Merge pull request #13605 from snipe/bug/sc-23183 
Simplify upload messaging, handle -1% error
 2023-09-14 22:52:31 +01:00
spencerrlongg 1cfd7673e0 change Importer.php back 2023-09-14 16:11:24 -05:00
snipe bbe7d9dde2 Removed stray space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:53 +01:00
snipe 932c02cc54 Typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:30 +01:00
snipe 84b0ff76ed Revert large warning size 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:06:19 +01:00
snipe 273740b8f5 Fixed import error warning 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:04:23 +01:00
spencerrlongg afe9d43139 chunk by id? 2023-09-14 16:00:35 -05:00
snipe 34c3174531
Merge pull request #13604 from marcusmoore/feature/sc-23714 
Removed ChipperCI integration
 2023-09-14 21:48:49 +01:00
spencerrlongg aac627592b move logic inside of try 2023-09-14 15:43:00 -05:00
spencerrlongg f35f9f922e safety & catch & log 2023-09-14 15:32:17 -05:00
snipe 8f4ca9da57 Simplify upload messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 21:20:21 +01:00
Marcus Moore b113411891 Remove ChipperCI 2023-09-14 13:00:38 -07:00
spencerrlongg 44441ec703 up chunk size 2023-09-14 14:25:02 -05:00
snipe 15c71439b6
Merge pull request #13602 from snipe/bug/sc-23685 
Fixed checkbox formatting on quickstart
 2023-09-14 18:48:50 +01:00
snipe 8e41fb7b36 Removed stray text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:48:20 +01:00
snipe d0c4910a51 Fixed checkbox formatting on quickstart 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 18:44:02 +01:00
snipe 467609e561 Merge remote-tracking branch 'origin/develop' 2023-09-14 14:32:06 +01:00
snipe 2166d6649d
Merge pull request #13343 from snipe/fixes/re-scramble_password_if_ldap_pw_sync_not_enabled 
Fixed #13336 - Save unhashed password if no password provided
 2023-09-14 14:15:53 +01:00
snipe dcae5503c8 Use $attributes array 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 13:52:57 +01:00
snipe d916e20c10
Merge pull request #13415 from marcusmoore/feature/department-scoping 
Added `CompanyableTrait` to `Department` model
 2023-09-14 12:52:53 +01:00
snipe b92327eb40
Merge pull request #13520 from inietov/fixes/licenses_reassignable_feature 
Fixed Not reassignable Licenses shouldn't show 'Checkin All Seats' button [sc-23506]
 2023-09-14 12:52:13 +01:00
snipe c7b24821b3
Merge pull request #13549 from inietov/fixes/attempt_to_read_property_id_on_null 
Fixed ErrorException: Attempt to read property "id" on null (rollbar #3541)
 2023-09-14 12:50:54 +01:00
snipe a37df8ce9d
Merge pull request #13581 from snipe/updates/upgrade_checkout_actions 
Upgraded actions/checkout to v4 (via #13580)
 2023-09-14 12:40:34 +01:00
snipe 104219ed76
Merge pull request #13597 from marcusmoore/bug/sc-23681 
Reset checkout to value when navigating away from type
 2023-09-14 12:39:04 +01:00
snipe 56c7da7b06
Merge pull request #13595 from Godmartinz/correct-nullable_on_asset_model_min_qty 
Fixed nullability on asset model `min qty` column
 2023-09-14 08:52:33 +01:00
spencerrlongg 7c9a4ac161 immutable 2023-09-13 18:15:13 -05:00
spencerrlongg 64a9859efd cleanup 2023-09-13 17:58:33 -05:00
spencerrlongg ef64843d2f chunk migration, needs to be tested 2023-09-13 17:41:45 -05:00
Ivan Nieto Vivanco 439e031911 Evaluate if the event properties exists before run the CheckoutAcceptance query 2023-09-13 16:35:10 -06:00
spencerrlongg 0368b9df43 viola 2023-09-13 17:16:17 -05:00
Marcus Moore 74c7f106ce Reset assigned_x values when changing check out to type 2023-09-13 13:43:35 -07:00