lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
10338 commits 1 branch 0 tags 220 MiB
Commit graph

3380 commits

Author SHA1 Message Date
snipe
14495cd1da Nicer PDF display 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-19 17:55:59 -07:00
snipe
8449b5ca1e
Merge pull request #11160 from uberbrady/improve_default_custom_field_value_on_asset_create 
Fixed: #11098 - Smartly overwrite fields with default values for custom fields
 2022-05-18 16:12:12 -07:00
Brady Wetherington
e4b24e17f3 Improve comments because the logic is complicated and unintuitive 2022-05-18 16:06:39 -07:00
Brady Wetherington
981741062b Try to intelligently overwrite fields with default values for custom field 2022-05-18 15:51:32 -07:00
snipe
a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies 
Thanks!
 2022-05-18 15:45:30 -07:00
snipe
891009dc67 Nicer formatting for buttons in bulk user edit 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 15:35:57 -07:00
Godfrey M
ab23e04c65 re-adds Request::is to setting categories 2022-05-18 14:33:41 -07:00
Godfrey M
877b1bd0a3 re-adds Request::is to setting categories 2022-05-18 14:31:03 -07:00
Godfrey M
eaeb74c576 readded comment 2022-05-18 13:13:38 -07:00
Godfrey M
23891054dc removed dead space and unused namespace 2022-05-18 13:11:20 -07:00
Godfrey M
cfc4c58da3 fixes the Settings Tree menu to remain active when opened 2022-05-18 13:06:06 -07:00
Godfrey M
0ed59753da updated less files for license details to adhere to dark skin themes 2022-05-18 10:55:57 -07:00
Godfrey M
75f5f3a0a8 fixes inconsistencies with links styling 2022-05-18 09:37:53 -07:00
Godfrey M
07679aa376 settings treeview won't stay active. still experimenting with potential solutions 2022-05-18 08:40:37 -07:00
snipe
4078e4e323 Added spinner onClick for file upload button on backups 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 02:40:32 -07:00
snipe
ceffbb950f Fixed #11120 - custom fields not showing when textarea is present as field type 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-18 00:47:22 -07:00
snipe
0f9559c1ff Fixed #11124 - updated maintenance page 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-17 19:01:37 -07:00
Travers Carter
1fc0adf7b7 Fixed #11126: don't entitise custom CSS on the labels view 2022-05-18 00:16:18 +10:00
snipe
a973c0626e
Merge pull request #11114 from uberbrady/bad_header_label_for_size_in_backups 
We inadvertently used the wrong label for one of the headers
 2022-05-16 17:02:31 -07:00
Brady Wetherington
213d990e47 We inadvertently used the wrong label for one of the headers on the backups page 2022-05-16 17:00:22 -07:00
snipe
925529923a Fixed #11112 - use correct formatter for locations on dashboard 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-16 16:50:47 -07:00
snipe
ed8e82a606 Removed sr-only class for now - not sure why it’s interfering with the submit button JS 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 11:02:02 -07:00
snipe
8eed01bfa4
Merge pull request #11078 from snipe/fixes/show_encrypted_on_custom_field_view 
Adds encrypted status to custom fields overview
 2022-05-14 10:25:45 -07:00
snipe
5030c7e5ff Added missing backups help string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:24:03 -07:00
snipe
91fb27ee00 Adds encrypted status to custom fields overview 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:20:04 -07:00
snipe
5f1f6baee9 Fixed unrelated typo 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 10:19:12 -07:00
snipe
3fe0e04d52 Fix roite for people file deletion 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-14 08:25:22 -07:00
snipe
3a31104b5c Fixed #11052 - add file sizes to upload displays 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 19:33:14 -07:00
Brady Wetherington
b6284e6651 Fix 'cancel' button in two-factor screen 2022-05-13 14:49:37 -07:00
snipe
d8a4509b22 Fix logout on 2fa 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 14:36:20 -07:00
snipe
c0868a68fb Removed console.log cruft 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 13:44:38 -07:00
snipe
eccc5e7cf0 Make logout a post on 2FA cancel 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 13:35:13 -07:00
snipe
b36bfad0ca Set maxlength on password confirmation form element 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:27:47 -07:00
snipe
6b27c0311d Updated help text on groups for more info on deselecting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:23:12 -07:00
snipe
93454decec Fixed broken quotes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 05:14:53 -07:00
snipe
deb2d958d8 Sets maxlength of user fields to 191 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 04:54:12 -07:00
snipe
714f6d80f2
Merge pull request #11059 from Godmartinz/feature/sc-19017/change-bootstrap-tables-export-to-be-landscape 
Bootstrap tables export as landscape
 2022-05-12 09:28:47 -07:00
Godfrey M
54f5e268a0 removed change from tableExport.js 2022-05-12 09:20:19 -07:00
Godfrey M
83d0743ab8 saves bootstrap pdf tables in landscape 2022-05-12 09:18:44 -07:00
snipe
91cc08d3fb
Merge pull request #11050 from uberbrady/fix_encrypted_textareas 
Make sure to decrypt Textareas as well as input type=text
 2022-05-11 19:03:02 -07:00
Godfrey M
8ebe64e630 fixes final visual issue 2022-05-11 12:13:36 -07:00
Brady Wetherington
e3696ff84c Make sure to decrypt Textareas as well as input type=text 2022-05-10 18:39:03 -07:00
snipe
446e44deb6
Merge pull request #11048 from Godmartinz/bug/sc-18989/purchase-cost-can-be-negative 
Fixed validation for purchase cost allowed to be negative
 2022-05-10 17:36:01 -07:00
snipe
780222d372 Merge remote-tracking branch 'origin/master' into develop 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	app/Http/Controllers/Api/AssetsController.php
#	app/Http/Controllers/Auth/LoginController.php
#	resources/views/users/print.blade.php
 2022-05-10 17:26:26 -07:00
Godfrey M
33b1ab3658 prevents values for assets being negative through validation 2022-05-10 16:19:06 -07:00
Godfrey M
c07a244bab fixes 1/2 visual issues, adds history tab to accessories 2022-05-10 11:20:42 -07:00
snipe
d5edb0908b Added translation string to the correct file this time 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 14:07:05 -07:00
snipe
89fee23d32 Commented out console log that was pooping up the joint 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 08:34:30 -07:00
snipe
2982d78899 Added translation for no assets selected 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:42:02 -07:00
snipe
304cd75af5 Fixed extra divs 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-06 05:20:44 -07:00