DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 18:44:10 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
15114 commits 96 branches 267 tags 296 MiB
Commit graph

421 commits

Author SHA1 Message Date
snipe 7c5d29ccd9 Move Google Login prompt higher, made it bigger 
Signed-off-by: snipe <snipe@snipe.net>
 2024-01-05 14:56:34 +00:00
Marcus Moore 7cf4baa92a
Remove unused vendor less from resources directory 2023-12-18 17:58:47 -08:00
Marcus Moore 6c3dfdfe6d
Remove unused vendor css files 2023-12-18 17:48:52 -08:00
Marcus Moore 149d159c05
Remove unused bootstrap resources 2023-12-18 11:49:52 -08:00
Marcus Moore c0ad16f497
Remove unused vendor js files 2023-12-18 11:48:28 -08:00
spencerrlongg d29f4489de fix 2023-12-12 14:09:12 -06:00
snipe 41f1c5c1e3 Smaller icon size for activity reports, other action icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:58:20 +00:00
spencerrlongg 65cbba3c2e completely kill vue 2023-12-11 18:09:22 -06:00
spencerrlongg f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg 3106035ef9 delete, comment 2023-12-05 20:41:34 -06:00
snipe 3f35124838
Merge pull request #13888 from spencerrlongg/chore/sc-16907 
Convert Vue Personal Access Tokens to Livewire
 2023-12-05 16:45:16 +00:00
Godfrey M 4a19f23e7c fixes for black dark theme 2023-11-29 11:30:02 -08:00
snipe 88cc234cbd Higher contrast for green dark skin 
Applies #13915 to develop

Signed-off-by: snipe <snipe@snipe.net>
 2023-11-23 15:28:43 +00:00
spencerrlongg 36aac328e4 delete vue component 2023-11-15 20:32:22 -06:00
snipe 1dab4b59e9
Merge pull request #13693 from Godmartinz/bug/sc-9955 
added proper margin-top to sidebar menu on bigger resolutions
 2023-10-05 14:27:25 +01:00
Godfrey M 1e8f90bcf0 gives proper margin-top to sidebar menu on bigger resolutions 2023-10-02 11:46:08 -07:00
snipe 0bf423cda9 Set modal focus to modal-name field 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-28 19:16:40 +01:00
snipe 2a638e66f0 Added column re-ordering 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-15 21:53:34 +01:00
Marcus Moore 74c7f106ce Reset assigned_x values when changing check out to type 2023-09-13 13:43:35 -07:00
Godfrey M f83effbb85 removed unnecessary css rule 2023-06-29 11:25:40 -07:00
Godfrey M d4cddebba5 fixes custom fields labels being unreadable 2023-06-29 11:21:21 -07:00
snipe 44cbb0c2e9
Merge branch 'develop' into asset_info_overflow 2023-05-24 16:11:34 -07:00
snipe 064dbdd3d4 Fixed missing brace from conflict 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-24 16:02:23 -07:00
snipe 9086cb5310
Merge branch 'develop' into fix_unclickable_nav_bar_and_notifcation_block 2023-05-24 15:56:01 -07:00
Godfrey M 68a43cb590 fixes mobile nav bar and notification position 2023-05-23 12:43:32 -07:00
Godfrey M 608d07d03c adds overflow-wrap to asset info table 2023-05-17 13:08:53 -07:00
Godfrey M addd806653 testing overflow solutions 2023-05-17 10:47:50 -07:00
Godfrey M fe60309dfd adds padding to multi select2 inputs 2023-05-17 10:19:25 -07:00
Godfrey M 448472b6d3 testing input paddings 2023-05-17 09:45:45 -07:00
Godfrey M 763176c86b standardizes the importer colors no matter the theme 2023-05-10 14:52:08 -07:00
Godfrey M 87d1a82e35 moar changes to red 2023-05-02 15:15:02 -07:00
Godfrey M 1d494252ef corrections for dark red 2023-05-02 14:05:29 -07:00
Godfrey M 786e8deb91 removed dead space 2023-05-02 13:54:14 -07:00
Godfrey M 0a3cb5286d fixes dark red 2023-05-02 12:37:05 -07:00
Godfrey M f91e76e0f2 fixes dark blue and btn-warning bg 2023-05-02 12:33:40 -07:00
Godfrey M af2f288286 fixes dark orange theme 2023-05-02 12:17:22 -07:00
Godfrey M 5de30db0a9 fixes dark green theme 2023-05-02 12:10:55 -07:00
Godfrey M 47370da924 adds fixes to dark black theme 2023-05-02 11:08:37 -07:00
Godfrey M 7711938f4b fixes dark yellow 2023-05-01 16:27:21 -07:00
snipe 3153013715 Fixed semicolon parse error from #12832 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-17 20:14:45 -07:00
snipe c12ac9912c
Merge pull request #12832 from Godmartinz/fix_footer_space 
Fixed footer space when customized
 2023-04-17 20:11:15 -07:00
