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
11503 commits 101 branches 268 tags 320 MiB
Commit graph

11503 commits

This branch
This branch
All branches
Author SHA1 Message Date
spencerrlongg a54fab5c33 add fieldset to allowed_columns 2023-09-28 13:02:12 -05:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
snipe 7512400b56
Merge pull request #13672 from snipe/feature/sc-23772 
Fixed #13662 - added clipboard.js
 2023-09-28 15:13:42 +01:00
snipe 1acb14a39f Moved dragtable css 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:12:44 +01:00
snipe bb7a41628a Fixed #13662 - added clipboard.js 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:06:55 +01:00
snipe 402ff58628
Merge pull request #13671 from snipe/bug/sc-23773 
Fixed #13670 - order number missing from license import
 2023-09-28 14:24:49 +01:00
snipe 492fb15036 Fixed #13670 - order number missing from license import 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 14:24:07 +01:00
snipe cc4cb14e9d
Merge pull request #13667 from snipe/bug/sc-23771 
Fixed #13658 for asset history with encrypted fields
 2023-09-28 03:29:06 +01:00
snipe ee72c92d4f Fix for asset history with enfrypted fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 03:00:49 +01:00
snipe 048ad57418
Merge pull request #13657 from snipe/fixes/revert_column_sorting_temp 
Commented out sortable columns
 2023-09-26 15:25:58 +01:00
snipe 7bcb28d8fd Commented out sortable columns 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 15:24:20 +01:00
snipe 660abeca9e
Merge pull request #13638 from marcusmoore/bug/sc-20704 
Fixed exception being thrown when selected import was deleted
 2023-09-26 15:00:35 +01:00
snipe 1509339b68
Merge pull request #13655 from snipe/bug/sc-23759 
Fixed bug where checkout to location would throw an error if FMCS was enabled
 2023-09-26 14:37:36 +01:00
snipe 81ae32d3f9 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 14:33:51 +01:00
snipe 279e6c7e4f Check for null company ID 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-26 14:33:42 +01:00
snipe 81a982fd77
Merge pull request #13650 from snipe/features/more_info_in_settings 
Features/more info in settings
 2023-09-25 13:46:00 +01:00
snipe 619712b927 Fixed table 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:45:46 +01:00
snipe 359cd2a267 A few more config options 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 13:28:13 +01:00
snipe f6317695f9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:58:14 +01:00
snipe e4696138ba
Merge pull request #13647 from snipe/localization/new_translations 
Localization/new translations
 2023-09-25 10:57:02 +01:00
snipe bd0863d9c7 Added new translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:54:46 +01:00
snipe 28cd0085b7 Added Khmer as an available language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:54:32 +01:00
snipe 456d55c3bd Added some mail settings to /settings for easier reference 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-21 16:14:47 +01:00
Marcus Moore 5a88a64ebd Remove unnecessary redirect 2023-09-20 17:35:34 -07:00
Marcus Moore b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
snipe 7c908fecd9
Merge pull request #12992 from spencerrlongg/features/12853 
Adds tag for docker builds
 2023-09-20 19:36:22 +01:00
snipe cdd0de15b5
Merge pull request #13634 from marcusmoore/chore/add-factories-to-autolabeler 
Added factories to autolabeler action
 2023-09-20 17:51:34 +01:00
snipe 46981da400
Merge pull request #13635 from marcusmoore/bug/sc-23715 
Added unique() to some factory properties
 2023-09-20 17:51:22 +01:00
Marcus Moore 90e75a3e2c Add unique() to some factory properties 2023-09-19 17:02:18 -07:00
Marcus Moore cd538a4ad8 Add factories to autolabeler action 2023-09-19 16:07:26 -07: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 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 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 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 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 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