 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
|
61abb8d5cb
|
Fixed hardware.bulkedit redirect
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 09:45:02 +01:00 |
|
|
snipe
|
ecad656551
|
Merge pull request #17626 from grokability/#17606-s3-url-for-models-on-requestable-view
Fixed #17606 - use `getImageUrl()` to determine if local or S3
|
2025-08-17 14:54:13 +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
|
6dceefb96e
|
Merge pull request #17625 from grokability/#17620-delete-method-custom-fields
Fixed #17620 - delete method custom fields causing method not allowed error
|
2025-08-17 14:11:17 +01:00 |
|
|
snipe
|
69eff394fd
|
Removed use statement
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 14:06:56 +01:00 |
|
|
snipe
|
a9da3aca81
|
Combine fields and fieldset exception
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 14:06:49 +01:00 |
|
|
snipe
|
91f3556375
|
Added delete test
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:33:53 +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
|
9c823119e3
|
Added new factories for user custom field permissions
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:31:14 +01:00 |
|
|
snipe
|
f5128833f6
|
Updated comments
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:30:52 +01:00 |
|
|
snipe
|
2bc144354a
|
Use translations and more standard error bag
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:30:43 +01:00 |
|
|
snipe
|
e6fec6ec34
|
Trim model name for display
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-17 13:30:28 +01:00 |
|
|
snipe
|
53389875bf
|
Merge pull request #17611 from grokability/#9965-fallback-to-category-image-for-consumables
Fixed #9965 - fallback to category images (f there are any) when no c…
|
2025-08-15 15:07:13 +02:00 |
|
|
snipe
|
3b243b38c8
|
Fixed #9965 - fallback to category images (f there are any) when no consumable image is present
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-15 15:03:09 +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
|
2141ee71d4
|
Merge pull request #17544 from marcusmoore/fixes/custom-field-filter
Fixed invalid custom fields being used for filtering
|
2025-08-15 14:39:09 +02:00 |
|
|
snipe
|
01dd07083e
|
Merge pull request #17584 from spencerrlongg/bug/17312-custom-field-checkbox-will-not-clear-if-no-checkboxes-should-be-selected
Fixed #17312 - Fix Nulling Checkboxes
|
2025-08-15 14:35:37 +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
|
180cb6ba8e
|
Merge pull request #17610 from grokability/#17600-add-checkout-date-to-accessory-list
Fixed #17600 - adds checkout date to accessories tab in user view
|
2025-08-15 14:31:38 +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
|
9797bb19e2
|
Updated dev assets
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-15 14:23:22 +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 |
|
|
snipe
|
376e0db66e
|
Merge pull request #17601 from ubc-cpsc/bugfix/CVE-2025-55166
Fixes CVE-2025-55166
|
2025-08-13 20:49:41 +02:00 |
|
|
Joël Pittet
|
5fdabc1a62
|
Fixes CVE-2025-55166
|
2025-08-13 11:42:14 -07:00 |
|
|
Godfrey M
|
dfe2a75d72
|
adds user that checked out item to acceptance emails
|
2025-08-12 15:34:46 -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 |
|
|
Godfrey M
|
5cb8aae383
|
add ternaries
|
2025-08-12 14:16:46 -07:00 |
|
|
spencerrlongg
|
817530429b
|
added condition to make sure the request has checkbox
|
2025-08-12 14:52:52 -05:00 |
|
|
Marcus Moore
|
4a7b7183d2
|
Add custom_fields. prefix so custom fields can be filtered against
|
2025-08-11 14:58:41 -07:00 |
|
|
snipe
|
94bd39cf23
|
Merge pull request #17570 from grokability/#10038-add-active-flag-filter
Added sidenav to filter on activated vs inactive users
|
2025-08-11 20:45:22 +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
|
682baec0c9
|
Merge pull request #17569 from grokability/#10284-add-mobile-number
Fixed #10284: Added mobile phone to users
|
2025-08-11 18:49:49 +01:00 |
|
|
snipe
|
ff91be491d
|
Added mobile to tests
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:43:37 +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
|
f12a3bb08b
|
Fixed #10306 - cast purchase cost to a float
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 18:12:37 +01:00 |
|
|
snipe
|
c8a5065ffa
|
Merge pull request #17567 from grokability/#11754-nicer-menu-alignment
Fixed #11754: nicer menu alignment for dropdowns
|
2025-08-11 14:57:59 +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
|
b08f985776
|
Merge pull request #17566 from grokability/partial-fix-for-#17565-standard-layout
Show all icons on location table, even if no results
|
2025-08-11 14:17:59 +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
|
07edbe6f1c
|
Add @mckaygerhard as a contributor
|
2025-08-11 13:08:54 +01:00 |
|
|
snipe
|
1f55a8b6e3
|
Added icon and tooltip
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 13:06:37 +01:00 |
|
|
snipe
|
f6b9e11810
|
Merge pull request #17538 from mckaygerhard/mail-log-improvements
Mail log for #17491 and some improvements on log errors
|
2025-08-11 13:05:56 +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
|
5840ef1c6f
|
Fixed #17560
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-11 06:26:15 +01:00 |
|
|
snipe
|
7974baddf5
|
Merge pull request #17551 from grokability/move-file-uploads-paths-to-base-controller
Move the object type mapping and such to the base controller to de-dupe
|
2025-08-11 05:44:39 +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
|
f56fd9bb0b
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-10 21:04:33 +01:00 |
|