Godfrey M 247f47ce69 adjusts button color 2023-04-17 15:29:53 -07:00
Godfrey M aabd5e92a8 surrounding text aligns correctly 2023-04-17 12:44:06 -07:00
Godfrey M d476f0de3a forgot dark blue 2023-04-13 10:34:17 -07:00
Godfrey M bbb4032050 fixes rest of dark mode themes 2023-04-13 10:32:42 -07:00
Godfrey M b83daea265 fixes dark orange 2023-04-13 10:27:38 -07:00
Godfrey M 46ff738494 fixes the notification dropdown menu 2023-04-12 16:12:48 -07:00
Godfrey M cbb25025d5 fixes pagination for rest of skins 2023-04-12 15:41:04 -07:00
Godfrey M f3d12351a6 fixes paginiation for black-dark 2023-04-12 15:23:56 -07:00
Godfrey M 2d27f0155a targeting paginiation 2023-04-12 15:06:06 -07:00
snipe 6164e8b3fa Changed colors for disabled, removed dupe checkmark 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 23:53:57 -07:00
snipe 3bd87a2785 Removed iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:52:54 -07:00
snipe 3473e24de5 Updated assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:36:23 -07:00
snipe 2c47b63e91 Small tweaks to overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 19:37:07 -07:00
snipe c5d74ac27f Additional form CSS tweaks for disabled and unchecked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:08:47 -07:00
snipe 4035cd118e Handle the column selector in bs table styling 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 14:35:47 -07:00
snipe 868615d5e7 Removed iCheck from snipeit.js and webpack 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 12:17:31 -07:00
snipe e066f033c8 First attempt at moving us away from iCheck 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 10:54:01 -07:00
snipe 094859cfe8 Merge branch 'livewire_importer_2_squashed_and_rebased' of https://github.com/uberbrady/snipe-it into uberbrady-livewire_importer_2_squashed_and_rebased 2023-03-07 21:38:04 -08:00
snipe 383b5b43bb Added a few more jquery options for prevoew flexibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:38 -08:00
Brady Wetherington 09c1298e03 Merge branch 'develop' into livewire_importer_2_squashed_and_rebased 
I'll be taking in the changes to the importer front-end elsewhere
 2023-03-07 18:51:05 -08:00
snipe f460d881da Updated vue 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-06 14:27:53 -08:00
Brady Wetherington 5cf66851f7 Finalizing the Livewire Importer! Just going to do some testing now 2023-02-28 21:58:02 -08:00
Godfrey M e8fbb0608f adjusts the sidebar margin top 2023-02-28 09:30:02 -08:00
Brady Wetherington 0a085af0a0 Getting the basic wiring of the importer over into Livewire 
WIP: Wiring up more and more of the actions on the importer

Files now upload okay, a little glitchy on the display-side though

add to readmes so i dont forget
 2023-02-27 14:28:59 -08:00
