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

626 commits

Author SHA1 Message Date
snipe a6d04509a5
Merge pull request #15016 from snipe/improved_user_merge 
Fixed #15005 - Improvements  on user merge
 2024-07-03 23:19:50 +01:00
snipe 9f1e59cf78 Marcus’ nitpicks 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 23:01:41 +01:00
snipe 5e15cc3bbe Added markIncompleteIfSqlite() method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 22:18:31 +01:00
snipe 17a6335d13 Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 22:12:06 +01:00
snipe 9211c8d3b1 Fixed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:57:21 +01:00
snipe eff1980df5 Added console test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:52:22 +01:00
snipe dab4aced48 Renamed test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:50:09 +01:00
snipe 1774952312 Added additional assertions 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 20:19:12 +01:00
snipe 5488a4d118 One more test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:36:27 +01:00
snipe ceaff7b645 Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-03 14:30:11 +01:00
snipe 7dbcedad40
Merge pull request #14981 from uberbrady/fix_backup_translations 
Fixed #14976, #14975, #14973 - Translation strings aren't always working
 2024-06-27 14:36:52 +01:00
snipe 85ce47f5bb Updated tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-27 14:21:27 +01:00
Brady Wetherington 6df9742664 Built a workaround for backup notification translations 2024-06-27 13:17:16 +01:00
Marcus Moore d4861a74df
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-25 10:15:50 -07:00
snipe c1be94c4ad Added another base test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:37:49 +01:00
snipe 3a05d72124 Based restore API test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:35:40 +01:00
snipe 060b17df01 Pulled duplicated test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:34:49 +01:00
snipe 74c78d7577 Added back in commented out test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:09:04 +01:00
snipe 1ef0c1adac Fixed tests! And added more!! 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 20:07:46 +01:00
snipe 9f5b264e04 Normalize the tests between UI and API 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:51:56 +01:00
snipe 3825f5fb61 Added more permissions tests to user delete UI 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:47:59 +01:00
snipe 5ec8e2da66 Breaking tests :( 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 19:33:44 +01:00
snipe 61f76dedc6 Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:36:08 +01:00
snipe 06737f45ad Added test 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 18:36:02 +01:00
snipe 65e8765bdd Added tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-22 17:45:42 +01:00
snipe c8835bf5db Merge remote-tracking branch 'origin/develop' 2024-06-20 13:40:37 +01:00
bryanlopezinc 203b60383f Added storage path permissions test for SettingsController@getSetupIndex 2024-06-19 17:46:59 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe 05b97db747 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-18 09:32:30 +01:00
snipe f53eeb8b33
Merge pull request #14887 from marcusmoore/fixes/fix-test-namespace 
Fixed namespace for ViewUserTest
 2024-06-18 09:20:58 +01:00
Marcus Moore 4f2d2ae4b8
Fix namespace for ViewUserTest 2024-06-17 16:37:24 -07:00
Marcus Moore 672aabf4ac
Add more tests for Asset Model index and store methods 2024-06-17 14:51:59 -07:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07: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 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
Marcus Moore fe72639925
Move AssetFilesTest 2024-06-13 14:25:25 -07:00
Marcus Moore c3e6e1144f
Merge branch 'develop' into chore/sc-23725/livewire3 2024-06-12 15:12:40 -07:00
snipe cacb5d62dc
Merge pull request #14800 from snipe/fixes/importer_tweaks 
Importer tweaks
 2024-06-12 12:51:11 +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
bryanlopezinc d35e251d6e Added test for app url config 2024-06-05 21:46:43 +01:00
snipe 7ac315e1eb Fixed tests 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-05 14:50:45 +01:00