 snipe
|
335ab3f064
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/dist/all.css
# public/mix-manifest.json
v8.3.1
|
2025-09-01 11:57:07 +01:00 |
|
|
snipe
|
ec310bc8fb
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 11:56:01 +01:00 |
|
|
snipe
|
db477421b2
|
Bumped to 8.3.1
Signed-off-by: snipe <snipe@snipe.net>
|
2025-09-01 11:54:53 +01:00 |
|
|
snipe
|
30a9496cf5
|
Merge pull request #17748 from Godmartinz/parent-location-in-asset-view
Adds #10969 Parent location to Asset Checked out to info
|
2025-09-01 11:49:42 +01:00 |
|
|
snipe
|
6cefa0d0b3
|
Merge pull request #17745 from Godmartinz/dropdown-link-color-fix
Fixes #17488 (Part 2) Nav dropdown link color and skin names
|
2025-09-01 11:48:29 +01:00 |
|
|
snipe
|
9284984265
|
Merge pull request #17768 from Speedyduck300000/develop
Fixed #17742: don't delete random actionlog when trying to delete a file
|
2025-09-01 11:40:06 +01:00 |
|
|
Speedyduck300000
|
53b96168a9
|
fixed uploadfilescontroller to use the file_id to delete the correct
entry.
|
2025-09-01 07:34:18 +02:00 |
|
|
snipe
|
7dd493da35
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-29 10:17:26 +01:00 |
|
|
snipe
|
b3c583b6dc
|
Few more ->display_name
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-29 10:17:16 +01:00 |
|
|
snipe
|
560bd6da92
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# resources/views/notifications/markdown/report-expiring-assets.blade.php
|
2025-08-29 10:08:56 +01:00 |
|
|
snipe
|
28abeab31d
|
Fixed a few more display_name instances
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-29 10:06:58 +01:00 |
|
|
snipe
|
a5824ccc5f
|
Merge pull request #17754 from marcusmoore/fixes/name-in-expiring-assets-master
Patch #17751 to master take 2
|
2025-08-29 01:25:46 +01:00 |
|
|
Marcus Moore
|
830a7964a4
|
Use display_name in place of name()
|
2025-08-28 17:23:56 -07:00 |
|
|
snipe
|
12a649ec4b
|
Merge pull request #17751 from marcusmoore/fixes/name-in-expiring-assets
Fixed user display name in expiring asset notification
|
2025-08-29 01:11:05 +01:00 |
|
|
Marcus Moore
|
3a27ecc475
|
Use display_name in place of name()
|
2025-08-28 16:22:24 -07:00 |
|
|
Godfrey M
|
da6fab5d43
|
adds parent location to checked out to location
|
2025-08-28 13:37:40 -07:00 |
|
|
snipe
|
ca95b29cd6
|
Add telescope tables to the excepted tables
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 19:52:56 +01:00 |
|
|
Godfrey M
|
c5c68e9dd5
|
fix dropdown link color and skin names
|
2025-08-28 11:49:37 -07:00 |
|
|
snipe
|
44fbde26fa
|
Merge pull request #17743 from grokability/normalize-trait-locations
Moved model traits into proper directory
|
2025-08-28 18:52:43 +01:00 |
|
|
snipe
|
6e2bcd6aa9
|
Merge pull request #17680 from grokability/added-telescope
Added laravel telescope for dev environment
|
2025-08-28 18:52:18 +01:00 |
|
|
snipe
|
b1359c3277
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# config/version.php
v8.3.0
|
2025-08-28 18:34:14 +01:00 |
|
|
snipe
|
9c0202e5ce
|
Bumped to 8.3.0
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:33:46 +01:00 |
|
|
snipe
|
39ef353073
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:32:07 +01:00 |
|
|
snipe
|
7b5d90dd81
|
Moved model traits into proper directory
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:23:26 +01:00 |
|
|
snipe
|
0ba8f5cc5a
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 18:06:29 +01:00 |
|
|
snipe
|
d1129081df
|
Asset nothing is sent if send_welcome is not checked/passed
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 18:05:40 +01:00 |
|
|
snipe
|
315a812df5
|
Fixed typos
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 16:41:56 +01:00 |
|
|
snipe
|
6fb9e2c38e
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 16:12:18 +01:00 |
|
|
snipe
|
cfc979acf0
|
Merge pull request #17432 from oolivero45/patch-1
Fixed #17431: EULA not displaying on asset acceptance page
|
2025-08-28 16:09:36 +01:00 |
|
|
snipe
|
d7407d70a3
|
Merge pull request #17741 from grokability/improved-user-create-tests
Improved user create tests
|
2025-08-28 13:32:46 +01:00 |
|
|
snipe
|
8ccd2e97a8
|
Improved user create tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 13:27:08 +01:00 |
|
|
snipe
|
988204619f
|
Merge pull request #17740 from grokability/renamed-user-test
Renamed the test for consistency
|
2025-08-28 13:05:05 +01:00 |
|
|
snipe
|
cad6cc3007
|
Renamed the test for consistency
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 13:02:01 +01:00 |
|
|
snipe
|
eebc2ab8be
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 07:30:15 +01:00 |
|
|
snipe
|
b303875f1d
|
Merge pull request #17734 from grokability/#17726-add-welcome-email-to-new-user-form
Fixed #17726: add welcome email to new user form
|
2025-08-28 07:29:56 +01:00 |
|
|
snipe
|
d5cc61f378
|
Added send to API call for creating users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 07:28:51 +01:00 |
|
|
snipe
|
0d7ec43262
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:19:41 +01:00 |
|
|
snipe
|
d3747f4daa
|
Added welcome email to controller
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:12:01 +01:00 |
|
|
snipe
|
af695e7dc8
|
Added help to user importer
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:52 +01:00 |
|
|
snipe
|
1edbfd87df
|
Added welcome email checkbox to user create form
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:40 +01:00 |
|
|
snipe
|
454be01a6c
|
Updated translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-28 06:11:23 +01:00 |
|
|
snipe
|
b65b3151ee
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-28 05:29:48 +01:00 |
|
|
snipe
|
745fc515f1
|
Merge pull request #17713 from Godmartinz/fix-localization-for-email-notifications
Adds #5554 locale for acceptance notifications and checkin/out emails
|
2025-08-28 05:29:28 +01:00 |
|
|
snipe
|
715b9c1182
|
Merge pull request #17730 from Godmartinz/update-asset-accepance-with-category
Adds #9000 Item type to Account Asset Acceptance index
|
2025-08-28 05:22:54 +01:00 |
|
|
Godfrey M
|
95be847d87
|
renamed attribute
|
2025-08-27 14:10:51 -07:00 |
|
|
Godfrey M
|
c1a6546eba
|
change column header
|
2025-08-27 14:09:13 -07:00 |
|
|
Godfrey M
|
648c25a0a7
|
adds item type to Accept asset index
|
2025-08-27 14:06:10 -07:00 |
|
|
Godfrey M
|
f2ec7f2975
|
fix tests
|
2025-08-27 13:22:35 -07:00 |
|
|
Godfrey M
|
f518af6d61
|
fix class name
|
2025-08-27 13:09:05 -07:00 |
|
|
snipe
|
13a0f49f5f
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-27 16:36:05 +01:00 |
|