Godfrey M 4b51424723 fixes a couple buttons color choices in high contrast 2023-01-24 09:42:03 -08:00
snipe e05764ac34 Truncate URL with ellipsis if too long 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-05 18:42:26 -08:00
Godfrey M 36901d271b adds csvmatch for remote. Im a bit lost though lol 2022-12-05 16:28:19 -08:00
Godfrey M 371a5bf4d6 changes the icon color with themes 2022-11-30 10:37:47 -08:00
Godfrey M 0c6441ebed removes the margin top adjustment for desktop 2022-10-06 10:35:28 -07:00
Godfrey M e21660ae05 off by a pixel 2022-10-04 12:11:37 -07:00
Godfrey M 53392d6069 fixes mobile views and clickability of sidebar menu 2022-10-04 12:01:13 -07:00
snipe 8168ca4074
Merge pull request #11853 from Godmartinz/ldap_test_results_color 
Fixes the color choice for the ldap_test_results
 2022-09-27 14:46:46 -07:00
Ivan Nieto Vivanco 06ba9356ca Delete another set of duplicates 2022-09-26 18:57:35 -05:00
Ivan Nieto Vivanco e034f7b674 Delete another duplicate that somehow has survived 2022-09-26 18:56:24 -05:00
Ivan Nieto Vivanco 4d14243f57 Delete duplicate fields from the importer dropdown menu 2022-09-26 18:51:13 -05:00
Godfrey M c55f2d5417 corrects color for query and results of ldap sync test 2022-09-20 10:35:55 -07:00
Godfrey M 571ce5b741 corrects the color choice for the ldap_test_results 2022-09-19 11:59:02 -07:00
snipe ca70988879 Larger checkbox in lists 
Signed-off-by: snipe <snipe@snipe.net>
 2022-09-15 21:42:16 -07:00
snipe c5530104ff Fixed #11549 - dark skin dropdowbn menu fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 15:36:51 -07:00
snipe 58499c2322 Fixed #11508 - font size in alert menu 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-15 17:09:17 -07:00
snipe 9c86b4bf88 Fixes padlock icon 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-07 15:57:33 -07:00
snipe 75a631b91f
Merge pull request #11375 from Godmartinz/bootS_dropdown_menu_fix 
fixes dropdown column select font color  in bootstrap tables
 2022-06-23 18:31:36 -07:00
snipe ea254ccc04 Tweaked default @blue 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:14 -07:00
snipe 06d5b5f4b1 Small change to color in overrides 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:10:03 -07:00
snipe 2536b02ace Fixed some colors on default skin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-23 18:09:52 -07:00
Godfrey M 541ae919d9 fixes dropdown column select font color in bootstrap tables 2022-06-23 09:38:44 -07:00
Godfrey M 3a879bda4a more adjustments 2022-06-15 11:08:42 -07:00
Godfrey M a6852cf4d2 fixes non-dark mode black theme 2022-06-15 10:20:25 -07:00
snipe e6d792bdf7 Tweaked CSS for smaller padlock 
Signed-off-by: snipe <snipe@snipe.net>
 2022-06-14 17:43:12 -07:00
snipe d4a7811078
Merge pull request #11282 from Godmartinz/new_Yellow_skin 
redone none dark mode yellow skin
 2022-06-13 19:48:24 -07:00
snipe cb8dbcc172
Merge pull request #11281 from Godmartinz/chore_dark_mode_color_clean_up 
cleans up dark modes
 2022-06-13 19:48:15 -07:00
Godfrey M b3559ac74e redone none dark mode yellow skin 2022-06-08 13:59:46 -07:00
Godfrey M 4252bd2348 cleans up dark modes 2022-06-08 13:17:16 -07:00
Godfrey M 8c1843b351 updates colors in light color modes 2022-06-06 11:40:57 -07:00
snipe a55adfc0a1
Merge pull request #11152 from Godmartinz/link_inconsistentcies 
Thanks!
 2022-05-18 15:45:30 -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
snipe c0868a68fb Removed console.log cruft 
Signed-off-by: snipe <snipe@snipe.net>
 2022-05-13 13:44:38 -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