ouyang/snipe-it
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,879 Commits 84 Branches 293 Tags
710f89291f414563eccb23d3e4790d64a8b331ea
Commit Graph

316 Commits

Author SHA1 Message Date
snipe
6015aeddee Merge pull request #17209 from Godmartinz/saml_xml_update_bug 
Fixed #17089: SAML metadata now updating with new XML uploads
 2025-06-23 16:40:35 +01:00
snipe
e8835fc2b1 Merge pull request #17096 from lukaskraic/feature/manager-view-v2 
Manager View Feature
 2025-06-17 16:24:40 +01:00
Godfrey M
ec059717f6 adds id to XML textbox, now updates 2025-06-16 16:01:11 -07:00
Lukas Kraic
84ec5aea26 Manager View Feature 2025-06-04 09:07:26 +02:00
Marcus Moore
12dc33244d Start storing admin_cc_always 2025-06-02 17:20:01 -07:00
snipe
407962d998 Merge pull request #16790 from Godmartinz/empty_field_columns_labels 
Adds Label fields offset as an option
 2025-05-05 14:09:40 +01:00
snipe
4469db0bd3 Livewire component for smoother check for location companies 
Signed-off-by: snipe <snipe@snipe.net>
 2025-05-05 13:55:28 +01:00
snipe
9f28dae01b Invoke the artisan command 
This *might* suck for people with a lot of assets, etc

Signed-off-by: snipe <snipe@snipe.net>
 2025-04-22 23:50:11 +01:00
Godfrey M
5da492cbf5 set max to 5 2025-04-22 12:07:02 -07:00
Godfrey M
d871c529d1 fix input max, and help block position 2025-04-22 11:59:19 -07:00
Godfrey M
7c2c5ea98d adds Field offset option to labels 2025-04-22 10:50:20 -07:00
snipe
548ae49c69 Small tweaks to table 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 15:30:07 +01:00
snipe
a96abeac5f Use localization w/trans_choice 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-08 15:12:58 +01:00
snipe
43c15ef134 Merge branch 'develop' into feature/locations_with_companies 2025-04-08 09:18:48 +01:00
snipe
d0f750edea Added pdf logo to the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2025-04-02 12:13:28 +01:00
snipe
d89f38bbfb Set defaults on save 
Signed-off-by: snipe <snipe@snipe.net>
 2025-03-04 20:38:33 +00:00
James M
112112d258 Feat: #14926 LDAP Active Flag - Add config option to make False = Enable 2025-02-27 10:52:12 -07:00
Brady Wetherington
bce2007b97 Fixes #16331 - Don't make passport:install command require user input 2025-02-25 16:38:40 +00:00
snipe
1fe170e6a1 Merge pull request #16040 from Godmartinz/template_validate_error 
Adds a null check to label templates, adds return types for validation methods
 2025-02-18 21:00:10 +00:00
Brady Wetherington
b7bd56daf7 Instead of saving TLS cache-files on save, cache them when used 2025-02-13 15:09:28 +00:00
Tobias Regnery
6921df9334 Check for inconsistencies before activating scoped locations 
Before activating scoped location all locations and their related objects will be checked.
If there are locations with different companies than the related objects error out.

Because this operation is quite slow, bail out on the first inconsistent entry.
There is a new artisan command introduced that checks every location.

Depending on the size of the database, this will take very long.

Signed-off-by: Tobias Regnery <tobias.regnery@gmail.com>
 2025-01-23 15:26:04 +01:00
snipe
b6f05bff1f Merge branch 'develop' into feature/locations_with_companies 2025-01-17 17:18:17 +00:00
Marcus Moore
4b2ede7a71 Use 0 for zerofill_count if nothing provided 2025-01-16 12:20:14 -08:00
Marcus Moore
96379d0a62 Use provided zerofill_count 2025-01-15 16:39:50 -08:00
Godfrey M
3ac0877418 remove try/catch, add rules for template 2025-01-14 09:50:43 -08:00
Godfrey M
0118504cd3 adds redirect to render and save if template is null 2025-01-08 15:32:23 -08:00
Godfrey M
833af55806 Merge branch 'develop' into barcode_settings_hide 2024-12-12 12:05:29 -08:00
Tobias Regnery
1318dc6111 Add a backward compatibility setting for locations with companies 
Now that locations have a company_id they get restricted to the users company with FullMultipleCompanySupport.
This breaks backward compatibility, because before everyone can handle locations without restrictions.
Add a setting right below FullMultipleCompanySupport so that everyone can switch to the desired behaviour.
The default is off and the existing behaviour is preserved.
 2024-11-04 10:03:38 +01:00
akemidx
5cb940c2ee Merge branch 'refs/heads/upstream/dev' into feature/sc-26415 2024-10-16 18:32:36 -04:00
snipe
3886da8941 Remove form request from get LDAP method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 22:15:49 +01:00
snipe
ded79469c1 Remove unused controller method 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 20:33:29 +01:00
snipe
aa55fa6ff4 Switch to form requests for settings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-10-09 18:16:34 +01:00
akemidx
700647c53f setting created 2024-10-02 18:15:52 -04:00
Godfrey M
44447b85c9 Merge branch 'develop' into barcode_settings_hide 2024-09-26 11:27:05 -07:00
Godfrey M
fa5651f335 remove getbarcodes, postbarcodes, barcodes settings blade 2024-09-17 16:21:26 -07:00
snipe
1582d81e5b Change user_id to created_by 
Signed-off-by: snipe <snipe@snipe.net>
 2024-09-17 22:16:41 +01:00
Godfrey M
033a56fe6d change variables in hardware labels edit post methods 2024-09-17 12:22:05 -07:00
Godfrey M
3682d9fa6c removed duplicate line from post labels 2024-09-17 11:23:59 -07:00
Godfrey M
ce987b4f6d added front end barcodes to labels 2024-09-17 11:23:38 -07:00
snipe
ec0b9b198f Merge pull request #15296 from uberbrady/expose_restore_sanitize 
Expose the 'sanitize' system for backup restores to the web GUI
 2024-08-22 12:43:07 +01:00
snipe
de29c1d8a0 Merge pull request #15314 from Glukose1/features/add_setting_due_for_checkin_in_days 
Added #15312: Add checkin due in days setting
 2024-08-16 10:21:36 +01:00
Glukose1
d8df52cc8f Implemented setting to specify the amount of days before an assets appers in the due for checkin page. Currently this uses the audit warning days but a sperated setting gives the possibility of defineing different values for each field. 2024-08-15 12:20:51 +02:00
Brady Wetherington
cc5ad456e6 Expose the 'sanitize' system for backup restores to the web GUI 2024-08-14 15:59:21 +01:00
Godfrey M
6b1784f2ee makes shortcuts optional 2024-08-07 10:47:16 -07:00
snipe
aab29fbb6b Use translated string for restore 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-26 16:47:40 +01:00
Brady Wetherington
7f7cfef81b Mark test as Incomplete, and downgrade error back to debug for tests 2024-07-23 20:24:05 +01:00
Brady Wetherington
5eea08088d Improve .env file checking to not validate SSL certificates 2024-07-23 16:03:02 +01:00
snipe
8fc5c0b5be Use other default avatar, not in the avatars directory 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 07:34:40 +01:00
snipe
241eb7b031 One more bad sig 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:06:27 +01:00
snipe
ca399794c3 Fixed incorrect signature 
Signed-off-by: snipe <snipe@snipe.net>
 2024-07-20 06:05:01 +01:00