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

14380 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 1dfa1da0ee Disable the edit button if permission is not allowed 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 10:14:10 +00:00
snipe 71ebade641 Added serial and status to searchable relations 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:59:10 +00:00
snipe b86b05c4fc Added serial and status fields to presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:55 +00:00
snipe 35a70988cb Added sorting by status label 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:39 +00:00
snipe 56ba26eb45 Disallow editing of deleted assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:58:07 +00:00
snipe adb8be9345 Added bootstrap formatting to show deleted assets more clearly 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:57:57 +00:00
snipe abc9ee22c6 Added serial and status to transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:48:02 +00:00
snipe e5ee9760c0 I don’t think we use these anyore because of the modifiers on date 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:33 +00:00
snipe 7868a8c174 Added serial for API controller 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:47:13 +00:00
snipe 03df4cec45 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-14 09:46:43 +00:00
spencerrlongg 25241542d2 progress, going to sleep 2024-02-14 02:12:31 -06:00
spencerrlongg 57a75e68b9 maybe i do the inverse here? 2024-02-14 00:52:50 -06:00
Marcus Moore ad1846fed6
Implement tests 2024-02-13 17:50:26 -08:00
spencerrlongg dcf2168454 initial stuff, need to switch branches 2024-02-13 19:35:37 -06:00
Marcus Moore 9ab56fe9ca
Implement tests 2024-02-13 17:04:53 -08:00
Marcus Moore f708b8b299
Implement test 2024-02-13 14:30:26 -08:00
akemidx c5e8d1c276 custom report tinker 2024-02-13 17:09:51 -05:00
akemidx 4093327b7f adding in Last Checkin Date to Hardware view and index 2024-02-13 16:52:12 -05:00
Marcus Moore 391b832613
Implement test 2024-02-13 13:34:55 -08:00
Marcus Moore b653d19579
Implement test 2024-02-13 13:29:54 -08:00
akemidx 4a57cfaf3e commenting out the nulling of last checkout date on checkin page and API 2024-02-13 16:21:18 -05:00
Marcus Moore 31a75bd252
Add some assertions 2024-02-13 13:17:02 -08:00
snipe e2c3386c33 Merge remote-tracking branch 'origin/develop' 2024-02-13 20:37:17 +00:00
Marcus Moore 0506f3bef9
Scaffold additional tests 2024-02-13 12:35:31 -08:00
snipe a866d6b16e
Merge pull request #14261 from snipe/fixed/missing_location_string 
Fixed incorrect string for location not existing
 2024-02-13 20:29:32 +00:00
snipe a76a69d085 Fixed incorrect string for location not existing 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-13 20:23:32 +00:00
Marcus Moore 852b0b3f11
Scaffold additional tests 2024-02-13 12:15:59 -08:00
Marcus Moore 307b39bd38
Implement tests around asset check in 2024-02-13 12:03:27 -08:00
spencerrlongg d55358652b cleanup for pr 2024-02-13 13:45:56 -06:00
Brady Wetherington 955f75f733 Fixes for the prefix-guessing and sanitizing. 2024-02-13 16:45:24 +00:00
snipe 280e778749 Merge remote-tracking branch 'origin/develop' 2024-02-13 13:46:52 +00:00
snipe 60ba898167
Merge pull request #14255 from marcusmoore/chore/sc-24805 
Added LDAP group tag to LDAP tests
 2024-02-13 13:42:51 +00:00
snipe 2c9d5b9ea3
Merge pull request #14247 from ubc-cpsc/bugfix/CVE-2023-37260 
Fixes CVE-2023-37260 upgrading league/oauth2-server
 2024-02-13 13:40:53 +00:00
snipe eb6e2636b5
Merge pull request #14246 from ubc-cpsc/bugfix/CVE-2022-24894 
Fixes CVE-2022-24894 by upgrading symfony/http-kernel
 2024-02-13 13:40:33 +00:00
snipe 4c1964d509
Merge pull request #14245 from ubc-cpsc/bugfix/CVE-2024-24821 
Fixes CVE-2024-24821 by upgrading composer/composer
 2024-02-13 13:39:16 +00:00
snipe 7547277352
Merge pull request #14236 from snipe/jerm/upgrade-script-enhancements 
Change how we check forward-looking upgrade requirements
 2024-02-13 13:38:35 +00:00
snipe 3e00bc49fd
Merge pull request #14250 from mauro-miatello/develop 
Cleaned up navbar-custom-menu
 2024-02-13 13:33:03 +00:00
snipe 99e0b65de7
Merge pull request #14256 from marcusmoore/bug/sc-24790 
Fixed accessory check in emails being sent when setting disabled
 2024-02-13 13:32:42 +00:00
Brady Wetherington 70ef904951 Actually got this pretty close to being able to do a restore 2024-02-13 12:16:15 +00:00
Brady Wetherington fcf023e3d2 WIP: trying to get prefixing and sanitization working 2024-02-13 12:16:15 +00:00
Brady Wetherington 8c882ddead Starting to abstract out the SQL Streaming logic into its own class 2024-02-13 12:16:15 +00:00
Brady Wetherington 7d136f9970 Initial rough stabs at prefix removal and SQL sanitization 2024-02-13 12:16:15 +00:00
Jeremy Price f4c1460c2b remove help text options until i put together the help text 2024-02-12 19:18:26 -08:00
Jeremy Price bb2e1de0a8 Change how we check forward-looking upgrade requirements 
In https://github.com/snipe/snipe-it/pull/14128 we added the capability
for the upgrade.php script to check version requirements _before_
downloading the new source, to help keep from breaking installations.

Turns out, `file_get_contents()` isn't a reliable way to grab a url, because
some systems have `allow_url_fopen` turned off in their PHP
configurations.

In this iteration, we swap that out for a curl function, while also
adding more error handling, the ability to entirely skip the
PHP version checks if for some reason you Just Can't query the upgrade
json correctly, as well as adding a lot of helpful text around the whole
issue.

Additionally, I've added some error checking around DB backups and
initial artisan down-ing, since shell_exec would happily march right
past any errors.
 2024-02-12 19:18:26 -08:00
Marcus Moore c81bc1d2ee
Scaffold tests around asset check in 2024-02-12 17:54:22 -08:00
Marcus Moore 7154d23759
Pass the correct variable to the route helper 2024-02-12 16:45:18 -08:00
Marcus Moore df23fd0dee
Remove usused import 2024-02-12 16:35:54 -08:00
Marcus Moore adfb8895df
Improve factory state name 2024-02-12 16:31:32 -08:00
Marcus Moore c8e12ddb5c
Remove bug in factory state 2024-02-12 16:30:09 -08:00
Marcus Moore 5b181ecea7
Remove old comment 2024-02-12 16:29:34 -08:00