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 |
|
snipe
|
aceb072a1b
|
Updated URL for apple manufacturer
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-18 11:49:30 +00:00 |
|
snipe
|
0fbf154187
|
Merge remote-tracking branch 'origin/develop'
|
2024-01-18 10:50:12 +00:00 |
|
snipe
|
2a7be4dfd5
|
Merge pull request #14143 from fe80/feat/redis-database
feat(config): add REDIS_DATABASE support
|
2024-01-18 10:49:32 +00:00 |
|
fe80
|
f52b17cca6
|
feat(config): add REDIS_DATABASE support
Add the possibility to set the redis database to use.
The default value is still 0
|
2024-01-18 11:32:51 +01:00 |
|
Godfrey M
|
befab608f2
|
cha cha cha changes
|
2024-01-17 17:59:20 -08:00 |
|
Marcus Moore
|
786c41ad79
|
Add some type hints
|
2024-01-17 17:41:03 -08:00 |
|
Marcus Moore
|
b24d80680e
|
Add clarifying comments
|
2024-01-17 17:32:35 -08:00 |
|
Godfrey M
|
cdcd868162
|
formats check in message for MS Teams
|
2024-01-17 17:31:23 -08:00 |
|
Marcus Moore
|
1a1f417633
|
Change variable name to keep foreach scoped
|
2024-01-17 17:00:03 -08:00 |
|
Marcus Moore
|
bbfee27fd3
|
Implement test
|
2024-01-17 16:40:05 -08:00 |
|
Godfrey M
|
ce02e43ab2
|
fixed integration link, added some conditionals
|
2024-01-17 16:30:27 -08:00 |
|
Marcus Moore
|
691e81d827
|
Implement some tests
|
2024-01-17 16:25:28 -08:00 |
|
Godfrey M
|
9f2af40ef2
|
adds MS teams integration test
|
2024-01-17 13:41:45 -08:00 |
|
Marcus Moore
|
0ac1dd314a
|
Organize tests
|
2024-01-17 13:19:54 -08:00 |
|
Marcus Moore
|
82f4cc799b
|
Improve variable name
|
2024-01-17 11:54:37 -08:00 |
|
Godfrey M
|
93ef8317e8
|
added payload, new MS webhook test method
|
2024-01-17 11:49:31 -08:00 |
|
Marcus Moore
|
4d8d069bbc
|
Update placeholder
|
2024-01-17 11:43:34 -08:00 |
|
Marcus Moore
|
5a396cc997
|
Add assertion
|
2024-01-17 11:24:50 -08:00 |
|
Marcus Moore
|
0883321d9e
|
Only limit template creator scope when authenticated
|
2024-01-17 11:24:38 -08:00 |
|
snipe
|
99000fada1
|
Merge pull request #14127 from snipe/jerm/upgrade-deps-file
Add php version requirements file for future-proofing upgrades
|
2024-01-17 13:15:56 +00:00 |
|
akemidx
|
2768f19b7c
|
code cleanup
|
2024-01-16 18:56:29 -05:00 |
|
Marcus Moore
|
8aa5cf530b
|
Improve radio button values in custom report form
|
2024-01-16 12:33:16 -08:00 |
|
Godfrey M
|
6be8c063a9
|
added moar translations
|
2024-01-16 12:05:09 -08:00 |
|
Godfrey M
|
74dc17b4b9
|
adds translations for Label example
|
2024-01-16 10:47:45 -08:00 |
|
snipe
|
2ae5029bc4
|
Merge remote-tracking branch 'origin/develop'
|
2024-01-15 16:11:59 +00:00 |
|
snipe
|
adba2d5b6c
|
Remove 7 day padding for expected assets
Signed-off-by: snipe <snipe@snipe.net>
|
2024-01-15 16:11:31 +00:00 |
|