DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 23:54:12 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
8445 commits 97 branches 266 tags 291 MiB
Commit graph

8445 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e3b13143bf
Merge pull request #11594 from Godmartinz/adds_deleted_asset_options_to_custom_reports 
Adds options to include Deleted assets to custom asset reports
 2022-08-02 10:33:57 -07:00
Godfrey M e150ab58e9 reworded trans 2022-08-02 10:31:06 -07:00
Godfrey M ff080a2d8f replace checkboxes with radiobuttons 2022-08-02 10:27:55 -07:00
snipe e07532dd1b Applied master fix to develop 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:55:28 -07:00
snipe 9c6c01bab1
Merge pull request #11597 from snipe/fixes/missed_date_formatting_on_print 
Fixed date format for Current Date output on location print assigned
 2022-08-01 18:48:41 -07:00
snipe 4133ac6ef0 Applied date formatter to Current Date output on location print assigned 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:47:29 -07:00
snipe 4834c33861 Missed a named route 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 18:43:54 -07:00
snipe 904b5c2886
Merge pull request #11595 from snipe/fixes/fix_routes_for_optimize 
Fixed routes for optimize
 2022-08-01 17:55:34 -07:00
snipe e79a819724 Fixed inconsistency in naming 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 17:45:39 -07:00
snipe af7ccf3beb Handle logout route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:17:40 -07:00
snipe 3e48f436af Handled user route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:13:30 -07:00
snipe 5e488bd81f Handle components route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:10:39 -07:00
snipe 53ff28d2b0 Handle consumables route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:07:56 -07:00
snipe 4a4636bd03 Handle accessories route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:06:28 -07:00
snipe 744d0d299e Handle model route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 16:03:45 -07:00
snipe b035003546 Handled hardware route names 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 15:59:54 -07:00
Godfrey M 842dafefec adds options to include Deleted assets to custom asset reports 2022-08-01 14:52:12 -07:00
snipe a51b446a10
Merge pull request #11578 from snipe/fixes/conditionally_add_nbsp 
Switched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty
 2022-08-01 14:07:50 -07:00
snipe 371aba9912
Merge pull request #11593 from snipe/fixes/add_bulk_assets_to_company_view 
Added bulk edit to company view
 2022-08-01 14:07:14 -07:00
snipe 8b30992a11 Added bulk edit to company view 
Signed-off-by: snipe <snipe@snipe.net>
 2022-08-01 14:06:18 -07:00
snipe 33de45d8fb Swirtched to conditionally adding the nbsp; that the table needs for proper layout if cell is empty 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-29 00:57:20 -07:00
snipe 7d2fcef807
Merge pull request #11562 from uberbrady/clarify_logging 
Fixed inconsistent `*_LOG_LEVEL` variables; set reasonable defaults
 2022-07-25 20:02:37 -07:00
Brady Wetherington 1981b79557 Good catch! APP_LOG -> LOG_CHANNEL 2022-07-25 19:57:14 -07:00
Brady Wetherington 0c7d4a709a Cleaned up more logging options 2022-07-25 19:25:06 -07:00
snipe 6c8d226b21
Merge pull request #11561 from snipe/features/added_perl_module_link 
Added link to SEDC / perl-www-snipe
 2022-07-25 18:54:57 -07:00
snipe 211bbeda5b Added link to SEDC / perl-www-snipe 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-25 18:53:17 -07:00
Brady Wetherington 7057cb0104 Make all *_LOG_LEVEL vars consistent; set default to 'warning' 2022-07-25 18:44:37 -07:00
snipe dc06f14505
Merge pull request #11554 from snipe/security/upgrade_dompdf 
Bumped packages
 2022-07-22 18:21:51 -07:00
snipe f446314ce6
Merge pull request #11547 from snipe/fixes/midnight_timestamp 
Applies current time to checkin date
 2022-07-22 17:58:45 -07:00
snipe 443b1df5e1 Bumped packages 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 17:55:19 -07:00
snipe d636ad8e09
Merge pull request #11553 from snipe/security/upgrade_imagemin 
Upgraded imagemin
 2022-07-22 17:27:35 -07:00
snipe adfdbf3d44 Upgraded imagemin 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 17:26:47 -07:00
snipe 67320dc024
Merge pull request #11551 from snipe/fixes/dark_skin_dropdowns 
Fixed #11549 - dark skin dropdown menu fixes
 2022-07-22 15:38:02 -07:00
snipe c5530104ff Fixed #11549 - dark skin dropdowbn menu fixes 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-22 15:36:51 -07:00
snipe 78097df7ff Aplpies current time to checkin date 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-21 21:45:25 -07:00
snipe 5926441984
Merge pull request #11542 from snipe/features/users_checkin_without_delete 
Features/users checkin without delete
 2022-07-20 18:59:45 -07:00
snipe a1fe2a8d58 Fixed translation reference 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 18:01:55 -07:00
snipe 25cc46e416 Fixed button string 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 18:01:41 -07:00
snipe 458d61fafe Front-end updates for checkin without delete 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:39 -07:00
snipe 32010d5387 Updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:27 -07:00
snipe 7313bca403 Checkin without deleting 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:57:19 -07:00
snipe b7c7e6c623 Added/updated language strings 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-20 17:56:58 -07:00
snipe 0b4d243bf0
Merge pull request #11541 from Godmartinz/gh11540_Error_405_when_checking_out_Accessory 
Fixes #11540 - accessory api routes from get to posts
 2022-07-20 14:14:15 -07:00
Godfrey M 377c0e7075 fixes component routes 2022-07-20 13:41:35 -07:00
Godfrey M 0c4c4fc352 changes api checkin and checkout routes to post 2022-07-20 11:52:54 -07:00
snipe e72c4f989f
Merge pull request #11528 from uberbrady/upgrade_laravel_scim_server 
Upgraded our fork of laravel-scim-server to better support scim creates
 2022-07-18 19:56:06 -07:00
snipe 8113838eee
Merge pull request #11531 from snipe/security/upgrade_jquery_ui 
Upgraded jquery-UI
 2022-07-18 17:28:22 -07:00
snipe a92bb80055 Upgraded jquery-UI 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 17:27:54 -07:00
snipe 43bd00da86 Bumped version 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 16:50:12 -07:00
snipe d124c89ced Moved session driver setting to be more clear 
Signed-off-by: snipe <snipe@snipe.net>
 2022-07-18 16:47:46 -07:00