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

2704 commits

Author SHA1 Message Date
snipe
c752e3bb86 Fixed divs 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:48:41 -07:00
snipe
e557f03cc2 Disable submit if app is locked 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 02:43:33 -07:00
snipe
c93096b767 Made the table wider, used icons to compact space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 23:13:05 -07:00
snipe
736777e1e6 Added email and username to merge user confirmation screen 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 22:48:20 -07:00
snipe
07fbbf5f7f Added merge to user menu 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:54 -07:00
snipe
0dfb51f642 User merge blade 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:18:32 -07:00
akemidx
a8e2f72e25 accessory cloning, WITHOUT copying over the image. 2023-03-15 16:55:24 -04:00
akemidx
68094b23b9 moved dell and levono icons to local machine 2023-03-15 15:02:33 -04:00
snipe
fdacd5d5b5
Merge pull request #12636 from akemidx/feature/sc-20330/date-on-all-assigned-pdf 
Datestamp on "Print All Assigned" generated form
 2023-03-15 11:31:52 -07:00
akemidx
f38f6f57ae fixed localization and formatting. simplified code to remove php snippet 2023-03-15 14:00:29 -04:00
snipe
322fd76353
Merge pull request #12664 from Godmartinz/The_final_lowercase 
The final lowercase in webhooks
 2023-03-14 17:09:20 -07:00
akemidx
d50a5d1880 dell and lenovo icons/links added 2023-03-14 16:04:03 -04:00
akemidx
a9782b7e00 testing links 2023-03-14 15:26:44 -04:00
akemidx
9c5ee060d3 WIP string/int error 2023-03-14 15:01:56 -04:00
snipe
5a709a83e7 Small UI tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-14 09:38:30 -07:00
Godfrey M
955d8313b2 the final lowercase 2023-03-13 17:14:02 -07:00
Godfrey M
1bd37b49e9 adds translations for webhook names 2023-03-13 16:13:02 -07:00
Godfrey M
7612c5d852 lowercases variables 2023-03-13 15:26:51 -07:00
Godfrey M
11bf3f5285 aligned inputs 2023-03-13 14:06:05 -07:00
Godfrey M
b6d105c4f4 removes help text from general integrations 2023-03-13 10:49:41 -07:00
Godfrey M
27a2ed5c79 Merge branch 'develop' into generalize_webhooks 2023-03-13 10:41:08 -07:00
snipe
d1d89f872a
Merge pull request #12638 from snipe/fixes/dashboard_category_count_with_show_archived 
Fixed #12635 - dashboard category should not show archived
 2023-03-10 14:19:40 -08:00
Florian
86205bc996
fix translation and adds icon on property reassignable 
Fixing #12647
 2023-03-10 10:36:42 +01:00
akemidx
4533982345 added time of day 2023-03-09 15:11:07 -05:00
snipe
fe470b32fc Added icon and import type to header, more translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:40 -08:00
snipe
474e32ea2a Added translations and formatting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:33:02 -08:00
snipe
b9e4b2a0ba Added some translations, date formatting, and filesize human reporting 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 16:32:45 -08:00
snipe
7f8bdbd252 Added showableAssets() relationship to Category model 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 13:01:38 -08:00
snipe
00896a8615 Updated comment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 12:51:53 -08:00
akemidx
2a4d30a748 forgot to add datestamp to title of page 2023-03-08 15:09:33 -05:00
akemidx
cd9f2f7fb7 datestamp for print all assigned form generation 2023-03-08 14:56:14 -05:00
Godfrey M
15c19a7ab7 silenced Discord option and validation, more translations 2023-03-08 10:35:45 -08:00
snipe
1ed7cd27b4 Lots of HTML/CSS tweaks for better UI 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:30 -08:00
snipe
e143e0c5ee Make the <tr> reflect that it’s active 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-08 00:32:16 -08:00
snipe
42601fecbf 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:42:32 -08:00
Brady Wetherington
7c09de3ea8 Re-introduce the 'placeholder' option for our form-helper 2023-03-07 21:38:55 -08: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
379c5f6790 Reworked the layout for logo upoloads 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 18:54:09 -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
Brady Wetherington
fe699737eb Add improved field-guessing logic; make sure 'do not map' fields work 2023-03-07 18:26:59 -08:00
snipe
e60fa15414 Nicer layout, but it kinda dosn’t work :( 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 17:02:52 -08:00
Godfrey M
35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -08:00
snipe
ea54f540de Dynamically determine target route for expected checkin emails 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-07 13:42:51 -08:00
akemidx
ec5836dab4 cloning accessories first bit 2023-03-07 16:41:48 -05:00
Achmad Fienan Rahardianto
0b3becee7a enable sortable for ID column 2023-03-04 11:27:00 +07:00
Brady Wetherington
7edec26e73 Fixes to layout, improvements to import types, better icons for processing. 2023-03-01 17:18:36 -08:00
Godfrey M
aae178a606 gets select working, placeholders update dynamically 2023-03-01 17:10:10 -08:00
snipe
778787db3c Rip out jquery for location parent 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-01 15:36:01 -08:00
Godfrey M
354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
Brady Wetherington
9b80e86306 Actually display name of company in Accessories Report 2023-03-01 11:34:30 -08:00