 snipe
|
00a17cd55e
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-21 11:51:50 +01:00 |
|
|
snipe
|
15f97b6cb9
|
Merge pull request #17591 from Godmartinz/add-serial-to-expiring-asset-report
Adds #17440 serial number column to Expiring Assets Report
|
2025-08-21 11:14:45 +01:00 |
|
|
snipe
|
7612ee6b08
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 14:17:38 +01:00 |
|
|
snipe
|
618106c103
|
Fixed #17674 - added odp, ods, odt to accepted files
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 14:11:20 +01:00 |
|
|
snipe
|
2fcd8cd261
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 11:00:26 +01:00 |
|
|
snipe
|
2a37aa3b49
|
Fixed tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 10:34:05 +01:00 |
|
|
snipe
|
0ffa47a2c6
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-20 09:58:54 +01:00 |
|
|
snipe
|
bf591320af
|
Fixed #17665 - delete custom report modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-20 09:58:30 +01:00 |
|
|
Godfrey M
|
9eb686fe08
|
changes translation to administrator
|
2025-08-19 10:23:15 -07:00 |
|
|
Godfrey M
|
ed402e0122
|
adds serial underneath name
|
2025-08-19 10:10:20 -07:00 |
|
|
snipe
|
a8d0a4a95d
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/js/dist/all.js
# public/js/dist/all.js.map
# public/mix-manifest.json
|
2025-08-19 14:12:58 +01:00 |
|
|
snipe
|
cdd12df81a
|
Fixed #17627 - jquery UI fix for draggable/sortable
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 14:12:06 +01:00 |
|
|
snipe
|
3fb0804cef
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 13:57:36 +01:00 |
|
|
snipe
|
050a3afc74
|
Fixed #17649 - nicer layout on new location modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 13:56:21 +01:00 |
|
|
snipe
|
6811ebcd52
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 10:12:56 +01:00 |
|
|
Godfrey M
|
1fcf5e03e7
|
adds asset tag to subject line of checkin/out
|
2025-08-18 10:16:47 -07:00 |
|
|
snipe
|
8f575923cf
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-18 11:26:43 +01:00 |
|
|
snipe
|
21566560a7
|
Fixed #17367: Small adjustment to css-padlock
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 11:24:05 +01:00 |
|
|
snipe
|
0ecfd02649
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-18 11:00:30 +01:00 |
|
|
snipe
|
e3ca43bf40
|
Remove use of formatCurrencyOutput for input display
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 11:00:19 +01:00 |
|
|
snipe
|
0c35f213e1
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-17 14:54:43 +01:00 |
|
|
snipe
|
615e6d6e4f
|
Fixes #17606 - use getImageUrl() to determine if local or S3
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 14:51:52 +01:00 |
|
|
snipe
|
f68813af13
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-17 14:11:41 +01:00 |
|
|
snipe
|
aab7c3a840
|
Updated custom fields and fieldset pages to use standard delete modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:33:47 +01:00 |
|
|
snipe
|
02f1291e8f
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-15 14:41:24 +02:00 |
|
|
snipe
|
3d9580808b
|
Merge pull request #17524 from Godmartinz/add-category-and-model-to-checkout-emial
Adds #17507 Category and Model No. to accessory checkout markdown
|
2025-08-15 14:39:58 +02:00 |
|
|
snipe
|
42a28ea06b
|
Merge pull request #17593 from Godmartinz/add-admin-to-acceptance-emails
FIXED #17380 Adds Admin name to acceptance emails
|
2025-08-15 14:33:02 +02:00 |
|
|
snipe
|
92e4f6b5d9
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-15 14:31:53 +02:00 |
|
|
snipe
|
a78762e40b
|
Fixed #17600 - adds checkout date to accessories tab in user view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-15 14:29:55 +02:00 |
|
|
snipe
|
7b7738fbcc
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-15 14:24:30 +02:00 |
|
|
snipe
|
08a9554b3c
|
Merge pull request #17607 from Godmartinz/color-corrections-pt9000
Fixes #17488 more info text colors
|
2025-08-14 20:39:26 +02:00 |
|
|
Godfrey M
|
d79bd825ee
|
fix popover text color
|
2025-08-14 10:51:31 -07:00 |
|
|
Godfrey M
|
fe3d225cfa
|
fix tests
|
2025-08-14 09:15:19 -07:00 |
|
|
Godfrey M
|
dfe2a75d72
|
adds user that checked out item to acceptance emails
|
2025-08-12 15:34:46 -07:00 |
|
|
Godfrey M
|
ba85af11aa
|
adds serial to expiring assets report email
|
2025-08-12 14:59:20 -07:00 |
|
|
Godfrey M
|
db58b80d27
|
Merge branch 'develop' into add-category-and-model-to-checkout-emial
# Conflicts:
# app/Mail/CheckoutLicenseMail.php
|
2025-08-12 14:20:08 -07:00 |
|
|
snipe
|
f42a2d7457
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 20:45:38 +01:00 |
|
|
snipe
|
4038a22093
|
Added sidenav to filter on activated vs inactive users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 20:41:55 +01:00 |
|
|
snipe
|
d29619b67c
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 18:50:17 +01:00 |
|
|
snipe
|
ef35a0f2f1
|
Fixed #10284: Added mobile phone to users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:38:22 +01:00 |
|
|
snipe
|
ee830e0cb4
|
Merge remote-tracking branch 'origin/develop'
Signed-off-by: snipe <snipe@snipe.net>
# Conflicts:
# public/css/build/app.css
# public/css/build/app.css.map
# public/css/build/overrides.css
# public/css/build/overrides.css.map
# public/css/dist/all.css
# public/mix-manifest.json
|
2025-08-11 14:58:57 +01:00 |
|
|
snipe
|
23da5573f3
|
Fixed #11754 - nicer top menu dropdown alignment
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 14:56:43 +01:00 |
|
|
snipe
|
9b968baaa7
|
Show all icons, even if no results
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 14:14:15 +01:00 |
|
|
snipe
|
c93e35ec77
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 11:18:31 +01:00 |
|
|
snipe
|
c18a3e4266
|
Fixed #17562 - bootstrap table formater undefined
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 11:18:20 +01:00 |
|
|
snipe
|
9538a76232
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 06:26:29 +01:00 |
|
|
snipe
|
5840ef1c6f
|
Fixed #17560
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 06:26:15 +01:00 |
|
|
snipe
|
05876bb124
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-11 05:05:13 +01:00 |
|
|
snipe
|
4bf569758f
|
Cleans up a few rmore outes
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 05:05:00 +01:00 |
|
|
snipe
|
505148b024
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-10 20:51:27 +01:00 |
|