Brady Wetherington
|
21d08ff742
|
Whoops! Forgot to commit this before
|
2023-05-01 18:05:06 -07:00 |
|
snipe
|
da8b41b12a
|
Merge pull request #12956 from uberbrady/upgrade_node_and_packages_for_v7
Updated Node version, and various packages to more recent
|
2023-05-01 17:33:20 -07:00 |
|
Brady Wetherington
|
6e031727fa
|
Updated Node version, and various packages to more recent
|
2023-05-01 17:05:10 -07:00 |
|
Brady Wetherington
|
381890b578
|
Merge branch 'develop' into laravel_v9
|
2023-04-27 13:56:04 -07:00 |
|
snipe
|
e25dc42121
|
Switch to externalLinkFormatter
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:42:34 -07:00 |
|
snipe
|
dcb7eadfc7
|
Merge pull request #12933 from snipe/features/unlink_dynamic_urls_if_variables_used
Remove auto-link from from manufacturer warranty
|
2023-04-26 18:40:33 -07:00 |
|
snipe
|
99ef435d40
|
Fixed translation
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:32:38 -07:00 |
|
snipe
|
e853f8b7fd
|
Removed SR text for exporting
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:23:21 -07:00 |
|
snipe
|
deff312381
|
Remove auto-link from from manufacturer warranty
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 18:16:23 -07:00 |
|
snipe
|
73d45bb587
|
Merge pull request #12932 from snipe/features/add_warranty_url_to_mfgs
Added dynamic warranty URL to manufacturers
|
2023-04-26 17:55:03 -07:00 |
|
snipe
|
7974c172fd
|
Switch back to “normal” url for support
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:48:38 -07:00 |
|
snipe
|
54a766c4f9
|
Added dynamic warranty URL to manufacturers
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 16:39:15 -07:00 |
|
snipe
|
ef69df2cdf
|
Merge pull request #12930 from snipe/fixes/added_help_text_to_support_url
Added help text to the now-dynamic manufacturer URLS
|
2023-04-26 15:15:19 -07:00 |
|
snipe
|
7c0ef581c5
|
Added help text to the now-dynamic manufacturer URLS
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 15:12:36 -07:00 |
|
snipe
|
0c5837e4a0
|
Merge pull request #12929 from snipe/fixes/use_asset_tag_if_no_asset_name_given
Use the asset tag instead of asset name if no name is given
|
2023-04-26 14:49:38 -07:00 |
|
snipe
|
5eac314f4d
|
Merge pull request #12906 from akemidx/feature/sc-20622
Dynamic warranty link for manufacturers' support urls
|
2023-04-26 14:49:22 -07:00 |
|
snipe
|
b5b335a2ca
|
Use the asset tag instead of asset name if no name is given
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 14:41:19 -07:00 |
|
akemidx
|
497d17835f
|
requested edits
|
2023-04-26 17:06:08 -04:00 |
|
akemidx
|
aab53cf683
|
remove regex, add in starts_with
|
2023-04-26 15:18:13 -04:00 |
|
snipe
|
4c16dcf5d0
|
Merge pull request #12922 from snipe/fixes/12918_route_name_for_clone_locations
Fixed #12918 - wrong route for clone location
|
2023-04-26 09:54:18 -07:00 |
|
snipe
|
b6889ff399
|
Fixed #12918 - wrong toite for clone location
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-26 09:52:13 -07:00 |
|
snipe
|
19554a7dc2
|
Merge pull request #12917 from snipe/fixes/applies_pr_12868
Applies #12868 - fixes EOL date on asset creation
|
2023-04-25 23:40:43 -07:00 |
|
snipe
|
8f0b823fb3
|
Applies #12868
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 23:39:32 -07:00 |
|
snipe
|
2299771e10
|
Add @zacharyfleck as a contributor
|
2023-04-25 22:37:17 -07:00 |
|
snipe
|
37b881b906
|
Add @dboth as a contributor
|
2023-04-25 22:32:45 -07:00 |
|
snipe
|
22d73f503a
|
Merge pull request #12756 from dboth/develop
Fixed #8208, #8896, #8985 and #9789: Currency issues when using non-english locales (resubmission)
|
2023-04-25 22:32:13 -07:00 |
|
snipe
|
970b5e556c
|
Merge pull request #12903 from marcusmoore/bug/sc-15034
Fixes sending webhook notifications for checkout and checkin
|
2023-04-25 22:22:58 -07:00 |
|
snipe
|
17275cbeb8
|
Merge pull request #12905 from marcusmoore/fixes/checkout-via-artisan
Fixes where clause operator in artisan checkout command
|
2023-04-25 22:21:59 -07:00 |
|
snipe
|
470a36a7c9
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 22:12:56 -07:00 |
|
snipe
|
b7632cdbb7
|
Updated js packages
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 22:12:47 -07:00 |
|
snipe
|
c8c6f879d4
|
Merge pull request #12912 from Godmartinz/ldap_location_sync
added ldap_location to settings
|
2023-04-25 21:54:28 -07:00 |
|
snipe
|
705bb7375a
|
Merge pull request #12914 from marcusmoore/fixes/fix-test-cases
Fixes state leak between tests
|
2023-04-25 17:22:56 -07:00 |
|
snipe
|
0e73923c24
|
Merge pull request #12913 from uberbrady/fix_scim_id_string
Change from a standard Eloquent mapping for ID to a custom setRead
|
2023-04-25 12:02:36 -07:00 |
|
Marcus Moore
|
a528ebeab0
|
Use superuser instead of admin state
|
2023-04-25 11:53:47 -07:00 |
|
Brady Wetherington
|
3da5df0127
|
Change from a standard Eloquent mapping for ID to a custom setRead
|
2023-04-25 11:50:55 -07:00 |
|
Godfrey M
|
20d8ff2a4f
|
removed a typo
|
2023-04-25 11:49:33 -07:00 |
|
snipe
|
a7e2182ec9
|
Merge pull request #12904 from zacharyfleck/develop
Fixed #8342: Add ARM64 architecture to Docker Builds
|
2023-04-25 11:45:27 -07:00 |
|
Godfrey M
|
cb68f41d9c
|
added ldap_location to settings
|
2023-04-25 11:44:04 -07:00 |
|
Zachary Fleck
|
af0a0276e0
|
Merge branch 'snipe:develop' into develop
|
2023-04-25 14:43:41 -04:00 |
|
Zachary Fleck
|
ef07f39ccf
|
remove space
|
2023-04-25 14:43:34 -04:00 |
|
Zachary Fleck
|
aa223359d4
|
remove space
|
2023-04-25 14:42:09 -04:00 |
|
snipe
|
efc0929bbc
|
Merge pull request #12910 from snipe/fixes/finer_permissions_for_bulk_assets
Added more granular permissions on bulk actions for assets
|
2023-04-25 08:09:30 -07:00 |
|
snipe
|
66ce02fc48
|
Added permission on restore
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:09:16 -07:00 |
|
snipe
|
6e7f0728fd
|
Added more granular permissions on bulk actions for assets
Signed-off-by: snipe <snipe@snipe.net>
|
2023-04-25 08:06:45 -07:00 |
|
Marcus Moore
|
b4f162f316
|
Fix operator in where clause
|
2023-04-24 17:26:06 -07:00 |
|
akemidx
|
9cd2783185
|
Regex added for link instead
|
2023-04-24 20:07:21 -04:00 |
|
zacharyfleck
|
63ade327a5
|
add ARM64 architecture
|
2023-04-24 16:24:44 -04:00 |
|
snipe
|
7d9062c065
|
Merge pull request #12877 from joelpittet/patch-1
Allow an environment variable to set the session cookie path
|
2023-04-21 04:45:17 -07:00 |
|
snipe
|
fc721a9388
|
Merge pull request #12887 from marcusmoore/bug/sc-23158
Fix: Ensure users editing themselves do not deactivate their account
|
2023-04-21 04:42:04 -07:00 |
|
Marcus Moore
|
2aba8252f3
|
Ensure users editing themselves do not deactivate their account
|
2023-04-20 21:59:55 -07:00 |
|