DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 06:59:41 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4396 commits 101 branches 268 tags 288 MiB
Commit graph

4396 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe 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
snipe ecb1e87fe6
Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:45:15 -07:00
snipe f43df5f041
Fixed form label 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:44:46 -07:00
snipe 95cc48e422
Added option to disable backup in import 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:41:10 -07:00
snipe 9a2ed804ca
Fixed mismatched HTML header tags 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:42 -07:00
snipe d20fad28e5
Use more modern request helper 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 20:28:24 -07:00
snipe ae813ddf75
Add @alek13 as a contributor 2020-05-11 18:11:16 -07:00
snipe bb42109c0c
Added a clarifying comment 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:10:45 -07:00
snipe f46ecf8ec0
Updated composer lock 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:20 -07:00
snipe b9e821c0e6
Small fix for Group Functional Tests 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-11 18:07:14 -07:00
snipe 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
snipe 1a8ba06702
Merge branch 'master' of https://github.com/snipe/snipe-it 2020-05-11 17:53:32 -07:00
snipe 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
snipe ee4d69b1c5
Merge pull request #8041 from alek13/patch-1 
use supported package for slack
 2020-05-11 17:52:45 -07:00
Alexander Chibrikin d1ad111949
use supported package for slack 
see https://github.com/maknz/slack/issues/94
 2020-05-11 20:31:13 +03:00
snipe 31c5350941
Fixed incorrect route for groups edit 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-01 01:05:48 -07:00
snipe 7eb70e17e0
Merge pull request #7993 from snipe/fixes/7989_column_selector 
Fixed #7989 - Converted table heading icons in People to CSS glyphs
 2020-04-24 04:50:37 -07:00
snipe 3dfcb46991
Minor formatting changes 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:41:08 -07:00
snipe 96eb96f964
Removed stray val (typo) 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:27:00 -07:00
snipe a2f08bd3ba
Added comments 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:08:54 -07:00
snipe e009fbe59f
Converted table heading icons in People to CSS glyphs 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 04:04:53 -07:00
snipe 5bb4f271aa
Fixed #7987 - allow toggle of required/optional in custom fields/fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2020-04-24 00:47:19 -07:00
snipe 154db9a416
This literally never fucking worked. Ever. Shoot me. 2020-04-09 22:20:05 -07:00
snipe cf9d0201e0
Catch weird edge case where target wouldn’t have an ID (?!) 2020-04-09 20:23:02 -07:00
snipe 7ebd21bc04
Added sr-only to the unstyles image upload button 2020-04-09 19:29:16 -07:00
snipe 5707df0239
Check that location isset in checkout 2020-04-09 18:32:34 -07:00
snipe 197a84be94
Commented out rtd_location_id override - why did we do that? 2020-04-09 14:17:39 -07:00
snipe b4fa4c77d7
Check for rtd_location_id before trying to assign 2020-04-09 14:14:30 -07:00
snipe cfec142c3b
Better handle models without a fieldset in the asset request [RB 9935] 2020-04-09 11:18:54 -07:00
snipe 48dfc699d7
Bumped version 2020-04-09 10:49:50 -07:00
snipe ec723a3da1
Changed LDAP messaging 2020-04-09 10:37:51 -07:00
snipe f8a72db696
Changed LDAP 600 to 500, clearer error messages on LDAP test 2020-04-09 09:55:44 -07:00
snipe 83ee64f155
Added missing CSS class to text-only logo 2020-04-08 17:25:14 -07:00
snipe b7d12ff944
Changed placeholder text back to lighter grey - it was confusing when darker 2020-04-08 17:24:59 -07:00
snipe 0858fec7f1
Fixed CSS issue where text-only logos at the top would be the wrong color 2020-04-08 17:24:38 -07:00
snipe 206bd675f2
Pulled slack validation out of setting model validation so it doesn’t fail mysteriously on other pages 2020-04-08 15:07:02 -07:00