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

6436 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe a773e70936 Add @Toreg87 as a contributor 2021-10-04 15:03:23 -07:00
snipe 92a38f2a23 Add @jerm as a contributor 2021-10-04 15:03:05 -07:00
snipe 542f774c68 Add @FliegenKLATSCH as a contributor 2021-10-04 15:02:56 -07:00
snipe 67e106c7fa Add @AL4AL as a contributor 2021-10-04 15:02:51 -07:00
snipe 536b5717f0
Merge pull request #10164 from snipe/fixes/require_revalidation_on_logout_back_button 
Force revalidation headers when user logs out
 2021-10-04 12:56:03 -07:00
snipe 9b48732cd2 Force revalidation headers when user logs out 
Signed-off-by: snipe <snipe@snipe.net>
 2021-10-04 12:52:48 -07:00
snipe 244616b31e
Merge pull request #10157 from snipe/jerm/fix-cachedir-ownership 
[Docker] Fix ownership of cache directory in startup script
 2021-10-01 17:50:36 -07:00
Jeremy Price 22313711d5 Fix ownership of cache directory 
Snipe-IT was waiting to load because
/var/www/html/storage/framework/cache/ and its contet were owned by
root:root, but docker needed to be able to write to them

This change recursively chowns that path to docker:root, and now it
loads.
 2021-10-01 16:54:17 -07:00
snipe 89e650f842 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 16:01:56 -07:00
snipe daa88f06f7 Added pivot to components JSON 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 15:51:08 -07:00
snipe d0acb9fdb4 Applies PR #10150 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-30 15:33:00 -07:00
snipe 8e437a66af Merge branch 'master' of https://github.com/snipe/snipe-it 2021-09-28 20:03:35 -07:00
snipe f232579e2b Added Discord badge 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-28 20:02:46 -07:00
snipe 7b7583fde3
Merge pull request #10141 from uberbrady/fix_currency_problems 
Fixed #9789 and Fixed #10088 and Fixed [fd23442] - Fix currency problems especially with European currency format
 2021-09-28 19:37:25 -07:00
Brady Wetherington ae466be153 Fix license output, tweak CleanFloat function to handle numbers over 1 million 2021-09-28 19:10:25 -07:00
Brady Wetherington f3338667c7 Create new ParseCurrency helper and use it in the appropriate controllers 2021-09-28 18:20:39 -07:00
Brady Wetherington f380da3f19 Try to ensure all currency output is formatted correctly. 2021-09-28 16:45:47 -07:00
snipe 919eaf320c Updated javascript assets 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 19:00:53 -07:00
snipe c9337a1947 Merge branch 'master' of https://github.com/snipe/snipe-it 2021-09-23 18:59:25 -07:00
snipe d069d032fc Updated JS asset 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 18:59:13 -07:00
snipe d37dedb654
Merge pull request #10123 from takuy/patch-1 
Fixed #9928: update expected field name for response list
 2021-09-23 18:57:02 -07:00
snipe fedf51dda4 Fixed typo 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 18:29:47 -07:00
snipe 53334f7905
Merge pull request #10124 from snipe/features/added_components_to_assets_API 
Added assigned components to assets API
 2021-09-23 18:26:57 -07:00
snipe 2f9582ee5c Switched to loadMissing for performance 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 17:31:19 -07:00
snipe 3b7ce0091c Load components in the assets API if components=true in API request 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 17:23:53 -07:00
snipe 6e270c0ed2 Include created_at in pivot 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-23 17:23:17 -07:00
Sam d0f284129a
Update expected field for response list 
The existing code to handle the "enter key" / auto selections broke at some point. It was expecting results to be in an "items" list, not a "results" list. This should close #9928 hopefully. Tested locally.
 2021-09-23 20:12:45 -04:00
snipe 6aa7e9cbfa Merge branch 'master' of https://github.com/snipe/snipe-it 2021-09-23 14:32:48 -07:00
snipe 3862b6476b
Merge pull request #10122 from inietov/fixes/api_issue_when_component_checkout 
Fixes API Issue when checking out a component
 2021-09-23 13:21:48 -07:00
Ivan Nieto Vivanco 7dfab3a6e2 Change the condition to 'bigger or equal' instead of just 'bigger than' in ComponentsController checkout api 2021-09-23 15:02:39 -05:00
snipe 0f40ba2b34 Check for admin rights before displaying admin permission options 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 19:31:49 -07:00
snipe 39a702397a Add user permissions message if the user is not an admin or better 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 19:05:02 -07:00
snipe a6b3aa5f04 Don't try to delete the file if there is no log entry 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-22 19:04:25 -07:00
snipe 3821c4d372 Merge remote-tracking branch 'origin/develop' 2021-09-21 21:53:40 -07:00
snipe 104d66b4b1
Merge pull request #10115 from snipe/features/added_footer_to_depreciation_report_totals 
Added totals to depreciation report footer
 2021-09-21 21:53:17 -07:00
snipe b4a90045e6 Added totals to depreciation report footer 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:52:18 -07:00
snipe 3b9b63a7a8 Merge remote-tracking branch 'origin/develop' 2021-09-21 21:29:11 -07:00
snipe 9b78b25372 Grr. 100 should be 1000 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:28:59 -07:00
snipe 0411f63591 Merge remote-tracking branch 'origin/develop' 2021-09-21 21:25:39 -07:00
snipe 7df4f98e19 Bump number per page up to 1000 
Use this shit at your own peril. Very large pages will load slowly, as these are very complex queries.

Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 21:25:22 -07:00
snipe 86a4f2d3ec Merge remote-tracking branch 'origin/develop' 2021-09-21 20:54:37 -07:00
snipe 0763c76a4e Fixed scoping with leftjoin 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 20:54:24 -07:00
snipe 3af7c66de7 Merge remote-tracking branch 'origin/develop' 2021-09-21 20:11:08 -07:00
snipe 0be4b21721
Merge pull request #10114 from snipe/fixes/sorting_in_non_assets 
Fixes sorting on non-asset relations in API
 2021-09-21 20:09:43 -07:00
snipe 5d32c17a2e Removed comments 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 20:01:36 -07:00
snipe 10ca7cffc3 Fixes for query scoping, ordering, and nicer readability 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 19:59:23 -07:00
snipe 05faffbd28 Merge remote-tracking branch 'origin/develop' 2021-09-21 17:50:35 -07:00
snipe dacdf788bc
Reverted erroneous german text in UK language files 2021-09-21 17:50:13 -07:00
snipe d54057e495 Merge remote-tracking branch 'origin/develop' 2021-09-21 15:55:04 -07:00
snipe a22c35140b
Merge pull request #10112 from snipe/fixes/strtolower_for_category_type 
Improved category_type with strtolower() to make it case insensitive
 2021-09-21 15:54:35 -07:00