DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 14:09:43 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
8146 commits 101 branches 268 tags 288 MiB
Commit graph

8146 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 50c92d4730 Merge remote-tracking branch 'origin/develop' 2022-06-02 17:09:52 -07:00
snipe f8a0bf6a4b
Merge pull request #11244 from snipe/fixes/drop_log_level_to_warn_on_SAML 
Dropped log level to warn on SAML error
 2022-06-02 17:09:32 -07:00
snipe 910fc08406 Dropped log level to warn on SAML error 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 17:07:49 -07:00
snipe eebc56d54b Merge remote-tracking branch 'origin/develop' 2022-06-02 16:33:04 -07:00
snipe b5ddc2c85b
Merge pull request #11243 from snipe/fixes/fix_diff_time_in_audit_report 
Don’t use the formatted date for diff days in audit report
 2022-06-02 16:32:46 -07:00
snipe 4e03ebe284 Don’t use the formatted date for diff days in audit report 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-02 16:30:26 -07:00
snipe 7577fc61e4
Merge pull request #11235 from Godmartinz/gh_5644-checkout_history_for_accessories 
fixed issue with misplaced div
 2022-06-01 17:03:23 -07:00
Godfrey M d302675056 fixed a div placement 2022-06-01 16:58:29 -07:00
Godfrey M 5316f41eba fixed a div placement 2022-06-01 16:56:01 -07:00
snipe fa6c463d46
Merge pull request #11046 from Godmartinz/gh_5644-checkout_history_for_accessories 
Added history tab to accessories
 2022-06-01 12:46:38 -07:00
snipe 23a441e7c8 Merge remote-tracking branch 'origin/develop' 2022-06-01 10:27:50 -07:00
snipe ac993184ee
Merge pull request #11233 from snipe/fixes/11232_depreciation_layout 
Fixed #11232 - missing closing div
 2022-06-01 10:27:25 -07:00
snipe 1dbc1f4aa2 Fixed #11232 - missing closing div 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-01 10:26:26 -07:00
snipe 089704c4f9 Merge remote-tracking branch 'origin/develop' 2022-05-31 14:17:23 -07:00
snipe bb933e5214
Merge pull request #11227 from inietov/fixes/exception_getimagesize 
Fixes #11116 Error exception in getimagesize
 2022-05-31 14:09:18 -07:00
Ivan Nieto Vivanco eb34cf7917 Evaluates if logo is uploaded before export PDF 2022-05-31 15:59:01 -05:00
snipe 4909cf2a9e
Merge pull request #11212 from inietov/fixes/checkout_logs_require_target 
Fixes Exception checkout logs require target
 2022-05-28 06:12:55 -07:00
Ivan Nieto Vivanco 37f9cca5ec Minor stylistic change 2022-05-28 08:11:13 -05:00
Ivan Nieto Vivanco 72192257f2 Delete a test file 2022-05-26 18:18:13 -05:00
Ivan Nieto Vivanco e0050bc844 Don't let a license to be checked out to a non-existent target 2022-05-26 18:06:53 -05:00
snipe d2d0842737
Merge pull request #11206 from snipe/features/suggest_updating_global_composer 
Added a self-update suggestion in the upgrader
 2022-05-26 11:30:09 -07:00
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