28b584b8bc
Merge remote-tracking branch 'origin/develop'
2025-06-02 02:08:19 +01:00
51bab2dd26
Merge pull request #17045 from grokability/docker-laravel-log-permissions
...
Docker: Ensure permissions on Laravel log file
2025-05-30 06:52:31 +01:00
ed8da6ad1b
Docker: Ensure permissions on Laravel log file
...
FIXES: https://github.com/grokability/snipe-it/issues/12725
In some of our Docker startups, it was possible for the Laravel log file
to be created with root permissions, causing future errors when the
non-root webapp tries to write to it.
We'll now always chown (and create, if necessary) the log file to the proper
user after running any artisan commands (as root)
We _could_ run them as the proper user via su, but IMO not doing so keeps the
script easier to read, but I'm not married to the approach. I'd still
want to keep the chown command(s) in, because it will also fix the
permissions for anyone who already has this issue.
2025-05-29 17:45:14 -07:00
70449e694d
Merge remote-tracking branch 'origin/develop'
2025-05-29 22:18:50 +01:00
28dc358df1
Merge pull request #17041 from grokability/improve_locations_and_supplier_api
...
Small refinements for suppliers and locations API and list view
2025-05-29 21:30:54 +01:00
78d26fb7f6
Removed stray character
...
Typing is hard :(
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 21:23:50 +01:00
930842e685
Removed unused method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 21:18:19 +01:00
b938cb42d8
Merge pull request #17040 from marcusmoore/improve-acceptance-reminder-output
...
Avoid displaying empty table in `SendAcceptanceReminder` command
2025-05-29 21:14:09 +01:00
4c7b6d130f
Added additional search and display fields for suppliers and locations
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 21:13:08 +01:00
af57ca4983
Avoid displaying empty table
2025-05-29 11:55:43 -07:00
40c31a1ad7
Eager load adminuser method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 17:13:16 +01:00
7ae4a4177f
Added created_by to transformer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 17:13:05 +01:00
6efd323fbf
Added adminuser method
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 17:12:48 +01:00
ed9dbcc777
Added created_by to location presenter
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 17:12:33 +01:00
c2cf7de41b
Use presenter for suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 17:12:16 +01:00
8395ea552d
Merge remote-tracking branch 'origin/develop'
2025-05-29 16:17:58 +01:00
f9cbecdb17
Merge pull request #17037 from grokability/supplier_importer
...
Added #17036 - suppliers importer
2025-05-29 16:15:59 +01:00
7bb29a0277
Added sample import CSVs
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:08:17 +01:00
d5f7579e9f
Added columns to suppliers
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:08:01 +01:00
13fd43c45c
Added tests and test support
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:07:51 +01:00
c08ce901cc
Added strings
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:07:19 +01:00
94bd11d3c9
Added locations and supplier import types
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:07:11 +01:00
59c6e26b29
Fixed mapping
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 16:06:51 +01:00
bf7cc404f8
Set correct redirect
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 15:54:37 +01:00
12a2c71b90
Added icon
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 14:47:59 +01:00
6e2eeba0f6
Added supplier importer
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 14:47:54 +01:00
dc66452633
Merge remote-tracking branch 'origin/develop'
2025-05-29 13:32:41 +01:00
99a739fae3
Merge pull request #17035 from grokability/settings_style_improvements
...
Fixed #17034 - larger header color box on small views
2025-05-29 13:30:31 +01:00
0185f61c11
Fixed #17034 - larger header color box on small views
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 13:23:07 +01:00
783f0c113d
Merge pull request #17009 from marcusmoore/chore/replace-user-skin-macro
...
Replace `skin` and `user_skin` macros with blade component
2025-05-29 13:07:47 +01:00
75a839cc21
Merge pull request #17010 from marcusmoore/chore/replace-two-factor-select-macro
...
Replace `two_factor_options` macro
2025-05-29 13:07:23 +01:00
53ce44ac91
Merge remote-tracking branch 'origin/develop'
2025-05-29 12:38:40 +01:00
577b5586b4
Merge pull request #17025 from akemidx/clear_button_on_date_picker
...
FIXED: Clear Button actually Clearing Dates on Date Picker
2025-05-29 12:37:56 +01:00
1474a16148
Merge pull request #17024 from akemidx/created_at_date_picker
...
ADDED: Created At date picker on Custom Reports
2025-05-29 12:37:17 +01:00
9baa2000e1
Merge pull request #17026 from marcusmoore/bug/translate-email-format
...
Reference correct translation string
2025-05-29 12:36:08 +01:00
c7c3243bbc
Merge remote-tracking branch 'origin/develop'
2025-05-29 12:35:21 +01:00
d0624dbefe
Merge pull request #17027 from akemidx/bug/sc-29295
...
FIXED: Translation strings in Username/Email formats
2025-05-29 12:34:47 +01:00
8bdd77d33d
Merge remote-tracking branch 'origin/develop'
2025-05-29 12:24:51 +01:00
ecb6e8d9a9
Fixed route for custom fields index
...
Signed-off-by: snipe <snipe@snipe.net >
2025-05-29 12:24:22 +01:00
acd7d0db3a
Merge remote-tracking branch 'origin/develop'
2025-05-29 12:09:08 +01:00
ba3b55cab0
Merge pull request #17022 from marcusmoore/bug/sc-29281
...
Avoid dividing by zero in DefaultLabel
2025-05-29 02:42:41 +01:00
67acca7bc8
fixing two translation strings.
2025-05-28 20:21:05 -04:00
e4b33c3b56
Reference correct translation string
2025-05-28 16:36:39 -07:00
ed43c73cec
clearing the date pickers
2025-05-28 18:48:22 -04:00
a6fa795b41
clearing the date pickers
2025-05-28 18:48:08 -04:00
3a6bac2e63
date picker
2025-05-28 18:43:24 -04:00
8e01c05e42
date picker
2025-05-28 18:43:14 -04:00
fabf9281e9
date picker
2025-05-28 18:35:43 -04:00
6588d409b8
Add validation
2025-05-28 14:45:03 -07:00
92a3421a4e
Merge pull request #17020 from akemidx/column_persist_on_assigned_assets
...
FIXED: Column persist on User's Self View of Assigned Assets
2025-05-28 22:44:36 +01:00
snipe