DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
15155 commits 95 branches 267 tags 294 MiB
Commit graph

868 commits

Author SHA1 Message Date
Brady Wetherington 8f2843bfcf Merge branch 'develop' into snipeit_v7_laravel10 
Had to re-generate composer.lock, and re-do package.json and rebuild assets as well.
 2024-02-21 20:22:28 +00:00
snipe 9221641bba Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-02-15 14:50:37 +00:00
snipe 6bca1e3b22 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-02-15 14:48:07 +00:00
Brady Wetherington 8a2f3405d5 Merge branch 'develop' into snipeit_v7_laravel10 
A lot of changes here, but hopefully this works?
 2024-01-29 22:12:58 +00:00
snipe 86c625ed8f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-01-27 15:12:03 +00:00
snipe 3da7876631 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-27 15:08:52 +00:00
snipe 9136415bb2 Merge remote-tracking branch 'origin/develop' 2024-01-26 15:58:21 +00:00
Brady Wetherington 401e1842ee Fixed pluralization bug due to dashed-locale names instead of underscored 
Our locale directories are named things like 'en-US'. But the pluralization
code used by Laravel (through Symfony) requires locale names to be
in the format en_US. This change introduces a new Translator,
SnipeTranslator, which is a tiny set of changes against the built-in
one. It additionally adds a SnipeTranslationServiceProvider, which
loads up the new Translator.
 2024-01-26 15:40:55 +00:00
snipe 0fbf154187 Merge remote-tracking branch 'origin/develop' 2024-01-18 10:50:12 +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
Brady Wetherington f734e196e5 Merge branch 'develop' into snipeit_v7_laravel10 2024-01-08 18:57:55 +00:00
snipe c8816354ae Updated assets for master 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:28:54 +00:00
snipe 42d35174b2 Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-03 23:25:56 +00:00
snipe 8bc5f08da5 Fixed a few more small localization issues 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-24 20:14:49 +00:00
snipe 2a4eff2e90 Remove env var option for config on fallback 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-20 01:03:11 +00:00
snipe a0553f4c33 Update fallback locale to new locale code 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-20 01:01:59 +00:00
Brady Wetherington 6210716199 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-27 13:04:39 +00:00
snipe 84d26fe7fa Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	package-lock.json
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2023-11-23 16:53:13 +00:00
snipe ea55daf913 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 16:51:39 +00:00
snipe 776b16d379 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-11-22 23:41:31 +00:00
snipe 6409018b08 Bumped hash and moved to pre version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-22 23:41:03 +00:00
Brady Wetherington f64b0d3818 Merge branch 'develop' into snipeit_v7_laravel10 2023-11-14 16:00:29 +00:00
snipe 39c06802aa Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-11-03 14:07:46 +00:00
snipe 8c316e0bd3 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-03 14:07:15 +00:00
Brady Wetherington 3d5847f4b3 Merge branch 'develop' into snipeit_v7_laravel10 2023-10-16 23:37:13 +01:00
snipe 55d0c4021d Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-10-16 20:19:03 +01:00
snipe 2218cff7bc Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-16 20:18:33 +01:00
Brady Wetherington db400dffb5 Merge branch 'develop' into snipeit_v7_laravel10 
Rebuild assets and re-install from npm
 2023-10-16 20:13:59 +01:00
snipe d9a1dab827 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-10-06 20:17:59 +01:00
snipe 25a5507d9d Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-06 20:07:35 +01:00
Brady Wetherington 7a5714cc85 Merge branch 'develop' into snipeit_v7_laravel10 2023-10-03 20:37:17 +01:00
snipe 4e6764428e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-10-02 14:29:59 +01:00
snipe c7b8880d69 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-10-02 14:28:59 +01:00
snipe 16498fdcf8 Merge remote-tracking branch 'origin/develop' 2023-09-25 13:46:33 +01:00
snipe 81a982fd77
Merge pull request #13650 from snipe/features/more_info_in_settings 
Features/more info in settings
 2023-09-25 13:46:00 +01:00
snipe 13bee63fe9 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-09-25 10:59:09 +01:00
snipe f6317695f9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-25 10:58:14 +01:00
snipe 456d55c3bd Added some mail settings to /settings for easier reference 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-21 16:14:47 +01:00
snipe 9bd357e2d4 Merge remote-tracking branch 'origin/develop' 2023-09-15 12:52:59 +01:00
snipe 52a77f4c31 Use relative path in backups for cleaner directory structure 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 12:50:00 +01:00
snipe cce90c6ce0 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-09-15 09:43:25 +01:00
snipe 4e0e1a2c85 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 09:42:27 +01:00
Brady Wetherington 3500217f94 Merge branch 'develop' into snipeit_v7_laravel10 2023-08-31 13:07:06 +01:00
snipe 305804f260 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	package-lock.json
#	public/css/dist/all.css
#	public/js/dist/all-defer.js
#	public/mix-manifest.json
 2023-08-30 15:50:09 +01:00
