snipe
|
2eac03db4a
|
Merge pull request #12329 from snipe/fixes/rollbar_integration
Fixed rollbar integration if ROLLBAR_TOKEN is provided
|
2023-01-10 17:21:52 -08:00 |
|
Marcus Moore
|
c5b09ed955
|
Fix column name typo
|
2023-01-10 17:21:46 -08:00 |
|
Marcus Moore
|
4ee3cbf60e
|
Comment out migration's down method to match its up method
|
2023-01-10 17:20:20 -08:00 |
|
Marcus Moore
|
39ab545cf5
|
Update alter statement to use correct suffix for column
This is brittle...
|
2023-01-10 17:08:28 -08:00 |
|
Marcus Moore
|
e5cb68cc5e
|
Move drop column command to correct migration
|
2023-01-10 17:06:16 -08:00 |
|
Marcus Moore
|
b8b2543b0d
|
Reference the correct table in migration down method
|
2023-01-10 17:04:21 -08:00 |
|
Marcus Moore
|
bc0f666906
|
Create Setting in test to avoid being redirected to the setup screen
|
2023-01-10 17:03:09 -08:00 |
|
Marcus Moore
|
581655f756
|
Run database migrations for all Dusk tests
|
2023-01-10 17:02:11 -08:00 |
|
Marcus Moore
|
2aa50859b3
|
Bump Dusk version to fix broken macOS chrome driver link
|
2023-01-10 17:01:03 -08:00 |
|
snipe
|
0b0fdd8aa5
|
Small formatting fixes, fixed typo in comment
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:32:18 -08:00 |
|
snipe
|
8f3a237ea0
|
More comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:29:51 -08:00 |
|
snipe
|
151719a91c
|
Added comments
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:24:46 -08:00 |
|
snipe
|
825df2cf75
|
Load up the item counts with the individual API methods for accurate numbers without n+1
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:17:03 -08:00 |
|
snipe
|
b66cd313b9
|
Refactored itemCount() to use existing blah_count fields if they exist
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:16:25 -08:00 |
|
snipe
|
d508374c57
|
Disallowed category type change string
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:15:51 -08:00 |
|
snipe
|
f50b622eb8
|
Disallow editing of category type once created, added help text
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 16:15:40 -08:00 |
|
snipe
|
bef4224e14
|
Added notes to itemCount()
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 13:50:24 -08:00 |
|
snipe
|
249b188654
|
Refactor category API and transformer for query optimization
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 13:30:01 -08:00 |
|
Brady Wetherington
|
2170343958
|
Fixed #12004: Snipe-IT restore didn't work on Windows
|
2023-01-10 13:06:47 -08:00 |
|
snipe
|
17c308f3ca
|
Merge remote-tracking branch 'origin/master' into develop
|
2023-01-10 02:08:23 -08:00 |
|
snipe
|
35136cea07
|
Add @subdriven as a contributor
|
2023-01-10 02:07:48 -08:00 |
|
snipe
|
0db83ad8cb
|
Merge pull request #12158 from subdriven/master
Updated installer script for multiple fixes and features
|
2023-01-10 02:04:29 -08:00 |
|
snipe
|
62bf7b1bce
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-10 01:56:27 -08:00 |
|
snipe
|
50fdf9c33b
|
Merge pull request #12330 from snipe/fixes/custom_status_label_sidenav
Fixed UX issue where assets sidenav would collapse if custom status label is selected
|
2023-01-10 01:55:52 -08:00 |
|
snipe
|
c5c37fa95f
|
Fixed copypasta
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 01:54:26 -08:00 |
|
snipe
|
9dc016aecc
|
Fixed issue where assets sidenav would collapse if custom status label is selected
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 01:31:00 -08:00 |
|
snipe
|
1cf7784bb8
|
Logging override if ROLLBAR_TOKEN is provided
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-10 00:20:56 -08:00 |
|
snipe
|
60dcaa9e94
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
|
2023-01-09 21:11:29 -08:00 |
|
snipe
|
2e75bd6960
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 21:11:00 -08:00 |
|
snipe
|
799c9c910e
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 21:09:46 -08:00 |
|
snipe
|
005d6d3b62
|
Merge pull request #12328 from snipe/fixes/revert_to_old_behavior_on_byserial
Fixed bySerial endpoint to always return a list
|
2023-01-09 21:09:25 -08:00 |
|
snipe
|
529b005d1e
|
We were previously returning a collection - this reverts the change in the last PR to keep that behavior consistent
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 21:05:51 -08:00 |
|
snipe
|
dd55aedb87
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 20:47:46 -08:00 |
|
snipe
|
be16fe948a
|
Merge pull request #12327 from snipe/fixes/formatting_regression_with_bytag_api_response
Determine which transformer to use based on number of assets
|
2023-01-09 20:46:49 -08:00 |
|
snipe
|
7846251d25
|
Re-added return for no results (derp)
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 20:43:57 -08:00 |
|
snipe
|
cc665d50ed
|
One more refactor, hopefully simplifying
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 20:40:12 -08:00 |
|
snipe
|
ae76d46f87
|
Small refactor to ALWAYS return deleted assets in a collection transformer
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 20:23:05 -08:00 |
|
snipe
|
bf849128fc
|
Replicate the response behavior in the bySerial endpoint
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 19:57:47 -08:00 |
|
snipe
|
44be8c8f60
|
Determine which transformer to use based on number of assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 19:54:21 -08:00 |
|
snipe
|
bad1253682
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 17:15:44 -08:00 |
|
snipe
|
20a9be2f6c
|
Merge pull request #12326 from uberbrady/uncache_settings
The cache system in getSettings() cached values "forever." That's bad.
|
2023-01-09 17:14:22 -08:00 |
|
Brady Wetherington
|
39b1a5a8a0
|
Remove old cache key for settings
|
2023-01-09 16:19:25 -08:00 |
|
Brady Wetherington
|
2d0ac5b48b
|
The cache system in getSettings() cached values "forever." That's bad.
|
2023-01-09 16:16:09 -08:00 |
|
snipe
|
e67bd5a275
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 16:00:33 -08:00 |
|
snipe
|
8d35583634
|
Merge pull request #12324 from snipe/features/add_username_to_asset_list
Added username to display in asset listings
|
2023-01-09 16:00:01 -08:00 |
|
snipe
|
b39a9e0fe1
|
Merge remote-tracking branch 'origin/develop'
|
2023-01-09 15:54:04 -08:00 |
|
snipe
|
ae04a8c872
|
Merge pull request #12325 from uberbrady/ldap_permissions_fix
Fixed #12288 - LDAP default group feature refactor
|
2023-01-09 15:52:02 -08:00 |
|
Brady Wetherington
|
cbffd105a2
|
Fix LDAP default group feature
|
2023-01-09 15:23:19 -08:00 |
|
snipe
|
a57315aed5
|
Added username to display in asset listings
Signed-off-by: snipe <snipe@snipe.net>
|
2023-01-09 12:58:58 -08:00 |
|
snipe
|
e1263155b1
|
Merge pull request #12323 from snipe/translations/updated_strings
Updated language strings
|
2023-01-09 11:10:19 -08:00 |
|