Marcus Moore
|
d4861a74df
|
Merge branch 'develop' into chore/sc-23725/livewire3
# Conflicts:
# composer.lock
|
2024-06-25 10:15:50 -07:00 |
|
snipe
|
bbb1fbfbe8
|
Bumped version
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-24 21:59:09 +01:00 |
|
|
snipe
|
66ffe21ce2
|
Merge remote-tracking branch 'origin/develop'
|
2024-06-20 13:09:54 +01:00 |
|
|
snipe
|
5251e6787d
|
Use two-letter fallback code
Ugh, I hate this
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 12:58:00 +01:00 |
|
|
snipe
|
6b4c71f966
|
Updated config
Signed-off-by: snipe <snipe@snipe.net>
|
2024-06-20 12:57:25 +01:00 |
|
|
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 |
|