snipe fbc04cfd47 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-30 15:07:38 +01:00
snipe 0f43388a2b Merge remote-tracking branch 'origin/develop' 2023-08-28 20:40:12 +01:00
snipe 82981290d4 Use int not string if no DB_PORT specified 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-28 19:34:08 +01:00
snipe 8810059427 Merge remote-tracking branch 'origin/develop' 2023-08-16 01:40:06 +01:00
Brady Wetherington 8b52bad16f Merge branch 'develop' into snipeit_v7_laravel10 2023-08-15 21:25:16 +01:00
snipe 24a3e0ee83 Added LOGIN_AUTOCOMPLETE as env var 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-15 01:56:01 +01:00
snipe 4b2bf057c7 Merge remote-tracking branch 'origin/develop' 2023-08-08 12:57:27 +01:00
snipe 94bef046b8 Added mailgun endpoint option, defaulting to the US 
Signed-off-by: snipe <snipe@snipe.net>
 2023-08-08 12:50:38 +01:00
snipe c52a1f94dc Merge remote-tracking branch 'origin/develop' 2023-08-02 15:19:23 +01:00
Brady Wetherington daed0b60bc Merge branch 'develop' into snipeit_v7_laravel10 2023-07-31 19:40:56 +01:00
snipe 2e1c3fb51b
Merge pull request #13295 from inietov/fixes/admins_cannot_view_encrypted_fields 
Fixed #11794 Admins Cannot View Encrypted Field
 2023-07-31 13:08:28 +01:00
