DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
11665 commits 102 branches 268 tags 288 MiB
Commit graph

11665 commits

This branch
This branch
All branches
Author SHA1 Message Date
Godfrey M f8730adb11 removed unnecessary changes 2023-09-28 11:41:43 -07:00
Godfrey M c21586dee5 adds better error messaging 2023-09-28 11:29:46 -07:00
snipe f16e81e0e8
Merge pull request #13678 from spencerrlongg/bug/sc-23596 
Fieldset Properly Sortable in Asset Models Table
 2023-09-28 19:24:04 +01:00
snipe 3b4004ac18
Merge pull request #13677 from snipe/feature/sc-14880 
Set modal focus to modal-name field
 2023-09-28 19:18:16 +01:00
snipe 0bf423cda9 Set modal focus to modal-name field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 19:16:40 +01:00
spencerrlongg a54fab5c33 add fieldset to allowed_columns 2023-09-28 13:02:12 -05:00
snipe 96c6c93197
Merge pull request #13674 from snipe/bug/sc-23774 
Fixed bug where license checkout/checkin notes were not being saved
 2023-09-28 18:37:47 +01:00
spencerrlongg 4d67c72eea scope and switch case in api 2023-09-28 12:26:23 -05:00
snipe 6fa0d42bc2 Fixed bug where license checkout/checkin notes were not being saved 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 15:40:18 +01: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
Godfrey M b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07:00
spencerrlongg 4660a2e5b7 rm more duplicate 2023-09-20 14:37:32 -05:00
spencerrlongg a9123754f5 remove unnecessary code 2023-09-20 14:34:42 -05:00
spencerrlongg cbef531811 parse purchase date even though it's cast 2023-09-20 14:26:49 -05:00
spencerrlongg 7dab59c98d fix for no eol, fix for optional in view 2023-09-20 14:17:30 -05:00
spencerrlongg c48a47936c add validation back in 2023-09-20 14:00:59 -05: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
Godfrey M 66abf8d5c0 redoing logic 2023-09-19 17:46:29 -07:00
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