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 |
|
snipe
|
d96f877aa4
|
Default show_in_nav to 0
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-15 11:33:13 -07:00 |
|
Mike Frysinger
|
7b665ade0a
|
add rewrite rule for Let's Encrypt certificates
The LE tools need access to a stable path to automatically obtain
certificates, so add a rewrite rule to allow it.
|
2021-09-14 16:21:31 -04:00 |
|
snipe
|
02705d0d1a
|
Fixed S3 upload path
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-14 12:49:17 -07:00 |
|
snipe
|
772a06c87a
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-13 17:13:20 -07:00 |
|
snipe
|
0d633ce618
|
Fixed issue where created_at date was not showing on uploads
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-13 17:13:01 -07:00 |
|
snipe
|
cedf77b5ed
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-13 15:47:25 -07:00 |
|
snipe
|
c6b26965a0
|
Check for valid category name
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-13 15:47:13 -07:00 |
|
snipe
|
4b303adda7
|
Merge pull request #10080 from uberbrady/upgrade_docker_php74
Upgrade Docker to PHP 7.4
|
2021-09-13 15:30:32 -07:00 |
|
Brady Wetherington
|
37fe4e91b1
|
Upgrade Docker to PHP 7.4
|
2021-09-13 15:24:30 -07:00 |
|
snipe
|
179f26ca2e
|
Merge pull request #10079 from inietov/fixes/archived_assets_showing_in_locations
Awesome, thanks!
|
2021-09-13 14:46:44 -07:00 |
|
Ivan Nieto Vivanco
|
1ae665b645
|
Use the property 'archived' so if the 'name' one changes it doesn't fails
|
2021-09-13 16:45:05 -05:00 |
|
Ivan Nieto Vivanco
|
1b433920f1
|
Delete an extra semicolon
|
2021-09-13 16:24:12 -05:00 |
|
Ivan Nieto Vivanco
|
2b64af0d34
|
Add a condition in the view 'print all assigned' from locations where it skips the assets in relation of if they're archived and that option is marked in the settings
|
2021-09-13 16:17:34 -05:00 |
|
snipe
|
7f31befe5d
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-10 20:46:15 -07:00 |
|
snipe
|
a5409215fc
|
Merge pull request #10070 from snipe/fixes/update_status_label_color_via_api
Fixed #9969 - added color, show_in_nav, and default_label to status l…
|
2021-09-10 20:45:47 -07:00 |
|
snipe
|
80175cffdc
|
Fixed #9969 - added color, show_in_nav, and default_label to status labels API
Signed-off-by: snipe <snipe@snipe.net>
|
2021-09-10 20:44:49 -07:00 |
|
snipe
|
f8f969919e
|
Merge remote-tracking branch 'origin/develop'
|
2021-09-10 20:26:37 -07:00 |
|
snipe
|
fb68c49c44
|
Merge pull request #10069 from snipe/fixes/add_use_default_eula_to_category_endpoint
Fixed #9973 - add use_default_eula to category endpoint
|
2021-09-10 20:25:56 -07:00 |
|