Ivan Nieto Vivanco 3b4a2b0f5b Add permission to view and modify encrypted custom fields 2023-07-19 14:57:57 -06:00
Brady Wetherington 605d267fe8 Merge branch 'develop' into snipeit_v7 2023-07-19 11:47:51 +01:00
snipe 66875ff0dc Merge remote-tracking branch 'origin/develop' 2023-07-13 12:59:30 +01:00
snipe 5d60a38a0e Added comment with link 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:08:20 +01:00
snipe c1c2c38995 Fixed #13256 - Added option to switch to localStorage instead of cookies 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-12 20:06:17 +01:00
Brady Wetherington 8f2a17585e Merge branch 'develop' into snipeit_v7 
Had to do a lot of conflict work here, so this could get ugly :(
 2023-07-10 16:53:35 +01:00
snipe 61fd427678 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-07-05 14:41:34 +01:00
snipe d890d923ff Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2023-07-05 14:40:54 +01:00
Brady Wetherington 51424d01a9 Merge branch 'develop' into snipeit_v7 2023-06-28 14:25:33 +01:00
snipe c377e0617c Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-06-21 19:07:07 +01:00
snipe 17a10a4342 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-21 19:06:21 +01:00
snipe 2ac4449ea3 Merge remote-tracking branch 'origin/develop' 2023-06-15 20:30:07 +01:00
Brady Wetherington f5ff9b2208 Merge branch 'develop' into snipeit_v7 - 2023-06-12 2023-06-12 16:56:23 +01:00
Lukas Jung 9fca8c2438 Fixed #12434: Include Docker Specific Paths for dompdf chroot 2023-06-09 11:00:46 +02:00
snipe 924d0b25e8 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2023-06-08 08:53:22 +01:00
snipe c78c69700f Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-06-08 08:49:55 +01:00
snipe a3a64be19b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-05-24 16:06:26 -07:00
snipe fb5e33c50f Updated hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:03:15 -07:00
Brady Wetherington 09fdc946a0 Merge branch 'develop' into snipeit_v7 
Had to do some asset rebuilds, and a composer update
 2023-05-17 17:37:10 -07:00
snipe b8a59cc2d8
Merge branch 'master' into develop 2023-05-10 09:32:26 -07:00
snipe 04aedce47e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 09:29:42 -07:00
snipe bc9b47c46d Removed env dependency, switched to DB 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:27:47 -07:00
snipe c52b48c383 Google oauth login 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-10 00:14:28 -07:00
snipe 5950ec27ab Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/skins/skin-black-dark.css
#	public/css/dist/skins/skin-black-dark.min.css
#	public/css/dist/skins/skin-blue-dark.css
#	public/css/dist/skins/skin-blue-dark.min.css
#	public/css/dist/skins/skin-green-dark.css
#	public/css/dist/skins/skin-green-dark.min.css
#	public/css/dist/skins/skin-orange-dark.css
#	public/css/dist/skins/skin-orange-dark.min.css
#	public/css/dist/skins/skin-red-dark.css
#	public/css/dist/skins/skin-red-dark.min.css
#	public/css/dist/skins/skin-yellow-dark.css
#	public/css/dist/skins/skin-yellow-dark.min.css
#	public/mix-manifest.json
 2023-05-03 13:49:36 -07:00
snipe cd6f6ee8ff Bumped version to 6.1.1-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-03 13:47:46 -07:00
snipe cdbd68012f
Merge pull request #12878 from joelpittet/patch-2 
Use environment variable and default to PHP's sendmail_path
 2023-05-03 10:48:39 -07:00
Brady Wetherington 2f3ddaec20 Merge branch 'develop' into snipeit_v7 2023-05-01 18:09:12 -07:00
snipe e250d4c884 Merge remote-tracking branch 'origin/develop' 2023-04-27 17:00:29 -07:00
Brady Wetherington 381890b578 Merge branch 'develop' into laravel_v9 2023-04-27 13:56:04 -07:00
snipe 68417a4c15 Env-ify hashing variables, setting the normal defaults 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-26 13:01:42 -07:00
snipe 0c425ed0e7 Merge remote-tracking branch 'origin/develop' 2023-04-21 05:19:19 -07:00
Joel Pittet 608c5d037f
Use environment variable and default to PHP's sendmail_path 
Use sendmail_path in PHP instead of hardcoded path and options
 2023-04-19 15:25:48 -07:00
Joel Pittet 351928adff
Allow an environment variable to set the session cookie path 2023-04-19 15:18:50 -07:00
Brady Wetherington 9793130f6c Merge branch 'develop' into laravel_v9 2023-04-18 11:01:00 -07:00
snipe 42a60a9ccb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-04-07 08:22:24 -07:00
snipe 87c7d1aaca Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 20:43:42 -07:00
snipe a8ca3ad2a9 Merge remote-tracking branch 'origin/develop' 2023-04-06 18:49:51 -07:00
snipe 6ff3745adf Added BM JS 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 16:19:33 -07:00
snipe d2daaf30eb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-03-28 03:32:04 -07:00
snipe 6800098469 Bumped version for 6.1.0-pre 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-28 03:31:02 -07:00
snipe 4cc29b76f0 Merge remote-tracking branch 'origin/develop' 2023-03-21 16:07:03 -07:00
Brady Wetherington 3a4ca5acad Re-enable config:cache *only* if there's no Rollbar 2023-03-18 21:07:00 -07:00
snipe 5defd5ec0a Merge develop into master 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:59:17 -08:00
snipe e66b19aca0 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 19:44:06 -08:00
snipe d36b4c1bd3 Merge remote-tracking branch 'origin/develop' 2023-03-06 17:04:15 -08:00
Brady Wetherington dd3c3a1428 Suppress SCIMExceptions from cluttering up Rollbar 2023-03-06 15:24:16 -08:00
snipe dbe0a3352b Updated prod assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/mix-manifest.json
 2023-02-28 20:34:20 -08:00
snipe 2189a74d6a Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-28 20:32:00 -08:00
snipe 8caf29975f Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-02-24 09:58:19 -08:00
snipe 95501bf57c Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-24 09:57:25 -08:00
Brady Wetherington 645bba96cd WIP: First stabs at getting Laravel Vite to work; no luck so far :( 
Probably going to back out all the 'vite' stuff anyways :/
 2023-02-21 19:35:37 -08:00
snipe 495d7e057d Merge remote-tracking branch 'origin/develop' 2023-02-15 18:37:39 -08:00
snipe 7980e2ab2e
Merge pull request #12517 from uberbrady/silence_ldap_exceptions 
Silence E_WARNING "exceptions"
 2023-02-15 11:56:37 -08:00
snipe c7f90f304d Added insights config 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-15 11:33:08 -08:00
Brady Wetherington 3757c7e353 Make early-boot errors (syntax, others) be more easy-to-read 2023-02-15 11:31:13 -08:00
Brady Wetherington a1b0eaf128 Got working E_WARNING-in-production going. YAY! 2023-02-14 20:00:06 -08:00
snipe a60510c063 Added insights config 
Signed-off-by: snipe <snipe@snipe.net>
 2023-02-06 12:39:48 -08:00
Brady Wetherington 039d159cbd WIP: working on better Rollbar filtering in prod 2023-02-01 17:15:22 -08:00
snipe 6fbd20a11b Merge remote-tracking branch 'origin/develop' 2023-01-31 19:50:18 -08:00
Ben Periton c2854f1bcb
Update database.php 
Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port
 2023-01-29 19:28:04 -06:00
snipe 8b94b208e3 Merge remote-tracking branch 'origin/develop' 2023-01-26 13:17:28 -08:00
Brady Wetherington cd573c484d Change the SCIM_STANDARDS_COMPLIANCE config to default to 'true' 2023-01-26 12:48:41 -08:00
snipe d020ab455d Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-19 15:56:53 -08:00
snipe 0c3d03a4ce Only add rollbar to the logging array if the app is in production 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-13 13:50:16 -08:00
snipe 2eac03db4a
Merge pull request #12329 from snipe/fixes/rollbar_integration 
Fixed rollbar integration if ROLLBAR_TOKEN is provided
 2023-01-10 17:21:52 -08:00
snipe 1cf7784bb8 Logging override if ROLLBAR_TOKEN is provided 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-10 00:20:56 -08:00
snipe 60dcaa9e94 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2023-01-09 21:11:29 -08:00
snipe 2e75bd6960 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-09 21:11:00 -08:00
snipe a6c7471bf5 Merge remote-tracking branch 'origin/develop' 2022-12-20 15:11:36 -08:00
Ivan Nieto Vivanco d9a21cce00 Add other items' purchase_cost columns to the same permission 2022-12-15 14:12:05 -06:00
Ivan Nieto Vivanco b142f8e012 Add the permission to show purchase cost column to non-admin sessions 2022-12-14 23:00:35 -06:00
snipe 687f8971b1 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-12-08 14:49:31 -08:00
snipe bc2a455a89 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-12-08 14:48:55 -08:00
snipe d5e702ac74 Merge remote-tracking branch 'origin/develop' 2022-11-28 14:12:38 -08:00
Brady Wetherington 06a1fe5b38 Pulled in latest upstream changes for improved standards-compliance 2022-11-22 12:52:11 -08:00
snipe 8d03ce5e2c Merge remote-tracking branch 'origin/develop' 2022-11-14 17:45:01 +00:00
snipe 6a9131e771
Merge pull request #12088 from uberbrady/minimal_scim_upgrade 
Added new SCIM env vars; and upgraded SCIM library
 2022-11-09 19:30:50 +00:00
Brady Wetherington 383bd6bb45 Add new SCIM env vars; upgrade SCIM library 2022-11-09 19:08:15 +00:00
snipe 23cbee9493 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-11-03 14:18:55 -07:00
snipe 7c21158680 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-03 14:18:13 -07:00
snipe 52e33a8b0e Merge remote-tracking branch 'origin/develop' 2022-11-03 13:27:21 -07:00
snipe eb81c290dc Accessory file upload 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:50:39 -07:00
snipe 276f534ded Updated permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 19:09:21 -07:00
snipe b362951c95 Added consumables permissions 
Signed-off-by: snipe <snipe@snipe.net>
 2022-11-01 17:52:45 -07:00
snipe 38678d4646 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-10-26 09:50:44 -07:00
snipe 476a5cbc02 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-26 09:49:50 -07:00
snipe f4a3f896bd Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2022-10-13 13:20:35 -07:00
snipe 0303df4b25 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-13 13:19:51 -07:00
snipe 3c9c89355e Aaaand master again 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 16:01:55 -07:00
snipe 5ff72420a6 Set branch back to develop 
I hads to switch branches because the automated GH action script always targets masterb

Signed-off-by: snipe <snipe@snipe.net>
 2022-10-12 11:00:06 -07:00
snipe 1ef3eb94db Merge remote-tracking branch 'origin/develop' 2022-10-05 17:55:33 -07:00
snipe 25e4b7d59d
Merge pull request #11927 from uberbrady/use_improved_scim 
Use the new scim-trace feature from our fork of laravel-scim-server lib
 2022-10-05 17:53:20 -07:00
Brady Wetherington 9605dec22a Use the new scim-trace feature from our fork of laravel-scim-server lib 2022-10-05 17:43:59 -07:00
snipe 687a764fc1 Dev to master in version.php 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:53:16 -07:00
snipe 81be84568e Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-10-04 17:52:24 -07:00