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

14075 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe eb33a2451f Updated config 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:36:52 +01:00
snipe 891a0a0965 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2024-06-17 13:05:31 +01:00
snipe 50f0797850 Added aria hidden to icon 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:05:27 +01:00
snipe 36cdf0e0be
Merge pull request #14876 from snipe/fixes/small_footer_issues 
Fixed small footer issues
 2024-06-17 12:53:52 +01:00
snipe d9cc3c3ec7 Removed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:52:23 +01:00
snipe 069a1608de Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-17 12:10:13 +01:00
snipe 60accfd601 Bumped version file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:09:30 +01:00
snipe b1f2051b43 Merge remote-tracking branch 'origin/develop' 2024-06-17 11:58:11 +01:00
snipe 233e4af7f8 Added base asset models test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:57:30 +01:00
snipe dc1b808a28 Fixed static request 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:47:21 +01:00
snipe 91a423e60e Bumped php max version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:27:55 +01:00
snipe bd03a6d206 Production assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 11:18:44 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe f3e82c2c80 Updated languages 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:59:17 +01:00
snipe 569f05a99e Built prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:45:04 +01:00
snipe ece7c22df9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:44:20 +01:00
snipe 4eefd39172 Bumped requirements 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:42:59 +01:00
snipe daae5d6859
Merge pull request #14724 from phil-flip/develop 
Added Proper Docker Compose and .env.docker-setup files
 2024-06-16 15:49:15 +01:00
snipe df76769a29
Merge pull request #14871 from marcusmoore/chore/move-test 
Moved `AssetFilesTest`
 2024-06-13 23:10:36 +01:00
Marcus Moore fe72639925
Move AssetFilesTest 2024-06-13 14:25:25 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +01:00
snipe a8b47a55bc
Merge pull request #14801 from snipe/fixes/companyable_trait_on_users 
Allow CompanyableTrait trait on users
 2024-06-12 12:42:56 +01:00
snipe 3159fdec9f FFS 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 12:40:43 +01:00
snipe ea990a5381 Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 12:31:41 +01:00
snipe 134183ef16 Shuffled tests around again 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 12:12:15 +01:00
snipe 67ab2536bc Updated test names 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 12:03:33 +01:00
snipe 756a2ac25c Added API tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 11:58:12 +01:00
snipe acaceb4103 Moved tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-12 11:57:50 +01:00
snipe 7e3d66ec53
Merge branch 'develop' into fixes/companyable_trait_on_users 2024-06-12 11:27:26 +01:00
snipe 1ca9bb5aa8
Merge pull request #14698 from Scarzy/features/asset_file_upload_from_api 
Added #9413: Asset file upload from API
 2024-06-12 11:18:06 +01:00
snipe c641b733e1
Merge pull request #14834 from bryanlopezinc/AddAppUrlTest 
Added test for app url config
 2024-06-12 11:14:17 +01:00
snipe 16cf6bc852
Merge pull request #14843 from marcusmoore/chore/sc-25767 
Added GitHub workflow for tests in Postgres
 2024-06-12 09:53:55 +01:00
Marcus Moore 5c0ca92fd7
Switch to using workflow_dispatch for PostgreSQL tests 2024-06-10 10:24:10 -07:00
snipe 241e9bc253
Merge pull request #14847 from uberbrady/users_index_api_optimization 
Optimization for listings of large numbers of users
 2024-06-10 13:57:49 +01:00
Brady Wetherington c8820adb56 Add two new 'with()' relationships to Users API index query 2024-06-10 13:29:53 +01:00
snipe 0f4c6dd5b0
Merge pull request #14830 from snipe/chore/sc-25756/better_validation_for_relations_on_delete 
Better validation for relations on delete
 2024-06-07 18:10:41 +01:00
snipe f8ab9f62f6
Merge pull request #14842 from Godmartinz/adjust-preview-window 
Fixed label preview window position
 2024-06-07 18:09:56 +01:00
Phil 217ed03b8e
add DB_PORT 2024-06-07 12:04:10 +02:00
Godfrey M 77e6058e4c remembers chosen label 2024-06-06 13:55:15 -07:00
Godfrey M 4a60026162 moves preview down by field definitions 2024-06-06 13:42:06 -07:00
Godfrey M 3621292a0e removes unnecessary height 2024-06-06 13:28:05 -07:00
Marcus Moore 6c296ccf8e
Use "postgres" instead of "postgres:14" 2024-06-06 13:27:39 -07:00
Godfrey M 6df1c36011 oops 2024-06-06 13:24:02 -07:00
Marcus Moore 924da00f3e
Add Postgres GitHub workflow for tests 2024-06-06 13:21:00 -07:00
Godfrey M 44dae22a3c adjust label preview window 2024-06-06 13:18:19 -07:00
bryanlopezinc d35e251d6e Added test for app url config 2024-06-05 21:46:43 +01:00
snipe e19d2d6ec9
Merge pull request #14832 from snipe/fixes/added_consumables_to_inventory_email 
Fixed #14812 - added consumables to individual inventory report
 2024-06-05 20:42:35 +01:00
snipe 871255f28c Fixed #14812 - added consumables to individual inventory report 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 20:40:45 +01:00
snipe 7ac315e1eb Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 14:50:45 +01:00
snipe 374c6845d6 Added test if user has assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 14:16:28 +01:00