|
|
2aaa7bed2d
|
Merge pull request #8183 from snipe/features/merge_users
Added merge utility
|
2020-06-25 18:37:41 -07:00 |
|
|
|
cc9f1577a4
|
Removed unused use directives
|
2020-06-25 17:43:53 -07:00 |
|
|
|
ab1fe8be0c
|
Added merge utility
|
2020-06-25 17:42:39 -07:00 |
|
|
|
339bdddc38
|
Fix for Vue js not loading due to CSP :(
|
2020-06-25 11:00:33 -07:00 |
|
|
|
35b9cf4b70
|
Fixed missing db prefix on scopeDueOrOverdueForAudit
|
2020-06-23 02:41:59 -07:00 |
|
|
|
7ccb41371e
|
Removed unoptimized images directive
securityheaders.com is claiming it’s onrecognized, even though I got that directive from their site, so… whatever. ¯\_(ツ)_/¯
|
2020-06-23 01:09:39 -07:00 |
|
|
|
2e60a457bf
|
Dumb fix for feature-policy being dumb.
|
2020-06-23 01:07:00 -07:00 |
|
|
|
2390d2160b
|
Merge pull request #8164 from snipe/features/additional_security_headers
Additional security headers
|
2020-06-23 00:27:47 -07:00 |
|
|
|
00b051b8c7
|
Added a few more comments
|
2020-06-23 00:26:09 -07:00 |
|
|
|
05b3a9ad7e
|
Config variable for HSTS
|
2020-06-22 23:17:27 -07:00 |
|
|
|
4fb880384f
|
Changed comment
|
2020-06-22 22:37:14 -07:00 |
|
|
|
43042ad841
|
Consolidated ReferrerPolicy into new SecurityHeaders file
|
2020-06-22 22:35:59 -07:00 |
|
|
|
a716382ac4
|
Removed CSP middleware (it’s added in the general header)
|
2020-06-22 22:33:37 -07:00 |
|
|
|
36c8f7f4f1
|
Additional security headers
|
2020-06-22 22:31:01 -07:00 |
|
|
|
b42801f6ae
|
Merge pull request #8163 from snipe/fixes/fix-for-css-on-column-selector
Fixed weird padlock display in asset listing with encrypted custom fields
|
2020-06-22 20:47:35 -07:00 |
|
|
|
946129f206
|
Made quote style consistent
|
2020-06-22 20:45:20 -07:00 |
|
|
|
b941ef1e08
|
Pulled CSS font awesome styles out of the blade and into overrides.css
|
2020-06-22 20:41:40 -07:00 |
|
|
|
d1aa11ec89
|
Fix for weird padlock display in asset listing with encrypted custom fields
|
2020-06-22 20:29:19 -07:00 |
|
|
|
de4934f21d
|
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
|
2020-06-22 17:28:38 -07:00 |
|
|
|
b10076b015
|
corrected an error where font-size for labels were static in settings.
|
2020-06-22 17:04:39 -07:00 |
|
|
|
af06e42056
|
Bumped version
v4.9.3
|
2020-06-17 11:17:25 -07:00 |
|
|
|
9a2440dc4b
|
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid
Better handle the logic to determine if we should display the license checkout blade [ch13792]
|
2020-06-16 20:20:07 -07:00 |
|
|
|
2ac1c1636c
|
Better handle the logic to determine if we should display the license checkout blade
|
2020-06-16 16:12:57 -07:00 |
|
|
|
beae8efb21
|
Merge pull request #8088 from Godmartinz/Label_Woes
Barcode resizing and text adjustment
|
2020-05-27 23:01:33 -07:00 |
|
|
|
9839e5e566
|
adjusted for all label text, removed local variable
|
2020-05-27 12:27:40 -07:00 |
|
|
|
d14ab7e3e1
|
Porting change from #8053 to master
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-27 00:22:44 -07:00 |
|
|
|
e7f74d94c1
|
Label_Woes
|
2020-05-26 17:22:45 -07:00 |
|
|
|
e97cf011b6
|
Label_Woes
|
2020-05-26 17:15:39 -07:00 |
|
|
|
ed23505054
|
Label_Woes
|
2020-05-26 17:10:45 -07:00 |
|
|
|
001e721530
|
Merge pull request #8063 from dmeltzer/backport-8092
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
|
2020-05-20 10:21:52 -07:00 |
|
|
|
8210da6e82
|
Fix Missing Category selection in Asset Model Modal dialog.
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
|
2020-05-20 10:29:27 -04:00 |
|
|
|
f88683766b
|
Roll back previous change
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-14 00:55:47 -07:00 |
|
|
|
e4385c0f8c
|
Fixes #8051 regression
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-14 00:48:30 -07:00 |
|
|
|
0550fe0ffa
|
Fix for session fixation vulnerability
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-12 10:31:54 -07:00 |
|
|
|
7fb3a9b82c
|
Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap
Added option to disable backup in import
|
2020-05-11 22:41:36 -07:00 |
|
|
|
ecb1e87fe6
|
Updated assets
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 20:45:15 -07:00 |
|
|
|
f43df5f041
|
Fixed form label
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 20:44:46 -07:00 |
|
|
|
95cc48e422
|
Added option to disable backup in import
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 20:41:10 -07:00 |
|
|
|
9a2ed804ca
|
Fixed mismatched HTML header tags
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 20:28:42 -07:00 |
|
|
|
d20fad28e5
|
Use more modern request helper
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 20:28:24 -07:00 |
|
|
|
ae813ddf75
|
Add @alek13 as a contributor
|
2020-05-11 18:11:16 -07:00 |
|
|
|
bb42109c0c
|
Added a clarifying comment
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 18:10:45 -07:00 |
|
|
|
f46ecf8ec0
|
Updated composer lock
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 18:07:20 -07:00 |
|
|
|
b9e821c0e6
|
Small fix for Group Functional Tests
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 18:07:14 -07:00 |
|
|
|
9ee28c7513
|
Switched to use info instead of danger on undeployable statuses
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 18:07:02 -07:00 |
|
|
|
1a8ba06702
|
Merge branch 'master' of https://github.com/snipe/snipe-it
|
2020-05-11 17:53:32 -07:00 |
|
|
|
0fd232e70d
|
Fixed group functional test
(We had changed the minimum to 2 instead of 3)
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-11 17:53:24 -07:00 |
|
|
|
ee4d69b1c5
|
Merge pull request #8041 from alek13/patch-1
use supported package for slack
|
2020-05-11 17:52:45 -07:00 |
|
|
|
d1ad111949
|
use supported package for slack
see https://github.com/maknz/slack/issues/94
|
2020-05-11 20:31:13 +03:00 |
|
|
|
31c5350941
|
Fixed incorrect route for groups edit
Signed-off-by: snipe <snipe@snipe.net>
|
2020-05-01 01:05:48 -07:00 |
|
