DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-15 10:04:13 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
15895 commits 96 branches 267 tags 295 MiB
Commit graph

191 commits

Author SHA1 Message Date
spencerrlongg 255d9427b6 make edit a button 2023-12-12 15:41:29 -06:00
spencerrlongg b89116eb55 submit on enter for edit 2023-12-12 13:33:51 -06:00
spencerrlongg 9430e9c8e2 autofocus, package-lock.json 2023-12-12 13:28:04 -06:00
snipe 456e6979f0 Updated import icons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-12-12 00:12:06 +00:00
spencerrlongg f93e7b91ff that's all folks 2023-12-06 16:20:30 -06:00
spencerrlongg 18720b3302 safety stuff 2023-12-05 20:36:59 -06:00
spencerrlongg 12e546e63a everything working, cleanup 2023-12-05 20:22:20 -06:00
spencerrlongg c28936fefb almost there... problem with update button 2023-12-05 17:39:35 -06:00
spencerrlongg 080d196138 buttons work now after style tags removed 2023-12-05 16:41:25 -06:00
spencerrlongg d3967b37cd this is a start, buttons not working? 2023-12-05 14:52:14 -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
spencerrlongg 6ca5fb6b20 remove token scope html 2023-12-05 09:44:03 -06:00
snipe 9607567b75 Check for the array key in $activeFile->first_row 
Signed-off-by: snipe <snipe@snipe.net>
 2023-11-24 10:08:35 +00:00
spencerrlongg 17bf8d0124 fix string 2023-11-16 11:31:00 -06:00
spencerrlongg c3e02286d3 i can't blame this on livewire - animations or something? 2023-11-16 11:24:54 -06:00
spencerrlongg a9d82bf157 enter working 2023-11-16 10:54:32 -06:00
spencerrlongg e097df912e a little cleanup 2023-11-15 22:35:20 -06:00
spencerrlongg 477bb6165f rm log 2023-11-15 20:45:04 -06:00
Spencer Long 19850e8c5a
Merge branch 'snipeit_v7_laravel10' into chore/sc-16907 2023-11-15 20:37:15 -06:00
spencerrlongg 36aac328e4 delete vue component 2023-11-15 20:32:22 -06:00
spencerrlongg 9cf81c7ad4 cleanup, validation 2023-11-15 20:29:14 -06:00
spencerrlongg 6c6417e595 ok, maybe i do like livewire 2023-11-15 20:19:03 -06:00
spencerrlongg efa8ba5965 nice, just need frontend work now 2023-11-15 17:24:54 -06:00
spencerrlongg 713b21de14 note 2023-11-15 16:56:08 -06:00
spencerrlongg 9b31ae3146 create mostly working 2023-11-15 16:51:09 -06:00
spencerrlongg 4cb0012872 cleanup 2023-11-15 16:33:16 -06:00
spencerrlongg eaa68327f7 SINGLE QUOTES 2023-11-15 16:27:01 -06:00
spencerrlongg 9f303cc116 playing around with livewire 2023-11-14 11:50:27 -06:00
Ivan Nieto Vivanco f2f3931fa9 Formatting correctly 2023-10-24 11:26:37 -06:00
Ivan Nieto Vivanco 0c5d54dfde Create the language string to show in the importer GUI indicating the file is empty 2023-10-23 22:09:17 -06:00
Ivan Nieto Vivanco 49f6eef9df Places a text indicating that the file is empty and display it as an info text 2023-10-23 21:57:35 -06:00
Ivan Nieto Vivanco 8f8e5cb723 Adds condition to only process CSV if is not empty 2023-10-23 21:47:10 -06:00
snipe c1f545a523
Merge pull request #13679 from Godmartinz/bug/sc-23688 
Fixed General Webhooks error messaging and validation
 2023-09-28 20:24:09 +01:00
Marcus Moore b1199100a0 Display error message if import file deleted before it can be selected 2023-09-20 17:22:12 -07:00
Godfrey M b7901ae2d8 dont allow redirects, messaging applied, general webhook validation applied 2023-09-20 12:54:34 -07:00
snipe bbe7d9dde2 Removed stray space 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:53 +01:00
snipe 932c02cc54 Typo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:08:30 +01:00
snipe 84b0ff76ed Revert large warning size 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:06:19 +01:00
snipe 273740b8f5 Fixed import error warning 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 22:04:23 +01:00
snipe 8f4ca9da57 Simplify upload messaging 
Signed-off-by: snipe <snipe@snipe.net>
 2023-09-14 21:20:21 +01:00
