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

3158 commits

Author SHA1 Message Date
Marcus Moore fe6295a5e4
Update slack_* properties to webhook_* 2023-03-22 14:43:00 -07:00
snipe e8e1ada776
Merge pull request #12669 from akemidx/feature/sc-20178 
#20178: Added Dell and Lenovo to warranty link function
 2023-03-22 00:54:40 -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
snipe e08327be95 Ability to remove user location from users 
Rework of #9677 - sorry @godmartinez - I suck :(

Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 23:03:57 -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 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 f29e813332 Translated “Clear & Save” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:35 -07:00
snipe d883084830 Fixed some funky HTML tags 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:58:26 -07:00
snipe 658252125e Added new partial for the form inline “demo mode” 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 18:57:27 -07:00
snipe 35bef6625a
Merge pull request #12703 from Godmartinz/webhook_clean_up 
adds clear and save button, save button updates accordingly
 2023-03-21 17:02:33 -07:00
Godfrey M 2754277068 adds csrf token and missing divs 2023-03-21 16:12:46 -07:00
snipe c229d69cec Added next audit date override in bulk asset edit 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 16:01:41 -07:00
Godfrey M 3c28242a2e save button updates accordingly 2023-03-21 15:53:09 -07:00
snipe ecb11c3a12 Fixed #12682 - add default location to maintenance report 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-21 13:52:21 -07:00
snipe 4f8542b71b
Merge pull request #12680 from akemidx/clone_accessories 
Clone accessories
 2023-03-21 13:37:04 -07:00
akemidx bb7b655fd2 translating screen reader lines 2023-03-21 16:02:34 -04:00
akemidx 3134279a95 small edits 2023-03-21 15:48:53 -04: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 071a642509 Changed phrasing in translatons 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:15:28 -07:00
snipe e39a75f2cc Fixed min width on select2 bulk menus 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:57 -07:00
snipe ea4a37d8ef Fixed cancel button alignment 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-18 00:14:09 -07:00
snipe e47fc9527b Updated language 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:50:02 -07:00
snipe 820ae09a6f Reworked the layout of the confirm merge form a little 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:41 -07:00
snipe fb54a21e12 Added strings 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:42:22 -07:00
snipe 28cc8f9d69 Nicer user history display 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-17 16:41:43 -07:00
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 d3d26cb988 Added translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-16 18:19:03 -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
snipe e9601bcf13 Handle already-deleted license files more gracefully 
Signed-off-by: snipe <snipe@snipe.net>
 2023-03-15 13:05:51 -07: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