DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
8075 commits 101 branches 268 tags 320 MiB
Commit graph

8075 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe fe3b9f9e86 Added a self-update suggestion in the upgrader 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 19:18:37 -07:00
snipe 0ea6671bfa
Merge pull request #11202 from snipe/fixes/livewire_config 
Starter Livewire config (for subdirectories)
 2022-05-25 17:32:17 -07:00
snipe 9209675d45
Merge pull request #11204 from inietov/fixes/file_uploads_dont_show_in_target_activity_report 
Fixes #11193 File Uploads don't show target in Activity report
 2022-05-25 17:30:01 -07:00
Ivan Nieto Vivanco 3e44f39f4d Set the new File column as not visible by default 2022-05-25 19:19:25 -05:00
Ivan Nieto Vivanco 1f6ab340a6 Give a more descriptive name to variable 2022-05-25 18:53:17 -05:00
Ivan Nieto Vivanco f208869aff Add column to show filenames in Activity Report if the log action is 'uploaded' 2022-05-25 18:50:32 -05:00
snipe c031686825 Fixed path 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:12:38 -07:00
snipe 791c39d977 Starter Livewire config (for subdirectories) 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-25 15:10:20 -07:00
snipe aac432b00c Merge remote-tracking branch 'origin/develop' 2022-05-24 20:53:36 -07:00
snipe 2b5b3273e2 Strip quote marks from env_values 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 20:52:03 -07:00
snipe 4f57eebf24 Merge remote-tracking branch 'origin/develop' 2022-05-24 20:10:13 -07:00
snipe 0c9a1a8922
Merge pull request #11198 from snipe/features/check_for_dev_v_prod_in_updater 
Check for APP_ENV in upgrader
 2022-05-24 20:09:43 -07:00
snipe fa2a3e4b03 Added a line break 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 20:08:04 -07:00
snipe 94a337fc9e Rearrange a few thing 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 20:03:10 -07:00
snipe 8d9cdf9c15 Check for APP_ENV 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 19:56:42 -07:00
snipe fb8d52d599 Merge remote-tracking branch 'origin/develop' 2022-05-24 19:37:34 -07:00
snipe 070c36ffe6
Merge pull request #11197 from uberbrady/improve_ldap_php_81 
Fixes #11119 - Downgraded/Removed log statements
 2022-05-24 19:37:04 -07:00
snipe 5db1c50816
Merge pull request #11196 from snipe/fearures/env_checker_in_upgrader 
Added a simple .env checker into the upgrader
 2022-05-24 19:36:21 -07:00
snipe 43e97ea6ea Make printout more consistent 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 19:36:01 -07:00
Brady Wetherington 8fdedf9441 Downgraded/Removed log statements 2022-05-24 19:30:22 -07:00
snipe b67ed3eac2 Check for present APP_KEY as well 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 19:24:03 -07:00
snipe 116ce931ce Fixed path name to backup temp dir 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 18:44:32 -07:00
snipe 15d0fb4feb Added permissions check 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 18:40:15 -07:00
snipe 132b164a74 Slightly clarified error text 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 17:51:46 -07:00
snipe bdbe2c3ac6 Added a simple .env checker into the upgrader 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 17:43:23 -07:00
snipe 2db6cf85a7 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-05-24 15:10:46 -07:00
snipe 5be7dee3d3 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 15:07:14 -07:00
snipe 72799973e7 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 14:41:44 -07:00
snipe d8a8e03bf6 Nicer styling 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 14:39:01 -07:00
snipe a243823e5e
Merge pull request #11190 from inietov/fixes/requested_assets_models_workflow 
Adjust requested assets and models workflow a little bit.
 2022-05-24 14:31:40 -07:00
Ivan Nieto Vivanco a4cf601c98 Remove extra tag and other stylistic changes 2022-05-24 16:27:55 -05:00
Ivan Nieto Vivanco 1e3c0d597e Use @can view directive instead of @if superadmin 2022-05-24 15:53:26 -05:00
snipe 91822d2e45 Use shorter helper config method 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:26:29 -07:00
snipe 43c5b412ca Merge remote-tracking branch 'origin/develop' 2022-05-24 13:17:39 -07:00
snipe 08ff71aae3
Merge pull request #11192 from snipe/fixes/typo_on_maintenance_screen 
Fixed typo on maintenance screen
 2022-05-24 13:16:50 -07:00
snipe 5d83516659 Fixed typoe on maintenance screen 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:15:01 -07:00
snipe f39005d295 Merge remote-tracking branch 'origin/develop' 2022-05-24 13:13:21 -07:00
snipe 0e6c82776a
Merge pull request #11191 from snipe/fixes/corrected_activated_language_in_bulk_edit 
Updated language strings from activated to able to login
 2022-05-24 13:13:02 -07:00
snipe 67616dbcf4 Updated language strings from activated to able to login 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 13:12:02 -07:00
snipe 5881eef2c6 Merge remote-tracking branch 'origin/develop' 2022-05-24 13:01:16 -07:00
snipe 4839985f38 Added forced space after admin/superadmin badge 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 12:59:36 -07:00
Ivan Nieto Vivanco aa841a4674 Check permission before show links or not in requestable asset models view 2022-05-24 14:40:32 -05:00
Ivan Nieto Vivanco 6d1de73cad Fixes some html structure in the requested assets view 2022-05-24 14:06:05 -05:00
Ivan Nieto Vivanco e0b64a4879 Fixes constraint violation when ordering some columns 2022-05-24 14:00:23 -05:00
Ivan Nieto Vivanco 0a6626891e Add links to requestable Models' name 2022-05-24 13:36:13 -05:00
snipe 2ec7644a33 Merge remote-tracking branch 'origin/develop' 2022-05-24 10:49:13 -07:00
snipe 810578ff5d
Merge pull request #11189 from snipe/fixes/show_username_on_user_view_if_not_admin 
Fixed bug where username wasn’t showing for regular users
 2022-05-24 10:48:55 -07:00
snipe 64eafb062e Fixed bug where username wasn’t showing for regular users 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-24 10:48:02 -07:00
snipe ad56928d04 Merge remote-tracking branch 'origin/develop' 2022-05-23 20:35:40 -07:00
snipe 30583f920d
Merge pull request #11184 from uberbrady/fix_google_ldap_rebased 
Google client-side TLS auth works better with null as context(?)
 2022-05-23 20:35:15 -07:00