Marcus Moore d019e62d39
Remove lazy from eula field to avoid race condition 2023-08-02 18:22:40 -07:00
Marcus Moore cbe5a9bc8a
Persist eula text even when field is disabled 2023-08-02 18:03:09 -07:00
Marcus Moore 2e7aa01abe
Pass checkin_email value to backend even when unchecked 2023-08-02 17:45:39 -07:00
Marcus Moore 48979ce177
Disable send email when it should not be modified 2023-08-02 16:52:56 -07:00
Marcus Moore e12935f7fa
Disable eula textarea when using global eula 2023-08-02 16:18:57 -07:00
Marcus Moore 6400034435
Improve variable name 2023-08-02 16:06:59 -07:00
Marcus Moore 105c94aea9
Implement toggling message when email will be sent 2023-08-02 11:36:20 -07:00
Marcus Moore 6349d52803
WIP: migrate to livewire 2023-08-01 17:29:23 -07:00
snipe b7149d8339 Added translation 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-20 14:20:38 -07:00
snipe 7012018e22 Removed todo 
Signed-off-by: snipe <snipe@snipe.net>
 2023-05-16 22:30:17 -07:00
snipe c683233aa3 Updated production assets 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/css/build/app.css
#	public/css/build/overrides.css
#	public/css/dist/all.css
#	public/js/build/app.js
#	public/js/build/vendor.js
#	public/js/dist/all.js
#	public/mix-manifest.json
 2023-04-06 15:00:38 -07:00
snipe 2a9f816bfe Prevent wrapping on buttons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:04:56 -07:00
snipe 506021dbe3 Remove iCheck calls, fixed some bootstrap HTML 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:03:41 -07:00
snipe f90a6fed91 Downgraded error logging to debug 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-06 09:02:15 -07:00
snipe 9a3e727390 Updated other form fields to use new label class, fixed HTML for accessibility 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 22:38:56 -07:00
snipe 146976975c Removed <wire:ignore> in model edit for default custom fields 
Signed-off-by: snipe <snipe@snipe.net>
 2023-04-03 17:38:34 -07:00
snipe 048be49c14 Merge remote-tracking branch 'origin/develop' 2023-03-30 14:37:47 -07:00
Marcus Moore 6beb3b551a
Fix typo 2023-03-29 17:01:24 -07:00
Marcus Moore 863a346d6e
Translate strings 2023-03-29 13:37:14 -07:00
Marcus Moore e05546d1fa
Display helpful messages when importing assets 2023-03-29 13:23:45 -07:00
Marcus Moore 9cc74caa9e
Add wire:model to import form checkboxes 2023-03-29 10:58:25 -07:00
snipe dcbd216e2c Merge remote-tracking branch 'origin/develop' 2023-03-24 08:29:22 -07:00
snipe 697cb4fe6d Fixed translation string for importer 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-24 08:27:53 -07:00
snipe 58ea1592bb Merge remote-tracking branch 'origin/develop' 
Signed-off-by: snipe <snipe@snipe.net>

# Conflicts:
#	public/js/build/app.js
#	public/js/dist/all.js
#	public/mix-manifest.json
#	resources/views/livewire/slack-settings-form.blade.php
 2023-03-22 00:26:15 -07:00
snipe 545d023a18 Handled a few more hard-coded strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:56:07 -07:00
snipe 473211397f
Merge pull request #12708 from uberbrady/livewire_importer_no_subcomponent 
Livewire importer without subcomponent
 2023-03-21 23:07:04 -07:00
Brady Wetherington 6fe520a55d Hooked various the contents of the components together 2023-03-21 22:26:32 -07:00
snipe 0418d390f0 Corrected width to 100% 
I should not be allowed to touch computers

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:25:15 -07:00
snipe b3d5bb75a3 Apply master patch to develop because I am an idiot on the wrong branch 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:23:09 -07:00
snipe 5346ebba94 Make select2 list in slack settings not searchable 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:21:21 -07:00
snipe 1fa9f80c03 Correctly disable the select2 in demo mode 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 22:18:42 -07:00
snipe e40762cf7f Small anal-retentive spacing/indenting tweaks 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 21:00:43 -07:00
snipe 2d3ddd1c7a Fixed default value for webhook_selected 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:56:08 -07:00
snipe 637438ccf6 Added select2 to slack settings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 20:00:11 -07:00
snipe 647f47cdfe Check for demo mode in the clear method for the controller 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:27:05 -07:00
snipe a14d1b981d Switched singleton to static helper method 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 19:22:18 -07:00
snipe d883084830 Fixed some funky HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:26 -07:00
Godfrey M 2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
Brady Wetherington 704a2ad858 WIP: trying to merge two LW components into one, not working yet 2023-03-18 20:31:56 -07: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
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
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
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
Brady Wetherington 7c09de3ea8 Re-introduce the 'placeholder' option for our form-helper 2023-03-07 21:38:55 -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
Godfrey M 35dd0d8def adds generalized webhooks, updates settings page, translations, validation 2023-03-07 15:48:21 -08: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
Godfrey M 354f04534e add multi array, migration, still having issues 2023-03-01 12:30:32 -08:00
Brady Wetherington 54cb38603b Cleaned up the last of the FIXME's (or downgraded them to TODO's) 2023-02-28 22:34:44 -08:00