DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 05:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15140 commits 101 branches 268 tags 320 MiB
Commit graph

872 commits

Author SHA1 Message Date
snipe 5d2cca855e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-19 10:31:04 +01:00
snipe 61e10be04d Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-19 10:29:50 +01:00
Marcus Moore f0a11be0b8
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	composer.lock
 2024-06-18 15:10:46 -07:00
snipe 05b97db747 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-18 09:32:30 +01:00
snipe 543e4c0666 Bumped version file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-18 09:31:49 +01:00
Marcus Moore d9164281ab
Merge branch 'develop' into chore/sc-23725/livewire3 
# Conflicts:
#	resources/views/livewire/oauth-clients.blade.php
 2024-06-17 12:57:04 -07:00
snipe cbb5b6e846 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-17 15:58:27 +01:00
snipe 08bd39dbba Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 15:57:32 +01:00
snipe 5be86b9dbb Merge remote-tracking branch 'origin/develop' 2024-06-17 13:43:45 +01:00
snipe eb33a2451f Updated config 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 13:36:52 +01:00
snipe 069a1608de Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-06-17 12:10:13 +01:00
snipe 60accfd601 Bumped version file 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 12:09:30 +01:00
snipe d87da78eb5 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Users/UsersController.php
#	config/version.php
#	public/css/build/AdminLTE.css
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/css/dist/bootstrap-table.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all-defer.js
#	public/js/dist/all.js
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-06-17 11:18:33 +01:00
snipe ece7c22df9 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-06-17 10:44:20 +01:00
Marcus Moore ee75b30683
Enable legacy_model_binding 2024-05-29 14:06:27 -07:00
Marcus Moore 9dc4f2ca80
Migrate config 2024-05-29 12:24:17 -07:00
snipe fb233c0aa4 Cleaned up facade names and references 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-29 12:38:15 +01:00
snipe f1eb4bd3a5
Merge pull request #14349 from snipe/jerm/update-mailer-configs 
Update mailer configurations for Symfony mailer
 2024-05-29 11:25:55 +01:00
snipe 54067ec449 Fixed pre-version in version.php 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-27 18:21:46 +01:00
snipe 4c11e97922 Bumped version to dev, bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-27 18:20:32 +01:00
Brady Wetherington 4adbd7af4c Merge branch 'develop' into snipeit_v7_laravel10 2024-05-22 21:02:11 +01:00
snipe c20d10d4f2 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-22 17:50:14 +01:00
snipe 81704c1d40 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-22 17:49:29 +01:00
Brady Wetherington f633dbba64 Merge branch 'develop' into snipeit_v7_laravel10 2024-05-20 12:55:29 +01:00
snipe cc0f2d7074 Merge remote-tracking branch 'origin/develop' 2024-05-20 11:22:34 +01:00
snipe ca1555d962 Fixed #14664 - allow additional urls in env for CSP 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 22:19:18 +01:00
snipe 0d4f13219b Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-16 22:00:07 +01:00
snipe 7fdbbc846e Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-16 21:59:38 +01:00
snipe 6823aabf92 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-13 10:53:07 +01:00
snipe f2dddc1226 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-13 10:51:44 +01:00
snipe 4913e56086 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-05-06 18:43:48 +01:00
snipe 4d00bb98d1 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-05-06 18:39:55 +01:00
Brady Wetherington 3f5c5cbe82 Merge branch 'develop' into snipeit_v7_laravel10 2024-04-24 16:24:43 +01:00
snipe 56cb9a0f4e Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	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-purple-dark.css
#	public/css/dist/skins/skin-purple-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
 2024-04-23 10:28:50 +01:00
snipe c8c81a360c Dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2024-04-23 10:26:43 +01:00
snipe a6a58094c9 Merge remote-tracking branch 'origin/develop' 2024-04-18 14:26:53 +01:00
snipe e59b9627c7
Merge pull request #14511 from jeffclay/features/14508_pdo_ssl_verify 
Fixed #14508: Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php …
 2024-04-18 14:23:00 +01:00
Brady Wetherington 65e21faa3e Merge branch 'develop' into snipeit_v7_laravel10 
Hopefully, last merge?
 2024-04-02 20:34:04 +01:00
snipe b7af049589 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-03-29 13:20:22 +00:00
snipe c2d863da99 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-29 13:19:22 +00:00
Jeff Clay 1b8c7ff4ec
Added PDO::MYSQL_ATTR_SSL_VERIFY_SERVER_CERT options to database.php and updated .env files to provide value for the new option. 2024-03-27 11:38:13 -05:00
snipe 7060ffaf34 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-03-26 11:17:07 +00:00
snipe 02a37e2f89 Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 10:16:46 +00:00
snipe b34156ca25 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/dist/bootstrap-table.js
#	public/mix-manifest.json
 2024-03-26 09:58:35 +00:00
snipe 566ba4783e Fixed #14483 - adds deeplinking to search/sort/pagination 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-26 09:50:01 +00:00
snipe 027361f079 Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	config/version.php
 2024-03-08 10:01:21 +00:00
snipe ff10d1540f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-08 10:00:00 +00:00
snipe 313b327cd7 Bumped hash for master 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 11:34:38 +00:00
snipe cbe07ad23b Bumped hash 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-07 11:30:54 +00:00
Brady Wetherington 5b9120ba6c Merge branch 'develop' into snipeit_v7_laravel10 2024-03-05 19:22:37 +00:00
snipe 7769a93a10 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 19:07:40 +00:00
snipe 95a6c7058f Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-05 19:06:55 +00:00
snipe 9b2fcbff08 Set CSP headers to true by default 
Signed-off-by: snipe <snipe@snipe.net>
 2024-03-01 11:36:37 +00:00
Jeremy Price 8ace30ee23 Update mailer configurations for Symfony mailer 
Newer Laravel uses Symfony mailer instead of SwiftMailer, and that means
that some configs and functionality have changed

In this change, we update config/mail.php with the new config layout and
name/functionality changes

of note:

* New configuration layout supporting lots of new/different mailers
* MAIL_DRIVER has become MAIL_MAILER, though we'll support both
* MAIL_ENCRYPTION is mostly useless, and we mark it as such -- symfony
  mailer detects which type of encryption to use automagically.
* MAIL_TLS_VERIFY_PEER is now available in case of self-signed
  certificates on the mail server, of if you want to access it by a
  different name, or by IP

Accordingly, we also update the .env examples, docker configs, and
the .env builder in the snipeit.sh installation script with the above
changes
 2024-02-28 23:37:52 -08:00
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