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

17439 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe
57a8630e99
Merge pull request #14162 from snipe/bug/sc-24511 
Fixed #14114 - correctly sort related fields for labels
 2024-01-24 21:37:20 +00:00
snipe
105d4899f5 Removed debug line 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 20:33:13 +00:00
snipe
0715f68c0e Merge remote-tracking branch 'origin/develop' 2024-01-24 20:18:43 +00:00
snipe
5909654fd4
Merge pull request #14163 from Godmartinz/ldap_test_table_fix 
Added overflow scroll to ldap test table
 2024-01-24 20:18:08 +00:00
Godfrey M
e175cdbfd7 adds table overflow scroll 2024-01-24 12:13:40 -08:00
snipe
896b16d4d5 Merge remote-tracking branch 'origin/develop' 2024-01-24 19:49:50 +00:00
snipe
5f8e63717d
Merge pull request #14058 from Godmartinz/ldap_test_table_fix 
Fixed Ldap sync test table and table data from overflowing
 2024-01-24 19:31:04 +00:00
Godfrey M
ada1a593a4 add google placeholder 2024-01-24 11:29:32 -08:00
snipe
2c7bbfa637 Added additional sort/order hidden fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:20 +00:00
snipe
ba680126bc Properly sort the results based on non-asset fields 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:09:06 +00:00
snipe
dd3b2da670 Updated variable names for clarity, remove the concat of order and sort 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 19:08:47 +00:00
Godfrey M
00f07ac2ce add translations, brush up code 2024-01-24 10:38:06 -08:00
snipe
165f9545ac
Merge pull request #13924 from snipe/bug/sc-20167 
Set qty mutators
 2024-01-24 18:21:06 +00:00
snipe
fff21416be
Merge pull request #14051 from akemidx/email_in_license_table 
Email in License Seat Table
 2024-01-24 15:37:43 +00:00
snipe
f760397837 Merge remote-tracking branch 'origin/develop' 2024-01-24 15:36:45 +00:00
snipe
dc84e0f3ae
Merge pull request #14161 from snipe/localizations/updated_with_new_strings 
Updated language strings
 2024-01-24 15:31:09 +00:00
snipe
8ca4c51186 Updated strings 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 15:29:39 +00:00
snipe
f247661f07
Merge pull request #14159 from snipe/fixes/not_array_typo 
Fixed english and attribute placeholder
 2024-01-24 14:59:57 +00:00
snipe
f73a55f9ab Fixed english and attribute placeholder 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:58: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
snipe
684264dac7
Merge pull request #14158 from snipe/fixes/moved_url_string_again 
Moved URL string to general
 2024-01-24 14:48:26 +00:00
snipe
e6f94cfebf Missed one 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:47:54 +00:00
snipe
c54eb22754 Moved URL string to general 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-24 14:46:52 +00:00
snipe
661cc2b460
Merge pull request #14131 from Godmartinz/label_engine_translations 
Adds translations for Label example
 2024-01-24 13:36:40 +00:00
snipe
36f8311204 Merge remote-tracking branch 'origin/develop' 2024-01-24 13:35:04 +00:00
snipe
25db35e41e
Merge pull request #14128 from snipe/jerm/upgrade-dot-php 
Add remote requirements checking to upgrade.php
 2024-01-24 13:23:10 +00:00
snipe
49dc1dd37a
Merge pull request #14132 from marcusmoore/chore/sc-24501 
Improved radio button values in custom report form
 2024-01-24 13:22:48 +00:00
snipe
bfc9be6b97
Merge pull request #14149 from snipe/dependabot/github_actions/develop/actions/cache-4 
Bump actions/cache from 3 to 4
 2024-01-24 13:22:08 +00:00
snipe
1b7885677a
Merge pull request #14155 from uberbrady/ldap_location_fixes 
Fix for LDAP syncing with base_dn and location_id and location [FD-39651]
 2024-01-24 13:21:46 +00:00
Brady Wetherington
3bc1b9038d Fix for LDAP syncing with base_dn and location_id and location 2024-01-24 11:54:29 +00:00
Marcus Moore
d65c0c8bea
Remove comma 2024-01-23 15:22:00 -08:00
Marcus Moore
2d5631284b
Indent 2024-01-23 15:19:36 -08:00
Marcus Moore
3952fc10a6
Re-render order number properly 2024-01-23 15:18:02 -08:00
Marcus Moore
0881301b6d
Fix language strings 2024-01-23 13:55:20 -08: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
Godfrey M
49021d277c if not location add default location 2024-01-23 13:33:57 -08:00
Godfrey M
f270672a3d added a location check, to prevent notif blowing up 2024-01-23 13:05:39 -08:00
Godfrey Martinez
b797795d37
Merge pull request #11 from Godmartinz/license_checkable 
adds consumable checkout  ms notification
 2024-01-23 11:22:02 -08:00
Godfrey M
7c529df49b adds consumable checkout ms notification 2024-01-23 11:21:20 -08:00
Godfrey Martinez
81e92228f3
Merge pull request #10 from Godmartinz/license_checkable 
adds licenses ms notifications
 2024-01-23 11:12:02 -08:00
Godfrey M
e969f8808c adds licenses ms notifications 2024-01-23 11:10:04 -08:00
Godfrey M
5a46ef5d5b adds Accessory Check in out Notifcations, 2024-01-22 15:30:15 -08:00
Marcus Moore
219540281f
Add trailing commas 2024-01-22 12:42:01 -08:00
Godfrey M
f049cf5b06 adds Asset Check Out Notification 2024-01-22 10:57:22 -08:00
dependabot[bot]
a1ccea4e34
Bump actions/cache from 3 to 4 
Bumps [actions/cache](https://github.com/actions/cache) from 3 to 4.
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](https://github.com/actions/cache/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/cache
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-22 08:50:37 +00: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
861ef6312e
Use is_iterable for checks instead of is_array 2024-01-18 13:04:41 -08:00
Marcus Moore
f64aa4dfd4
Improve variable name 2024-01-18 11:58:34 -08:00
snipe
2fa5eb4365
Merge pull request #14144 from snipe/fixes/updated_apple_url 
Updated URL for apple manufacturer
 2024-01-18 11:53:28 +00:00