DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-30 07:59:50 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5457 commits 102 branches 268 tags 288 MiB
Commit graph

5457 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe d1aa11ec89
Fix for weird padlock display in asset listing with encrypted custom fields 2020-06-22 20:29:19 -07:00
snipe de4934f21d
Merge pull request #8162 from Godmartinz/godfreymartinez-ghi-font-size-of-qr_text 
Fixed #8161 and #8114 - font-size for labels used static values in blade instead of using values from settings
 2020-06-22 17:28:38 -07:00
Godfrey M b10076b015 corrected an error where font-size for labels were static in settings. 2020-06-22 17:04:39 -07:00
snipe af06e42056
Bumped version 2020-06-17 11:17:25 -07:00
snipe 9a2440dc4b
Merge pull request #8141 from snipe/fixes/better_handling_when_license_is_invalid 
Better handle the logic to determine if we should display the license checkout blade [ch13792]
 2020-06-16 20:20:07 -07:00
snipe 2ac1c1636c
Better handle the logic to determine if we should display the license checkout blade 2020-06-16 16:12:57 -07:00
snipe a7eb89f6b6
Misc fixes for flysystem paths 2020-06-16 16:06:25 -07:00
Peter Upfold 004ecad059 Force suppress deprecation warning on ldap_control_paged_result() 2020-06-03 08:59:50 +01:00
snipe 1267c68f28
Removed barcodes from S3 uploader 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-28 19:56:18 -07:00
snipe 262eb79471
WIP - this needs refactoring 
We have to use Storage::get() if the filesystem is local, since the method does a file_get_contents() and the file isn’t accessible via a URL since it’s private and doesn’t live on the web root. (We do this slightly differently than Laravel out of the box)

Signed-off-by: snipe <snipe@snipe.net>
 2020-05-28 01:59:01 -07:00
snipe 7a785b4952
Updated a few flysystem settings 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-28 01:54:29 -07:00
snipe beae8efb21
Merge pull request #8088 from Godmartinz/Label_Woes 
Barcode resizing and text adjustment
 2020-05-27 23:01:33 -07:00
snipe 3c0a6292c4
Clarified env example with flysystem examples 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 22:47:53 -07:00
snipe 8ccc1c6515
Fixed weird merge in Bulk Users Controller 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 22:46:42 -07:00
Godfrey M 9839e5e566 adjusted for all label text, removed local variable 2020-05-27 12:27:40 -07:00
snipe d54acd908c
Made logo file have a better name for multiple tries in the same day 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 02:31:04 -07:00
snipe 42fe1ea398
Set public files specifically to public 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 02:30:43 -07:00
snipe bb062b20a1
Switched env to public 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 02:30:30 -07:00
snipe a93810e301
Updated example config 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 00:39:28 -07:00
snipe d14ab7e3e1
Porting change from #8053 to master 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-27 00:22:44 -07:00
snipe f137c1ca09
Merge pull request #8044 from snipe/flysystem_tweaks 
Tweak to Flysystem's filesystems.php to make it work with Snipe-IT
 2020-05-27 00:22:28 -07:00
snipe f196b5bd94
Merge pull request #8077 from dmeltzer/more-paving 
Sync paveit command with new database tables.
 2020-05-26 21:18:22 -07:00
snipe e0d9cc4e73
Merge pull request #8053 from CharlotteDunoisLabs/fix-gravatar 
Take gravatar email into account in presenter
 2020-05-26 19:58:45 -07:00
snipe 5b4e4c8dcd
Merge pull request #8061 from Godmartinz/develop 
fixed a table header error
 2020-05-26 19:52:14 -07:00
snipe dee1f5ec35
Merge pull request #8078 from dmeltzer/wrong-id 
Fix incorrectly named parameter.
 2020-05-26 19:51:38 -07:00
snipe 850bfc40d4
Merge pull request #8079 from dmeltzer/misc-fixes 
Misc fixes
 2020-05-26 19:50:39 -07:00
Godfrey M e7f74d94c1 Label_Woes 2020-05-26 17:22:45 -07:00
Godfrey M e97cf011b6 Label_Woes 2020-05-26 17:15:39 -07:00
Godfrey M ed23505054 Label_Woes 2020-05-26 17:10:45 -07:00
Daniel Meltzer b3fe47bfa7
Remove/Reorganize logic to make codacy happier. 2020-05-23 15:24:10 -04:00
Daniel Meltzer 1e5d40f32e
Clean up extra code in notifications files. 2020-05-23 15:24:10 -04:00
Daniel Meltzer f0546bf689
Clean up Transformers and extract an isDeletable() method to models where it makes sense. 2020-05-23 15:24:10 -04:00
Daniel Meltzer 136df9418f
Deadcode-- 2020-05-23 15:24:10 -04:00
Daniel Meltzer 7ea862787c
Refactor controller to use one method that shows all modals based on name. 2020-05-23 15:24:00 -04:00
Daniel Meltzer 25d6ceee6e
Remove old code. 2020-05-23 12:18:27 -04:00
Daniel Meltzer 4fef065010
Refactor big switch to lookup in array. A bit cleaner/codacy happier. 2020-05-23 12:17:56 -04:00
Daniel Meltzer fe74394ae6
Short circuit checkout logic to prevent iterating if we're not checking out to an asset 2020-05-23 11:48:02 -04:00
Daniel Meltzer 7a76cb08a0
We accept xlsx in uploads 2020-05-23 11:36:47 -04:00
Daniel Meltzer c70bd62a0f
Missing includes. Fix by using the request object instead of facade. 2020-05-23 11:36:16 -04:00
Daniel Meltzer ad1db2c640
Fix incorrectly named parameter. 2020-05-23 10:26:56 -04:00
Daniel Meltzer 2e936a9883
Sync paveit command with new database tables. 2020-05-23 09:08:32 -04:00
snipe 3db4480bba
Merge pull request #8062 from dmeltzer/fix-modal-select-html 
Fix Missing Category selection in Asset Model Modal dialog.
 2020-05-20 10:24:20 -07:00
snipe 001e721530
Merge pull request #8063 from dmeltzer/backport-8092 
BACKPORT: Fix Missing Category selection in Asset Model Modal dialog - [ch14635]
 2020-05-20 10:21:52 -07:00
Daniel Meltzer 8210da6e82
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag. is not valid. This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:29:27 -04:00
Daniel Meltzer 6a80f95769
Fix Missing Category selection in Asset Model Modal dialog. 
A select html tag needs a full closing tag.  <select /> is not valid.
This was causing the select2 js to barf and eat additional information.
 2020-05-20 10:23:04 -04:00
Godfrey M edd4797178 fixed a table header error 2020-05-19 16:59:09 -07:00
snipe f88683766b
Roll back previous change 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:55:47 -07:00
snipe e4385c0f8c
Fixes #8051 regression 
Signed-off-by: snipe <snipe@snipe.net>
 2020-05-14 00:48:30 -07:00
Charlotte Dunois 7f8c6fe282
Take gravatar email into account in presenter 2020-05-13 20:30:47 +02:00
snipe 8cc9e61983
Ugh 
Sorry, my local testing environment is fscked right now :(

Signed-off-by: snipe <snipe@snipe.net>
 2020-05-12 20:38:32 -07:00