lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
11230 commits 1 branch 0 tags 220 MiB
Commit graph

4432 commits

Author SHA1 Message Date
snipe
bfd674b622 Switched to getFullNameAttribute() from fullName() in User Presenter 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:12:25 +01:00
snipe
354550b52e Removed getCompleteNameAttribute(), modified getFullNameAttribute() 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:11:17 +01:00
snipe
f3460b5a4f Switch to getFullNameAttribute() in user transformer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:48 +01:00
snipe
474c03e3fc Added name order to settings save controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-21 20:10:03 +01:00
snipe
45898deb1a Don’t 500 if the 1D barcode doesn’t match the format requested - log an error instead 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:38 +01:00
snipe
ffc7c4e99a use number format to constrain large number displays 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:18:09 +01:00
snipe
1e82c2bfad Changed example asset name 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 22:17:54 +01:00
snipe
d12f4564e1 Added Dymo Labelwriter template 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:44:12 +01:00
snipe
1dcca14c37 Values are not sortable, so don’t show them as sortable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 21:21:54 +01:00
snipe
d56c671410 Removed the black label from around the default labels 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:39:00 +01:00
snipe
0cb76a049a Make sure the columns and rows can never be 0 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 18:13:16 +01:00
snipe
da2f22d504 Fixed #13487 - include supplier url in listing 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-18 15:31:15 +01:00
snipe
0ee032a10d
Merge pull request #13391 from Godmartinz/ldap_sync_field_clear_bug 
Fixed Ldap sync field clear bug
 2023-08-17 17:45:03 +01:00
snipe
03a01c02c4
Merge pull request #13483 from inietov/fixes/default_locations_advanced_search 
Fixed #13359 Advanced search by Default Location does not work
 2023-08-17 15:15:21 +01:00
Ivan Nieto Vivanco
b607a59875 Add query to search default locations in advanced search 2023-08-16 15:04:17 -06:00
snipe
34f2221b02
Merge pull request #13471 from inietov/fixes/components_search 
Fixed #13409 Search in component detail view not working
 2023-08-16 21:59:40 +01:00
Brady Wetherington
852e9ff311 Accessory checkin via API reported wrong target user 2023-08-16 13:03:37 +01:00
Ivan Nieto Vivanco
92df32dfaa Move a couple assignation of variables inside an else to only execute once 2023-08-15 21:10:48 -06:00
snipe
027afa71f1 Check that there is a company before trying to get name property 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-16 01:09:22 +01:00
Ivan Nieto Vivanco
993918f47c Add query to search into the per-component view 2023-08-15 15:31:36 -06:00
snipe
01ab360ef3 Fixed accessory clone typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:39:09 +01:00
snipe
9af850dbaa Re-apply a change that was dropped 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 20:27:47 +01:00
snipe
64342838fd Return the user to the labels page on save 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:48:12 +01:00
snipe
443adc50da Fixed unclosed brace 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 18:12:25 +01:00
snipe
e41368daac
Merge pull request #12050 from cram42/develop 
New Label Engine
 2023-08-15 17:58:57 +01:00
Godfrey M
d1efca2ae1 fixes conflicts 2023-08-15 09:28:42 -07:00
snipe
c56f664811
Merge pull request #13442 from Robert-Azelis/Robert-Azelis-patch-add_email_to_companies 
Add email to companies
 2023-08-15 13:26:20 +01:00
snipe
12e9d2adeb Fixed #13450 - remove escaping on saveing new custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-14 22:21:41 +01:00
Robert-Azelis
30d33310ae
Update CompanyPresenter.php 2023-08-13 17:23:33 +02:00
Robert-Azelis
bbb8ecfee4
Update Company.php 2023-08-13 17:21:55 +02:00
Robert-Azelis
8988a5dfc3
Update CompaniesTransformer.php 2023-08-13 17:20:15 +02:00
Robert-Azelis
ed5b4ca0a2
Update CompaniesController.php 2023-08-13 17:18:25 +02:00
Robert-Azelis
07bafa9508
Update CompaniesController.php 2023-08-13 17:15:20 +02:00
snipe
df8f6a8d2b Correctly call the route for accessory index 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-11 09:40:49 +01:00
Marcus Moore
e0b464dcec
Merge branch 'develop' into feature/custom-report-scoping 2023-08-09 13:03:05 -07:00
snipe
a6a742d8d8
Merge pull request #13407 from marcusmoore/feature/sc-23465 
Added messaging to category edit page to improve clarity around when users will be emailed
 2023-08-09 10:36:19 +01:00
Marcus Moore
c32f099053
Remove unneeded call to Company::scopeCompanyables 2023-08-08 17:22:15 -07:00
Brady Wetherington
6afbf1b152 Re-add the option for asset_eol_date as an import field 2023-08-08 17:45:33 +01:00
Marcus Moore
ae9cf1e5b6
Formatting 2023-08-02 18:24:32 -07:00
Marcus Moore
3fd0853fd0
Ensure eula field enabled when not using default eula 2023-08-02 18:02:56 -07:00
Marcus Moore
896f038054
Set send email back to original value when eulas cleared 2023-08-02 17:03:56 -07:00
Marcus Moore
48979ce177
Disable send email when it should not be modified 2023-08-02 16:52:56 -07:00
Marcus Moore
e12935f7fa
Disable eula textarea when using global eula 2023-08-02 16:18:57 -07:00
Marcus Moore
6400034435
Improve variable name 2023-08-02 16:06:59 -07:00
Marcus Moore
269414e4f2
Automatically check the send email to user checkbox in certain conditions 2023-08-02 16:04:01 -07:00
Marcus Moore
dee6ebf8e0
Scaffold component test 2023-08-02 12:58:07 -07:00
Marcus Moore
105c94aea9
Implement toggling message when email will be sent 2023-08-02 11:36:20 -07:00
Brady Wetherington
0af205dade Put guard around assigning location via LDAP 2023-08-02 15:01:14 +01:00
Marcus Moore
6349d52803
WIP: migrate to livewire 2023-08-01 17:29:23 -07:00
Godfrey M
8a24a47475 removed unnecessary code 2023-08-01 09:45:48 -07:00