 Marcus Moore
|
12418ae91b
|
WIP: allow EU style purchase cost via api
|
2024-04-24 17:18:29 -07:00 |
|
|
Brady Wetherington
|
3f5c5cbe82
|
Merge branch 'develop' into snipeit_v7_laravel10
|
2024-04-24 16:24:43 +01:00 |
|
|
snipe
|
2439758ef3
|
Merge pull request #14587 from Godmartinz/License-export-button
Added a License Export function and button
|
2024-04-24 04:42:56 +01:00 |
|
|
akemidx
|
ac4aa97103
|
develop reheading
|
2024-04-23 17:05:50 -04:00 |
|
|
akemidx
|
0bc93c6a1e
|
space
|
2024-04-23 15:31:37 -04:00 |
|
|
snipe
|
685f1cbfb8
|
Merge pull request #14499 from Godmartinz/remove_encrpyt_from_labels
Removed encrypted fields from label options
|
2024-04-23 13:31:38 +01:00 |
|
|
snipe
|
bdd43b7134
|
Merge pull request #14602 from uberbrady/fix_saving_encrypted_custom_fields
Re-enabled updating encrypted custom fields via API [sc-41465]
|
2024-04-23 10:20:55 +01:00 |
|
|
Godfrey M
|
96b3af7cbc
|
fixed view from sending all custom fields
|
2024-04-22 18:27:34 -07:00 |
|
|
Godfrey M
|
5fc6771543
|
adds licenses available, updated teranslations
|
2024-04-22 17:58:49 -07:00 |
|
|
akemidx
|
0d049a0be7
|
conflict resolution
|
2024-04-22 20:09:40 -04:00 |
|
|
akemidx
|
01c24ab4cd
|
translating text
|
2024-04-22 19:16:14 -04:00 |
|
|
Godfrey M
|
14ddf36d46
|
removed two duplicate translations
|
2024-04-22 10:43:11 -07:00 |
|
|
Godfrey M
|
25f1167c9d
|
adds company scoping to license export
|
2024-04-22 10:38:55 -07:00 |
|
|
snipe
|
2aa3ce15bd
|
Removed escaping on notes for file uploads
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-22 14:55:02 +01:00 |
|
|
snipe
|
8dd71f99cc
|
Added ico, image/x-icon,image/vnd.microsoft.icon to favicon validation
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-22 13:54:19 +01:00 |
|
|
akemidx
|
e8d9701a26
|
array key existing
|
2024-04-17 19:16:25 -04:00 |
|
|
snipe
|
4450351b75
|
Only sync groups if API user is superadmin
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 11:06:50 +01:00 |
|
|
snipe
|
9bb15aaf1b
|
Added individual gates to keep response consistent with other company-ed things
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 10:57:49 +01:00 |
|
|
snipe
|
65dd729e19
|
Additional gates
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-17 10:57:20 +01:00 |
|
|
Brady Wetherington
|
67a8e0b5c6
|
This re-enables the ability to update encrypted custom fields via the API
|
2024-04-15 18:46:11 +01:00 |
|
|
snipe
|
710370ac24
|
Added scoping for destroy
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:58:25 +01:00 |
|
|
snipe
|
ed0a441e4d
|
Refactor destroy method
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:52:03 +01:00 |
|
|
snipe
|
460693c153
|
Added comment
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:40:13 +01:00 |
|
|
snipe
|
f54a94bd4c
|
Refactorered methods
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-11 14:40:00 +01:00 |
|
|
Marcus Moore
|
5567a1e9ac
|
Formatting
|
2024-04-10 17:37:11 -07:00 |
|
|
Marcus Moore
|
f28a82de71
|
Implement some tests, scaffold others
|
2024-04-10 17:27:07 -07:00 |
|
|
Marcus Moore
|
7c2fae7b9d
|
Scaffold api test cases
|
2024-04-10 17:08:45 -07:00 |
|
|
Marcus Moore
|
4434de6241
|
Add test case
|
2024-04-10 15:47:26 -07:00 |
|
|
Godfrey M
|
a2bca0e358
|
fixed comments
|
2024-04-10 15:05:21 -07:00 |
|
|
Marcus Moore
|
6d572424ac
|
Add validation around dates
|
2024-04-10 14:02:25 -07:00 |
|
|
Marcus Moore
|
7dbf8a8a8e
|
Add tests for asset and location check out
|
2024-04-10 13:28:52 -07:00 |
|
|
Godfrey M
|
0849262243
|
fixed notes
|
2024-04-10 12:19:34 -07:00 |
|
|
Godfrey M
|
17095feb33
|
fix typo
|
2024-04-10 12:15:48 -07:00 |
|
|
Godfrey M
|
f42ae46338
|
exports all licenses
|
2024-04-10 12:14:44 -07:00 |
|
|
Godfrey M
|
e2679852ce
|
added export button, half the logic for export method
|
2024-04-10 11:31:30 -07:00 |
|
|
Marcus Moore
|
deaba46e1c
|
Merge branch 'develop' into chore/sc-25103/add-tests-around-asset-checkout
|
2024-04-10 11:01:35 -07:00 |
|
|
snipe
|
adacdc038d
|
Apply company scoping for users
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-10 12:34:32 +01:00 |
|
|
snipe
|
e11287ec25
|
Redirect on checkin if the asset is already checked in
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 15:00:55 +01:00 |
|
|
snipe
|
a72d4e5dc1
|
Fixed ambiguous id clause in custom report
Signed-off-by: snipe <snipe@snipe.net>
|
2024-04-04 14:23:58 +01:00 |
|
|
Godfrey M
|
08f9aae8ae
|
adds note to log listener and checkout accept notif
|
2024-04-03 11:59:47 -07:00 |
|
|
Godfrey M
|
ce1d677cdc
|
adds note to acceptance
|
2024-04-03 11:36:03 -07:00 |
|
|
Godfrey M
|
bb2c73348d
|
only grabs custom Fields that are not encrpyted
|
2024-04-03 11:03:58 -07:00 |
|
|
Godfrey M
|
4327653d70
|
remove db cleaner for encrypted selections
|
2024-04-03 10:57:41 -07:00 |
|
|
Brady Wetherington
|
65e21faa3e
|
Merge branch 'develop' into snipeit_v7_laravel10
Hopefully, last merge?
|
2024-04-02 20:34:04 +01:00 |
|
|
snipe
|
f42e5d5292
|
Reverting the store/update asset API responses for now
This currently breaks the Jamf integration - need a better longer term plan.
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-28 21:58:49 +00:00 |
|
|
akemidx
|
721902c2d4
|
committed for later
|
2024-03-28 16:44:44 -04:00 |
|
|
snipe
|
1f2d30ebf4
|
Check that the array key exists
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-28 12:25:29 +00:00 |
|
|
akemidx
|
e6b366020a
|
lots of attempts and syntax, but no go
|
2024-03-27 19:05:59 -04:00 |
|
|
snipe
|
86677b5f13
|
Make last_checkin sortable
Signed-off-by: snipe <snipe@snipe.net>
|
2024-03-27 20:37:25 +00:00 |
|
|
Robert Spadaro
|
ccd00caa70
|
Wrap where logic in additional where statement to protect appended params
|
2024-03-27 15:36:00 -04:00 |
|