 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 |
|
|
snipe
|
9efb49d510
|
Merge pull request #17663 from Godmartinz/sub-out-translation
Fixes #17653 changes translation to administrator
|
2025-08-19 19:43:47 +01:00 |
|
|
Godfrey M
|
9eb686fe08
|
changes translation to administrator
|
2025-08-19 10:23:15 -07:00 |
|
|
snipe
|
e203d4dee3
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 14:49:00 +01:00 |
|
|
snipe
|
1488271a83
|
Added #8522 - depreciation info on Asset API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 14:48:48 +01:00 |
|
|
snipe
|
b47d773e13
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 14:34:32 +01:00 |
|
|
snipe
|
48bbf8d005
|
Merge pull request #17655 from uberbrady/add_category_indexes
Add new indexes to category_id and deleted_at
|
2025-08-19 14:26:38 +01:00 |
|
|
Brady Wetherington
|
e97b969d66
|
Add new indexes to category_id and deleted_at
|
2025-08-19 14:20:36 +01: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
|
551822ce7d
|
Merge pull request #17648 from grokability/possible-fix-for-#17641-map-mobile-via-scim
Fixed #17641: map mobile number via SCIM
|
2025-08-19 13:09:07 +01:00 |
|
|
snipe
|
4b8c371097
|
Updated true to false
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 12:59:28 +01:00 |
|
|
snipe
|
f6c64abc1a
|
Fixed #17641 - map mobile number via SCIM
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-19 11:41:02 +01:00 |
|
|
snipe
|
6811ebcd52
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-19 10:12:56 +01:00 |
|
|
snipe
|
7f9939a896
|
Merge pull request #17638 from Godmartinz/asset-tag-added-to-subject-line
Adds asset tag to subject line of check in check out
|
2025-08-19 09:36:25 +01:00 |
|
|
Godfrey M
|
1c99f2dfdd
|
readd doesntorequireacceptance() to test
|
2025-08-18 10:52:35 -07:00 |
|
|
Godfrey M
|
1974fccac3
|
add tag to other notification test
|
2025-08-18 10:48:39 -07:00 |
|
|
Godfrey M
|
911552035e
|
fix other test
|
2025-08-18 10:39:10 -07:00 |
|
|
Godfrey M
|
ff25d275ee
|
fix tests
|
2025-08-18 10:31:03 -07:00 |
|
|
Godfrey M
|
1fcf5e03e7
|
adds asset tag to subject line of checkin/out
|
2025-08-18 10:16:47 -07:00 |
|
|
snipe
|
4fe7bfb851
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-18 15:24:25 +01:00 |
|
|
snipe
|
9b4101855f
|
Undo double-float
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 15:24:15 +01:00 |
|
|
snipe
|
9253d894d3
|
Removed XSS-Protection header
@see https://developer.mozilla.org/en-US/docs/Web/HTTP/Reference/Headers/X-XSS-Protection#security_considerations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 13:30:53 +01:00 |
|
|
snipe
|
fb60985d03
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-18 12:47:19 +01:00 |
|
|
snipe
|
ebd79f22c7
|
Merge pull request #17636 from grokability/#17627-custom-fields-sorting
Fixed #17627: custom fields not sorting correctly
|
2025-08-18 12:47:03 +01:00 |
|
|
snipe
|
c1b139fb9a
|
Fixed #17627: custom fields not sorting correctly
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-18 12:31:03 +01: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
|
a88bcea8ca
|
Merge pull request #17635 from grokability/#17367-fixed-padlock-icon
Fixed #17367: Small adjustment to css-padlock
|
2025-08-18 11:25:55 +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
|
420aaf4f61
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-18 09:45: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
|
0c35f213e1
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-17 14:54:43 +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
|
f68813af13
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-17 14:11:41 +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
|
37a90d0ce9
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-15 15:07:29 +02:00 |
|