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

4432 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 6e563f6e4b
Merge branch 'master' of https://github.com/snipe/snipe-it 2020-07-13 21:16:54 -07:00
snipe 5320f5c67c
Disallow non-super users from editing their own permissions 2020-07-13 21:16:45 -07:00
snipe 7f69ae953b
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns 
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
 2020-07-13 21:16:00 -07:00
Brady Wetherington 17f6fbabfa Switch to 'items' to maintain compatbility with other internal API's 2020-07-13 21:12:03 -07:00
snipe c79f8c1baf
Merge pull request #8207 from EDVLeer/patch-1 
Update snipeit.sh
 2020-07-13 17:42:16 -07:00
Brady Wetherington e7a820f7c9 Changes how we do AJAX calls via Select2 for dynamic drop-down menus 2020-07-13 17:14:31 -07:00
snipe 12c92e30b7
Show whether or not the user was imported via LDAP in the view page 2020-07-10 16:21:27 -07:00
snipe fd10b755b0
Removed the sr-only tag in table headers 
It was breaking Bootstrap Tables column selector :(
 2020-07-10 11:30:01 -07:00
snipe dbbb7680d9
A few more fixes for the cli 
Do not check out a piece of software if it’s already been checked out to the user
 2020-07-09 21:12:50 -07:00
snipe cf0dd5bbad
Small fixes for cli tool 2020-07-09 20:43:13 -07:00
snipe 25e53d8c7f
Merge pull request #8216 from snipe/features/checkout_license_to_all_users 
Added CLI tool to checkout license to all users
 2020-07-09 20:27:01 -07:00
snipe 89d433b41a
Removed duplicate seat call 2020-07-09 20:26:02 -07:00
snipe e2570ada6f
CLI tool to checkout a license to ALL users 2020-07-09 20:04:05 -07:00
snipe 45afe725a1
Only try to get the company if there is an auth’d user 
(Needed for command line tools, where no Auth::user() is present)
 2020-07-09 20:03:47 -07:00
EDVLeer 536401fe0f
Update snipeit.sh 
Ubuntu 20.04
 2020-07-07 08:21:36 +02:00
snipe ec6ed256fb
Bumped minor version 2020-07-06 18:45:43 -07:00
snipe 2aaa7bed2d
Merge pull request #8183 from snipe/features/merge_users 
Added merge utility
 2020-06-25 18:37:41 -07:00
snipe cc9f1577a4
Removed unused use directives 2020-06-25 17:43:53 -07:00
snipe ab1fe8be0c
Added merge utility 2020-06-25 17:42:39 -07:00
snipe 339bdddc38
Fix for Vue js not loading due to CSP :( 2020-06-25 11:00:33 -07:00
snipe 35b9cf4b70
Fixed missing db prefix on scopeDueOrOverdueForAudit 2020-06-23 02:41:59 -07:00
snipe 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
snipe 2e60a457bf
Dumb fix for feature-policy being dumb. 2020-06-23 01:07:00 -07:00
snipe 2390d2160b
Merge pull request #8164 from snipe/features/additional_security_headers 
Additional security headers
 2020-06-23 00:27:47 -07:00
snipe 00b051b8c7
Added a few more comments 2020-06-23 00:26:09 -07:00
snipe 05b3a9ad7e
Config variable for HSTS 2020-06-22 23:17:27 -07:00
snipe 4fb880384f
Changed comment 2020-06-22 22:37:14 -07:00
snipe 43042ad841
Consolidated ReferrerPolicy into new SecurityHeaders file 2020-06-22 22:35:59 -07:00
snipe a716382ac4
Removed CSP middleware (it’s added in the general header) 2020-06-22 22:33:37 -07:00
snipe 36c8f7f4f1
Additional security headers 2020-06-22 22:31:01 -07:00
snipe 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
snipe 946129f206
Made quote style consistent 2020-06-22 20:45:20 -07:00
snipe b941ef1e08
Pulled CSS font awesome styles out of the blade and into overrides.css 2020-06-22 20:41:40 -07:00
snipe d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields 2020-06-22 20:29:19 -07:00
snipe 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
Godfrey M b10076b015 corrected an error where font-size for labels were static in settings. 2020-06-22 17:04:39 -07:00
snipe af06e42056
Bumped version 2020-06-17 11:17:25 -07:00
snipe 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
snipe 2ac1c1636c
Better handle the logic to determine if we should display the license checkout blade 2020-06-16 16:12:57 -07:00
snipe beae8efb21
Merge pull request #8088 from Godmartinz/Label_Woes 
Barcode resizing and text adjustment
 2020-05-27 23:01:33 -07:00
Godfrey M 9839e5e566 adjusted for all label text, removed local variable 2020-05-27 12:27:40 -07:00
snipe d14ab7e3e1
Porting change from #8053 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 00:22:44 -07:00
Godfrey M e7f74d94c1 Label_Woes 2020-05-26 17:22:45 -07:00
Godfrey M e97cf011b6 Label_Woes 2020-05-26 17:15:39 -07:00
Godfrey M ed23505054 Label_Woes 2020-05-26 17:10:45 -07:00
snipe 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
Daniel Meltzer 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
snipe f88683766b
Roll back previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:55:47 -07:00
snipe e4385c0f8c
Fixes #8051 regression 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:48:30 -07:00
snipe 0550fe0ffa
Fix for session fixation vulnerability 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 10:31:54 -07:00