 snipe
|
242aa60e04
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-06 16:26:14 +01:00 |
|
|
snipe
|
8095e0ab72
|
Normalize consumables user response
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-06 16:25:51 +01:00 |
|
|
snipe
|
7a3c2c27ff
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 23:19:38 +01:00 |
|
|
snipe
|
be3c8ddd5c
|
Hotfix for FD-50160
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 23:19:27 +01:00 |
|
|
snipe
|
5d124360c2
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 19:35:12 +01:00 |
|
|
snipe
|
a0d65520a3
|
Use count() instead of ->count() for user count in print view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 19:34:59 +01:00 |
|
|
snipe
|
365d7448d5
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 19:06:34 +01:00 |
|
|
snipe
|
a35731d9d5
|
Fixed #17513 - updated language string
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 19:06:08 +01:00 |
|
|
snipe
|
9a0102c723
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 19:03:00 +01:00 |
|
|
snipe
|
9d3623cca6
|
Merge pull request #17521 from grokability/#17518-add-break-after-sigs
Fixed #17518: Adds printer line break after signatures
|
2025-08-05 19:02:24 +01:00 |
|
|
snipe
|
2fe08a721f
|
Do not break the page if it’s the last entry
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 19:00:57 +01:00 |
|
|
snipe
|
d4a34f1a3c
|
Adds printer line break after signatures
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 18:50:47 +01:00 |
|
|
snipe
|
2f77f2cb2b
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 18:13:27 +01:00 |
|
|
snipe
|
ddda4848d3
|
Added avif to inline
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-05 18:13:17 +01:00 |
|
|
snipe
|
528e3a2106
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-05 17:48:12 +01:00 |
|
|
snipe
|
8516856d37
|
Merge pull request #17456 from spencerrlongg/9511-validation-always-fails-on-encrypted-custom-fields
Fixed #9511 - Validation For Encrypted Custom Fields
|
2025-08-05 17:45:38 +01:00 |
|
|
snipe
|
032a664d4c
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-04 22:27:59 +01:00 |
|
|
snipe
|
132327594b
|
Merge pull request #17515 from grokability/add-submenu-to-users
Added dropdown menu for users
|
2025-08-04 22:26:59 +01:00 |
|
|
snipe
|
d2a2c63070
|
Added dropdown menu for users
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-04 22:25:23 +01:00 |
|
|
snipe
|
aac1864c9b
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-04 21:23:41 +01:00 |
|
|
snipe
|
170a5158fa
|
Merge pull request #17514 from grokability/images-on-cloning
Added ability to copy images on cloning
|
2025-08-04 21:04:56 +01:00 |
|
|
snipe
|
1d8493d388
|
Improved messaging for cloning/editing assets that inherit images
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-04 20:51:24 +01:00 |
|
|
snipe
|
c3442033da
|
Removed debugging
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-04 18:49:07 +01:00 |
|
|
snipe
|
f1dd84edba
|
Added option to clone original images
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-04 18:47:26 +01:00 |
|
|
snipe
|
e3477f3306
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-02 18:41:39 +01:00 |
|
|
snipe
|
06b040a337
|
Nicer padding
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-02 18:41:26 +01:00 |
|
|
snipe
|
6620a4f87b
|
Merge remote-tracking branch 'origin/develop'
|
2025-08-02 14:47:09 +01:00 |
|
|
snipe
|
fa546ddc5b
|
Merge pull request #17510 from grokability/fixes-#17498-add-serial-to-acceptance
Fixed #17498 - added serial to user acceptance
|
2025-08-02 14:46:46 +01:00 |
|
|
snipe
|
f811352c79
|
Cleaned up HTML
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-02 14:46:34 +01:00 |
|
|
snipe
|
7ed8963b9f
|
Fixed #17498 - added serial to user acceptance
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-02 14:38:57 +01:00 |
|
|
snipe
|
c0e9dff5bf
|
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/js/dist/bootstrap-table.js
# public/mix-manifest.json
|
2025-08-01 23:13:22 +01:00 |
|
|
snipe
|
a9fc8b79fd
|
Merge pull request #17508 from grokability/add-table-buttons
Add table buttons and admin filter
|
2025-08-01 23:12:04 +01:00 |
|
|
snipe
|
afd794b4c7
|
Fixed HTML
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 22:20:17 +01:00 |
|
|
snipe
|
c4a28f0ec4
|
Use consistent icon for adding people
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 22:18:02 +01:00 |
|
|
snipe
|
db343bf795
|
Tweaked bootstrap admin indicators
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 22:15:13 +01:00 |
|
|
snipe
|
0157043dc5
|
Added table buttons to user view
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 21:58:48 +01:00 |
|
|
snipe
|
a947f9bd32
|
Fixed delete modal
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 21:30:18 +01:00 |
|
|
snipe
|
2a4181c7c3
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 21:19:18 +01:00 |
|
|
snipe
|
30192f5b14
|
Removed extra modal code
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 21:11:54 +01:00 |
|
|
snipe
|
c41b5e8844
|
Fixed license delete check
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 21:11:40 +01:00 |
|
|
snipe
|
b27928807b
|
Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 20:44:44 +01:00 |
|
|
snipe
|
16f1b5e23e
|
Added a few more buttons
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 19:31:25 +01:00 |
|
|
snipe
|
ed651b6869
|
Use translations
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:55:15 +01:00 |
|
|
snipe
|
b9d925c7aa
|
Carry admin/superadmin into the API request
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:49:58 +01:00 |
|
|
snipe
|
3650a29381
|
Added superadmin/admin formatter
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:49:37 +01:00 |
|
|
snipe
|
de84ee3693
|
Cleaned up asset view table
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:47:51 +01:00 |
|
|
snipe
|
42ba31591d
|
New formatter for icon
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:46:20 +01:00 |
|
|
snipe
|
a78a243e20
|
Added admin/superadmin filter to API
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:46:10 +01:00 |
|
|
snipe
|
38924ced4a
|
Provide the role so we can use it in the javascript
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:45:23 +01:00 |
|
|
snipe
|
5e8cc66f5c
|
Added scope for admins and superadmins
Signed-off-by: snipe <snipe@snipe.net>
|
2025-08-01 18:45:07 +01:00 |
|