Commit graph

1397 commits

Author SHA1 Message Date
snipe
0bd27d61b0 Added created_by to groups table
Signed-off-by: snipe <snipe@snipe.net>
2024-02-28 08:15:59 +00:00
Godfrey M
ef52777ffb removed conditional 2024-02-27 11:33:00 -08:00
Godfrey M
b67ceab849 fields appear in preview, but not bulk generate labels 2024-02-27 11:29:19 -08:00
Godfrey M
6ee24a7527 remove unnecessary code reformat 2024-02-22 12:36:27 -08:00
Godfrey M
e2dcee1959 cleans up dead code 2024-02-22 12:26:57 -08:00
Godfrey M
4fbea9512f puts textY inside of the forloop 2024-02-22 12:08:47 -08:00
Godfrey M
b7850ab839 puts textY outside of the forloop 2024-02-22 12:08:04 -08:00
Godfrey M
c62758c5b5 adds custom field select to default label view 2024-02-22 11:36:39 -08:00
snipe
cb78451d6c Made website searchable on users table
Signed-off-by: snipe <snipe@snipe.net>
2024-02-22 16:13:54 +00:00
Brady Wetherington
8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
2024-02-21 20:22:28 +00:00
snipe
04891c7c61 Eager load relations to determine
Signed-off-by: snipe <snipe@snipe.net>
2024-02-20 22:25:00 +00:00
snipe
a6a65b7523 Fixed locations isDeletable check
Signed-off-by: snipe <snipe@snipe.net>
2024-02-20 16:40:09 +00:00
snipe
b871813cfd
Merge pull request #14172 from spencerrlongg/bug/sc-23514
Resolve Duplicate Activity Logs for Imports
2024-02-15 09:54:43 +00:00
spencerrlongg
72c118a70f cleanup 2024-02-14 11:41:46 -06:00
snipe
71ebade641 Added serial and status to searchable relations
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:59:10 +00:00
snipe
03df4cec45 Fixed typo
Signed-off-by: snipe <snipe@snipe.net>
2024-02-14 09:46:43 +00:00
spencerrlongg
25241542d2 progress, going to sleep 2024-02-14 02:12:31 -06:00
spencerrlongg
57a75e68b9 maybe i do the inverse here? 2024-02-14 00:52:50 -06:00
spencerrlongg
dcf2168454 initial stuff, need to switch branches 2024-02-13 19:35:37 -06:00
spencerrlongg
d55358652b cleanup for pr 2024-02-13 13:45:56 -06:00
spencerrlongg
bcfa913450 condition makes this work, needs more testing 2024-02-07 20:03:37 -06:00
Marcus Moore
9e6e2de71e
Add docblock 2024-02-05 12:49:29 -08:00
snipe
d965fe759a Fixed #14211 - duplicate array key ldap_emp_num
Signed-off-by: snipe <snipe@snipe.net>
2024-02-05 12:28:24 +00:00
spencerrlongg
63e733f0d6 changes from a note to a source 2024-01-30 15:14:59 -06:00
Brady Wetherington
8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10
A lot of changes here, but hopefully this works?
2024-01-29 22:12:58 +00:00
spencerrlongg
4a7df470f0 this works 2024-01-25 19:34:41 -06:00
spencerrlongg
c9101f4d97 initial work, not working yet 2024-01-25 18:18:24 -06:00
snipe
d6c61e1429 Removed attribute assigning blank EOL as 0
Signed-off-by: snipe <snipe@snipe.net>
2024-01-25 21:34:20 +00:00
snipe
85a158eaef
Merge pull request #14170 from uberbrady/saml_nonce_storage
Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute [FD-37019]
2024-01-25 20:14:40 +00:00
Brady Wetherington
81b8243e1d Enforce SAML assertion ID uniqueness and notValidOnOrAfter attribute 2024-01-25 19:53:24 +00:00
snipe
165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167
Set qty mutators
2024-01-24 18:21:06 +00:00
snipe
7668a6767d
Merge pull request #14102 from Godmartinz/seat-id-is-zero
Fixed license seats id turning to zero when sorting by department
2024-01-24 14:49:33 +00:00
Marcus Moore
530ea474d1
Merge branch 'develop' into saving_custom_report_template
# Conflicts:
#	resources/lang/en/admin/reports/general.php
#	resources/views/reports/custom.blade.php
2024-01-23 13:55:07 -08:00
Marcus Moore
b74115b604
Add docblocks 2024-01-18 15:42:52 -08:00
Marcus Moore
1630392953
Uncheck a couple boxes by default to match existing behavior 2024-01-18 13:30:51 -08:00
Marcus Moore
f64aa4dfd4
Improve variable name 2024-01-18 11:58:34 -08:00
Marcus Moore
b24d80680e
Add clarifying comments 2024-01-17 17:32:35 -08:00
Marcus Moore
691e81d827
Implement some tests 2024-01-17 16:25:28 -08:00
Marcus Moore
0883321d9e
Only limit template creator scope when authenticated 2024-01-17 11:24:38 -08:00
Marcus Moore
d72970b5b6
Add global scope to limit template to current user 2024-01-11 13:59:51 -08:00
Marcus Moore
e5fb888d67
Implement test 2024-01-11 13:34:20 -08:00
snipe
b94aaad9b5 Search on supplier name attached to maintenance
Signed-off-by: snipe <snipe@snipe.net>
2024-01-10 13:16:07 +00:00
Godfrey M
4184b271f7 adds Supplier as a searchable relation on the asset maintenance report 2024-01-08 14:22:35 -08:00
Brady Wetherington
f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
Godfrey M
43737263d4 removed that clause 2024-01-04 14:32:03 -08:00
Godfrey M
07eeaea3bf adds an additional clause 2024-01-04 14:30:59 -08:00
Godfrey M
249ff868e5 removes empty seats when sorting by department 2024-01-04 14:26:07 -08:00
Spencer Long
8546407083
Merge branch 'develop' into refactor/store_asset_form_request 2024-01-02 18:05:15 -06:00
Marcus Moore
fcef60445c
Implement radioValue properly 2023-12-21 18:07:46 -08:00
Marcus Moore
9e0897b2cb
Remove old comments 2023-12-21 17:40:26 -08:00