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

14172 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Godfrey M 32b34ca9b9 departmentNameLinkFormatter had a bad url 2024-01-04 12:33:33 -08:00
snipe 3a6d626aa1 Merge remote-tracking branch 'origin/develop' 2024-01-04 00:36:50 +00:00
snipe 0c6611d6bd
Merge pull request #14097 from spencerrlongg/hotfix/migration_model_issue 
Use Query Builder instead of Model for Update to Skip Observer
 2024-01-04 00:36:30 +00:00
spencerrlongg 0d853f931d use query builder instead of model for update to skip observer 2024-01-03 18:32:13 -06:00
snipe c8816354ae Updated assets for master 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:28:54 +00:00
snipe 42d35174b2 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:25:56 +00:00
snipe 00718d7a4b
Merge pull request #14096 from snipe/security/snyk_14075 
Upgrade jspdf-autotable from 3.5.31 to 3.8.0
 2024-01-03 23:23:10 +00:00
snipe ab32c42ac8 Upgrade jspdf-autotable from 3.5.31 to 3.8.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:21:27 +00:00
snipe bbdc8383e1 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:17:44 +00:00
snipe e711d68de1
Merge pull request #14095 from snipe/security/snyk_14066_Upgrade_fortawesome/fontawesome-free 
Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0
 2024-01-03 23:16:39 +00:00
snipe b29df4a610 Upgrade @fortawesome/fontawesome-free from 6.4.0 to 6.5.0 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:15:49 +00:00
snipe 93273d301a
Merge pull request #14094 from snipe/localizations/updated_strings 
Updated language strings
 2024-01-03 23:13:15 +00:00
snipe 50eb257cec Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:12:29 +00:00
snipe b23ce6cfc6
Merge pull request #14093 from marcusmoore/bug/sc-24389 
Fixes language source directory for crowdin
 2024-01-03 22:11:20 +00:00
Marcus Moore 08c16b4435
Fix language source directory 2024-01-03 14:02:36 -08:00
snipe 0d697629aa
Merge pull request #14092 from marcusmoore/chore/sc-24383 
Syncs readme to DockerHub description
 2024-01-03 21:36:34 +00:00
Marcus Moore 1f7e7b20e9
Sync readme to dockerhub 2024-01-03 13:26:49 -08:00
Marcus Moore 4894f524a0
Update action name 2024-01-03 12:30:10 -08:00
Marcus Moore f819e1469a
Run sqlite tests in GitHub action 2024-01-03 12:27:13 -08:00
snipe cce9540316
Merge pull request #13964 from spencerrlongg/refactor/store_asset_form_request 
Tests For API Asset Store + Refactor For Auto Increment & Form Requests
 2024-01-03 19:26:11 +00:00