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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
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 |
|
|
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 |
|