DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-24 05:04:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
9381 commits 101 branches 268 tags 320 MiB
Commit graph

9381 commits

This branch
This branch
All branches
Author SHA1 Message Date
akemidx 3702dd87ce fixing pr 2023-02-01 16:10:30 -05:00
akemidx 4d9d73483f fixing pr 2023-02-01 16:09:19 -05:00
akemidx 4e5b8fa213 fixing pr 2023-02-01 16:05:50 -05:00
akemidx a8643e5d35 cleaning up/adding variable 2023-02-01 15:55:16 -05:00
snipe 38f3843c23
Merge pull request #12386 from snipe/features/fixed_12382_added_checked_out_count_to_accessories 
Fixed #12382 - added checked out count to accessories
 2023-01-31 19:57:12 -08:00
snipe f7ae5db4f3
Merge branch 'develop' into features/fixed_12382_added_checked_out_count_to_accessories 2023-01-31 19:56:43 -08:00
snipe 6fbd20a11b Merge remote-tracking branch 'origin/develop' 2023-01-31 19:50:18 -08:00
snipe de1141491a Replaced help text 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-31 19:41:42 -08:00
snipe 2d45ebe103
Merge pull request #12433 from inietov/fixes/asset_declined_date_issues 
Fixed Invalid date value on assets acceptance mail notification
 2023-01-31 19:14:51 -08:00
snipe 656344b1c7
Merge pull request #12429 from svpernova09/benperiton/patch-1 
Cherry-picked Feature: Add DB_PORT to pgsql connection
 2023-01-31 19:10:17 -08:00
snipe 7a23398c0c
Merge pull request #12439 from uberbrady/fix_bootstrap_username_doubling 
Fixed: username doubles on 'checked-out-to' column if display is resized [sc-19869], [fd-33242]
 2023-01-31 18:10:02 -08:00
Brady Wetherington 02ca5248b1 Don't append username to the user's name if it's already there 2023-01-31 17:44:09 -08:00
snipe b1179c7b1e
Merge pull request #12438 from inietov/fixes/replace_ios_homescreen_logo 
Fixed #9694 Replace iOS "Add to homescreen icon"
 2023-01-31 17:02:05 -08:00
Brady Wetherington a4173e3881 Permit not-delegated+dont-expire-password+normal-accounts to login 2023-01-31 16:49:41 -08:00
snipe a2a078015f
Merge pull request #12435 from lukasfehling/bugfix/fixed-endpoint-for-user-notification 
Fixed the endpoint for user notification with all their assigned assets
 2023-01-31 12:41:47 -08:00
lukasfehling cddae4869f fixed the endpoint for user notification with all their assigned assets 2023-01-31 18:27:25 +01:00
Ivan Nieto Vivanco a7a578bf51 Added head only logo to be used as default in apple-touch-icon 2023-01-31 00:13:44 -06:00
akemidx 214a1af61a apostrophe updates 2023-01-30 16:54:23 -05:00
Ivan Nieto Vivanco ccc7b78f62 Store the acceptance dates with format YYY-mm-dd 2023-01-30 15:11:41 -06:00
Ben Periton c2854f1bcb
Update database.php 
Although Postgres is not officially supported, it does seem to work ok, but to help a little bit with the Docker image, this is non-breaking change but allows the env file to specify the pgsql connection port
 2023-01-29 19:28:04 -06:00
snipe 22b0b9b090 Fixed gates on fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:05:41 -08:00
snipe 583a0412fe Added edit fieldsets translations 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:23 -08:00
snipe a16604285c Normalize the fieldset form 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:03:07 -08:00
snipe 37f5cfa8ce Added edit button for fieldsets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-26 17:02:53 -08:00
akemidx 79d9cff22a translations added for the hardware blades 2023-01-26 16:26:31 -05:00
snipe 8b94b208e3 Merge remote-tracking branch 'origin/develop' 2023-01-26 13:17:28 -08:00
snipe cc370084d1
Merge pull request #12341 from uberbrady/redo_scim_config 
Redo SCIM config; use latest laravel-scim-server from our fork
 2023-01-26 12:57:29 -08:00
Brady Wetherington cd573c484d Change the SCIM_STANDARDS_COMPLIANCE config to default to 'true' 2023-01-26 12:48:41 -08:00
Brady Wetherington c5d3b3ab81 Change out the SCIM config for a fixed one; update our fork of the SCIM-server 2023-01-25 15:59:46 -08:00
Brady Wetherington cfe9c687f9 Mark a bunch of SCIM config as nullable 2023-01-25 15:54:57 -08:00
Brady Wetherington 91cf683f3d Re-do the entire SCIM config so it no longer inherits 2023-01-25 15:53:46 -08:00
snipe e7917d1f93 Rebuild prod assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 19:16:03 -08:00
snipe 6b729502c6 Rebuilt dev assets 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-24 19:13:40 -08:00
snipe be6f367565 Merge remote-tracking branch 'origin/develop' 2023-01-24 19:12:50 -08:00
snipe f0b14513db
Merge pull request #12411 from uberbrady/fix_rb_16746 
Resolved Rollbar error 16746 - missing array key 'extension'
 2023-01-24 18:24:18 -08:00
Brady Wetherington ab12ad1140 Resolves Rollbar error 16746 - missing array key 'extension' 2023-01-24 18:19:26 -08:00
akemidx 3ba79600fb checkin limit for the components checkin 2023-01-24 18:17:49 -05:00
snipe 935f5018cc
Merge pull request #12405 from Godmartinz/high_contrast_color_adjustments 
Fixed buttons colors in high contrast theme
 2023-01-24 15:17:03 -08:00
akemidx cafe8f3074 notification for slack message 2023-01-24 16:20:20 -05:00
akemidx 19cf170dd9 Add VIP Checkbox 2023-01-24 15:30:21 -05:00
akemidx 596846a94a Add VIP Checkbox 2023-01-24 15:29:27 -05:00
Godfrey M 4b51424723 fixes a couple buttons color choices in high contrast 2023-01-24 09:42:03 -08:00
snipe 86812b024d Merge remote-tracking branch 'origin/develop' 2023-01-23 22:03:12 -08:00
snipe dc155846ca Hoist the autorization higher in the stack so we’re not doing logic or math when the user isn’t authorized to touch this 
Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:49:17 -08:00
snipe 7a9ea91be0
Merge pull request #12387 from snipe/fixes/inconsistent_UI_for_image_delete 
Updated - Refactored ImageHandler request to be more re-usable, and checkboxes with missing `minimal` class for iCheck
 2023-01-23 21:39:55 -08:00
snipe 02dcb0fbd7 Shorten the additiona form request invocation to just ImageUploadRequest 
We already have the `use App\Http\Requests\ImageUploadRequest` clause at the top of this file.

Signed-off-by: snipe <snipe@snipe.net>
 2023-01-23 21:37:35 -08:00
snipe 690bfbe16a
Merge pull request #12398 from akemidx/acceptance_translations 
Fixed: translations for EULA Acceptance Summary
 2023-01-23 21:28:59 -08:00
Marcus Moore cd582be851
Drop tables that may exist in down methods 2023-01-23 15:42:45 -08:00
Marcus Moore 760844de6f
Add conditionals 2023-01-23 15:42:33 -08:00
Marcus Moore e6dc61d2cf
Revert column names to legacy versions in down method 2023-01-23 15:42:05 -08:00