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

13742 commits

This branch
This branch
All branches
Author SHA1 Message Date
Marcus Moore 6b105ba8f0
Move link 2024-01-08 14:17:42 -08:00
Marcus Moore 348ed1e555
Add link to contributors file 2024-01-08 14:16:15 -08:00
Marcus Moore 8314047bfb
Add newline to start of contributors file 2024-01-08 14:02:09 -08:00
Marcus Moore 1bd4b3827d
Add missing comma 2024-01-08 13:47:43 -08:00
Marcus Moore a2463c2a71
Reference correct file 2024-01-08 13:43:26 -08:00
Marcus Moore f4d568bf89
Add missing config key 2024-01-08 13:40:57 -08:00
Marcus Moore eb862c27b8
Add config keys 2024-01-08 13:31:30 -08:00
Marcus Moore 18f79ad924
Move contributors from readme to dedicated files 2024-01-08 13:29:18 -08:00
Marcus Moore afb396ed65
Add contributor commands to package.json 2024-01-08 13:26:58 -08:00
Marcus Moore 8ea15fc6aa
Run generate command to migrate to new style 
(from markdown style tables and images to html style)

./node_modules/.bin/all-contributors generate
 2024-01-08 12:42:45 -08:00
Marcus Moore 064ec1c22d
Add missing markers 2024-01-08 12:39:40 -08:00
Marcus Moore 2f47217003
Add all-contributors-cli as dev dependency 2024-01-08 12:26:52 -08:00
Jermops 25c9f8e038
Merge pull request #14105 from snipe/jerm/snipeit-sh 
Update snipeit.sh for v7 Requirements
 2024-01-08 11:48:21 -08:00
Jeremy Price a3811371cc remove removal of installation scripts 2024-01-08 11:41:30 -08:00
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
Jeremy Price 6129f4722f Oops! Don't checkout my custom branch 
using master until we make the switch to main. As master will keep
working after we switch branches, main will _not_ work _until_ we switch, and if
for some reason we have to delay the branch migration, this will remain
broken until we fix it.
 2024-01-08 10:08:52 -08:00
snipe d71a04e489 Merge remote-tracking branch 'origin/develop' 2024-01-08 17:24:47 +00:00
snipe 4f8defb67d
Merge pull request #14107 from snipe/bug/sc-24471 
Check that the asset exists before trying to get properties
 2024-01-08 12:43:13 +00:00
snipe 2707c399ea Check that the asset exists before trying to get properties 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-08 12:42:05 +00:00
Jeremy Price 585d7d0b87 replace some tabs with spaces. don't @ me 2024-01-05 12:09:03 -08:00
snipe 012fe57ca1 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 15:16:14 +00:00
snipe f5960388f1 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2024-01-05 15:05:22 +00:00
snipe 6ebbd2dc30
Merge pull request #14104 from snipe/feature/google_login_more_prominent 
Move Google Login prompt higher, made it bigger
 2024-01-05 15:03:12 +00:00
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
snipe 93712ec417
Merge pull request #14103 from snipe/bug/user_api_limit_offset_order 
Moved limit and offset in user API to after additional qualifiers
 2024-01-05 12:02:18 +00:00
snipe f8a21bdb2d Moved limit and offset to after additional qualifiers 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 11:59:31 +00:00
Jeremy Price cdfc198f28 update changelog 2024-01-05 00:09:06 -08:00
Jeremy Price 6fcb3d3d5e re-add missing progress bar to ensure correct command ordering 2024-01-05 00:09:06 -08:00
Jeremy Price 358d9ec06d fix enterprise linux version in remi repo for v9 distros 2024-01-05 00:09:06 -08:00
Jeremy Price 322c8c1cf3 install php-sodium on al2. fix snipeit database name 2024-01-05 00:09:06 -08:00
Jeremy Price 47eb0c34a2 remove fedora surpport, add amazon and alma 2024-01-05 00:09:06 -08:00
Jeremy Price 4a290a85e6 awsl2 support, php8.2 support in centos/alma, new mysql user creation code 2024-01-05 00:09:06 -08:00
Jeremy Price 5489c50cc0 remove remaining 8.2 references in Ubuntu 23* block 
different vim config confusion made my regex misbehave :-/
 2024-01-05 00:09:06 -08:00
Jeremy Price 066e40dada update Ubuntu versions comment in code block 2024-01-05 00:09:06 -08:00
Jeremy Price 123d04ff7b split-out ubuntu 23* versions 
since 2023 didn't produce and LTS ubuntu versions

the Ondrej repo we use for installing arbitrary PHP versions doesn't
(easily) support non-LTS versions of ubuntu, which means that 23.04 and
23.10 are problematic using the repo

However, these versions ship with  php8.1 and php8.2 (respectively), so
we don't even need the Ondrej repo for these, so we'll remove it

In general, we'll only support LTS Ubuntu repos because of this, but if
they happen to ship with our preferred PHP versions and otherwise work
w/o heroics, we'll include nominal support in the script
 2024-01-05 00:09:06 -08:00
Jeremy Price d5881736cf stop quoting run_as_app_user args 
because "$@" splits positional parameters, but quoting the args makes
them one arg, which doesn't work
 2024-01-05 00:09:06 -08:00
Jeremy Price 5e539da3da Debian 12 2024-01-05 00:09:06 -08:00
Jeremy Price ba58ca9d5c fix up ondrej repo 2024-01-05 00:09:06 -08:00
Jeremy Price 117007dfa1 add new ubuntu/debian versions, change php to 8.2 2024-01-05 00:09:06 -08:00
snipe 10ef47fe87 Merge remote-tracking branch 'origin/develop' 2024-01-04 23:37:36 +00:00
snipe d29b3633d1
Merge pull request #14063 from marcusmoore/chore/sc-24353 
Removed unused files in assets directory
 2024-01-04 22:41:49 +00:00
snipe 98ef687e9c
Merge pull request #14090 from marcusmoore/chore/sc-24386 
Run sqlite tests in GitHub action
 2024-01-04 22:41:37 +00:00
snipe 432f05586e
Merge pull request #14100 from Godmartinz/fix-license-seat-department-link 
fixed `departmentNameLinkFormatter` url
 2024-01-04 22:40:24 +00:00
snipe dbcf7e3fd1
Merge pull request #14101 from marcusmoore/bug/sc-24398 
Fixes creating invalid query with null values
 2024-01-04 22:36:46 +00:00
Godfrey M 43737263d4 removed that clause 2024-01-04 14:32:03 -08:00
Godfrey M 07eeaea3bf adds an additional clause 2024-01-04 14:30:59 -08:00
Godfrey M 249ff868e5 removes empty seats when sorting by department 2024-01-04 14:26:07 -08:00
Marcus Moore 742e183b02
Add guard against adding null values to query 
Since $request->filled(null) returns true
 2024-01-04 14:04:00 -08:00
Godfrey M a110b5fcca ugh 2024-01-04 12:37:53 -08:00
Godfrey M 1f1e58eb1e remove unintentional change 2024-01-04 12:36:57 -08:00