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

14616 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
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
Godfrey M
cdcd868162 formats check in message for MS Teams 2024-01-17 17:31:23 -08:00
Godfrey M
ce02e43ab2 fixed integration link, added some conditionals 2024-01-17 16:30:27 -08:00
Godfrey M
9f2af40ef2 adds MS teams integration test 2024-01-17 13:41:45 -08:00
Godfrey M
93ef8317e8 added payload, new MS webhook test method 2024-01-17 11:49:31 -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
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
Jeremy Price
58b2f8ca17 typo 2024-01-11 19:12:24 -08:00
Jeremy Price
8be3c1aaf2 Quit the script when we hit hard errors 
a found a few other points where we talk about exiting and re-running
the script once fixed, but never actually exit. So i'm adding-in the
missing exits, and updating any existing exits to make sure we return a
failing return code to the shell
 2024-01-11 18:20:09 -08:00
Jeremy Price
2ee8639eaf Check to make sure there's a .env file 
While i was testing this, i noticed that it ran right by the .env check,
even though i don't have a .env file at all. The script checks for a
_bad_ .env, but not a missing one.

Now it does
 2024-01-11 18:18:41 -08:00
Jeremy Price
32605578dd Add remote requirements checking to upgrade.php 
quoted from https://github.com/snipe/snipe-it/pull/14127
    There is a race condition in the upgrade.php file where it can't
    currently know the hard requirements for the version it's upgrading to
    until it does a git pull. By that time, it will have pulled new source
    code that possibly relies on an incompatible version of php, leaving you
    with a broken installation.

    Example: You're running v6.2.x on PHP 7.4, which is fine. v7 requires
    PHP 8.1 or 8.2, but we couldn't know that when we released v6. or v5 for
    that matter. We could change the requirements in the most-recent v6
    version of upgrade.php, but that doesn't help anyone who doesn't upgrade
    first to the most recent v6.

With this change, we implement fetching and incorporating the
requirements data from the remote file.

It's just fetching/decoding a couple of json values that replace the
hard-coded version requirements.

We move the branch checking higher than the php version checking so that
we can use the defined/overridden $branch to decide what branch to pull
the requirements from.
 2024-01-11 18:13:59 -08:00
Jeremy Price
fe0bba6df6 rename upgrade requirements file and add snipeit version differentiation 
the latter mostly for testing and san checking.. but it doesn't really
matter because it's just json.. if we don't use it we don't use it
 2024-01-11 16:52:39 -08:00
Jeremy Price
5fdcd6298f rename php_max_major, because it's not.. it's major_minor, even if it sounds ridiculous 2024-01-11 16:50:16 -08:00