DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-17 11:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
13119 commits 96 branches 267 tags 296 MiB
Commit graph

13119 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg 2ace24b176 csv header 2023-09-19 19:38:59 -05:00
spencerrlongg d65d1930e4 asset models 2023-09-19 19:24:53 -05:00
Marcus Moore 90e75a3e2c Add unique() to some factory properties 2023-09-19 17:02:18 -07:00
spencerrlongg 2d59517c35 rm !empty 2023-09-19 18:40:23 -05:00
spencerrlongg 3cb906a05f pushing to switch branches and test 2023-09-19 18:23:06 -05:00
Marcus Moore cd538a4ad8 Add factories to autolabeler action 2023-09-19 16:07:26 -07:00
spencerrlongg 6b4f8f1813 rm duplicate fillable 2023-09-19 18:07:15 -05:00
spencerrlongg 929e107a20 rm byod from casts 2023-09-19 18:04:16 -05:00
snipe 5a5b07f5a5 Merge remote-tracking branch 'origin/develop' 2023-09-19 10:22:59 +01:00
snipe 439c2e095d
Merge pull request #13629 from snipe/bug/sc-23745 
Fixed #13628 - removed duplicate favicon tag
 2023-09-19 10:22:36 +01:00
snipe 14c0517927 Fixed #13628 - removed duplicate favicon tag 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-19 10:21:38 +01:00
snipe d84d26febf Merge remote-tracking branch 'origin/develop' 2023-09-18 22:31:41 +01:00
snipe 753a5f789e
Merge pull request #13623 from snipe/fixes/dependabot_target 
Made develop the target branch for dependabot
 2023-09-18 22:31:11 +01:00
snipe d7790cd16b Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:24:15 +01:00
snipe 8ecc0651ed Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2023-09-18 22:23:58 +01:00
snipe a8b2089275
Merge pull request #13627 from snipe/fixes/dependabot_13616 
Replaces #13616 - Bump docker/metadata-action from 4 to 5
 2023-09-18 22:20:06 +01:00
snipe a46a11d554 Replaces #13616 - Bump docker/metadata-action from 4 to 5 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:19:31 +01:00
snipe d444b620c5
Merge pull request #13626 from snipe/fixes/dependabot_13617 
Replaces #13617 - Bump docker/setup-buildx-action from 2 to 3
 2023-09-18 22:18:04 +01:00
snipe 10dcd8166b Replaces #13617 - Bump docker/setup-buildx-action from 2 to 3 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:17:24 +01:00
snipe 00df449e0b
Merge pull request #13625 from snipe/fixes/dependabot_13618 
Replaces #13618 - Bump docker/build-push-action from 4 to 5
 2023-09-18 22:16:08 +01:00
snipe 0cb4427a19 Bump docker/build-push-action from 4 to 5 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-18 22:15:18 +01:00
snipe 17fe915d2f
Merge pull request #13624 from snipe/fixes/dependabot_13619 
Bump docker/login-action from 2 to 3 (#13619)
 2023-09-18 22:14:01 +01:00
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