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
|
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
|
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
|
17a10a4342
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-21 19:06:21 +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
|
c78c69700f
|
Bumped hash
Signed-off-by: snipe <snipe@snipe.net>
|
2023-06-08 08:49:55 +01: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 |
|