DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
6573 commits 97 branches 266 tags 291 MiB
Commit graph

6573 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 61176335d7 Improved category_type with strtolower() to make it case insensitive 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-21 15:51:41 -07:00
snipe 11c8b1259e Merge remote-tracking branch 'origin/develop' 2021-09-20 18:49:17 -07:00
snipe 9b52c61d95 Updated banner with better warning 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-20 18:49:04 -07:00
snipe 2dfb965885
Merge pull request #10104 from snipe/fixes/revamp_pave_command_to_persist_api_keys 
Fixes pave command to persist api keys and first few test users
 2021-09-20 18:48:11 -07:00
snipe 36464bc17d Fix confirmation, because apparently you can't pass that along via cli vs interactively 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-20 18:22:06 -07:00
snipe f35208d58d Clean up, find custom fields and drop those columns 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-20 18:03:13 -07:00
snipe 4d30edd535 Let's make sure to keep some of the stuff we need on the demo as well 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-20 17:29:32 -07:00
snipe 957f33c8cf First stab at a better pave command 
Signed-off-by: snipe <snipe@snipe.net>
 2021-09-20 17:19:41 -07:00
snipe 7c8c567eaf Merge remote-tracking branch 'origin/develop' 2021-09-20 15:12:53 -07:00
snipe 6772ace94e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2021-09-20 15:10:54 -07:00
snipe ee28f3e853 Merge branch 'snyk-fix-bb1a61f0d07295579c411381da690d4c' of https://github.com/snipe/snipe-it into develop 2021-09-20 15:10:31 -07:00
snipe 81f1f4ce6f Add @vapier as a contributor 2021-09-20 15:07:37 -07:00
snipe 3b79038879
Merge pull request #10082 from vapier/develop 
add rewrite rule for Let's Encrypt certificates
 2021-09-20 14:57:14 -07:00
snipe 7e611fa699 Merge remote-tracking branch 'origin/develop' 2021-09-15 13:55:12 -07:00
snipe e8ad5dc273
Merge pull request #10086 from snipe/fixes_depreciation_report 
Fixed extraneous asset search in depreciation report
 2021-09-15 13:54:32 -07:00
snipe 8a93e1e796 Remove asset call on depreciation report controller method 
We ajax this in now, so no need for it

Signed-off-by: snipe <snipe@snipe.net>
 2021-09-15 13:49:53 -07:00
snipe 3d7000f759 Merge remote-tracking branch 'origin/develop' 2021-09-15 11:33:30 -07:00