DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 14 Packages Projects Releases Wiki Activity
6020 commits 95 branches 267 tags 294 MiB
Commit graph

6020 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 1d9741a49e Merge remote-tracking branch 'origin/develop' 2021-01-26 22:12:39 -08:00
snipe 9f7f1460e9 Simplified availableForCheckout() on asset 2021-01-26 22:12:24 -08:00
snipe f871759753 Bumped version to 5.0.13-pre 2021-01-26 20:08:44 -08:00
snipe 8e17818f1e Bumped version to 5.0.13-pre 2021-01-26 20:08:08 -08:00
snipe d19c6ab8e7 Use fadeIn/fadeOut for password reset page for nicer look 2021-01-26 20:05:01 -08:00
snipe d14b1e3825
Added better visual cues for login (#9051) 
* Added better visual cues for login

* Changed box header class to box-header with-border to match other screens

* Since we have all.js now, added class=“minimal” to use icheck
 2021-01-26 19:57:39 -08:00
snipe ba12ee9954 Specifically call out username in forgotten password 2021-01-26 18:00:50 -08:00
Evgeny d8bb69533c
To eliminate 12/24hours ambiguity fix. This fix prevents loss of time accuracy. (#8887) 
Its a tiny fix to eliminate 12/24hours ambiguity. Fix prevents time accuracy loss in field "last_audit_date" for assets.
 2021-01-26 12:22:59 -08:00
snipe 01d3606c42 Merge remote-tracking branch 'origin/develop' 2021-01-26 12:20:57 -08:00
sigmoidal 208f1db3b2
Update .htaccess (#9001) 
.htaccess will work on both apache v2.2 and v2.4 (without this change, on upgrade, an internal error on the server occurs)
 2021-01-26 12:20:03 -08:00
Peter Dave Hello e5b02da54b
Fix apk add usage in Dockerfile.alpine (#9032) 
There is no need to use `--update` when `--no-cache` is already
specified. Use `--no-cache` only will make `apk` leave no local cache
and make the image smaller.
 2021-01-26 12:12:00 -08:00
Vincent Lainé d6ead5ae17
Added #8931: add health controller without session (#8978) 
* Added health controller

* Trying to move session middleware to web and api group to have health controller without session

* Fix health route store the session

Co-authored-by: Vincent Lainé <v.laine@dental-monitoring.com>
 2021-01-26 12:10:54 -08:00
Ian Littman 1d7d31b9ae
Optimize target type + ID index for more realistic use cases (#8923) 
Per https://youtu.be/EOXgHH4-WX4?t=1378 or thereabouts
 2021-01-26 12:08:25 -08:00
Brady Wetherington 2a817c2123
Add migration for ldap_server URL's to ensure they at least start with ldap:// or ldaps:// (#8936) 2021-01-26 12:07:32 -08:00
Lucas Pleß f3a7467235
Added today as default Date for checkout Form. (#8938) 2021-01-26 12:06:58 -08:00
Ivan Nieto 2da6f9136f
Add 'Last Audit Date/Next Audit Date' filter to custom report (#8989) 
* Add 'Last Audit Date/Next Audit Date' filter to custom report

* Added a constraint: cannot require a report with a Last Audit Date in the future.
 2021-01-26 12:05:31 -08:00
Ivan Nieto 79549dbfb9
Use the correct env variables in config/auth.php file. (#9048) 2021-01-26 12:04:41 -08:00
snipe a48d09f37e
Fixed non-superadmin gate permissions for kits (#9029) 2021-01-26 11:56:42 -08:00
Godfrey Martinez 0dc78fdea6
fixed color schema on dark mode skins for links (#9034) 2021-01-21 14:41:42 -08:00
snipe 75a8639a20 Fixed weird checkbox display 
TODO: fix the 500 on the save
 2021-01-12 18:16:42 -08:00
snipe 380c6171b7 Check if the asset is deployed before prompting for an expected checkin date 2021-01-12 18:02:10 -08:00
snipe d36d6b8e07 Added expected_checkout as editable field in asset edit 2021-01-12 16:48:49 -08:00
snipe c00a1fa21b Added new generic datepicker partial 2021-01-12 16:48:32 -08:00
snipe bbcd215ea4 Suppress OAuth token errors 2021-01-12 08:58:40 -08:00
Godfrey Martinez 444f9a81da
Bug/ch15603/read only text field in saml screen dark (#8993) 
* fixed dark mode skins read only color schema

* fixed dark mode skins read only color schema
 2021-01-11 14:07:55 -08:00
snipe b4eee5a9b7 Merge remote-tracking branch 'origin/develop' 2021-01-05 19:40:25 -08:00
Ivan Nieto 72f9fe444d
Fix for default parameters in JS functions IE (#8973) 
* Small fix for IE which doesn't support default parameters in the function definition

* Stylistic changes for better comprehension
 2021-01-05 19:25:30 -08:00
snipe eb423c252a Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2021-01-04 09:09:39 -08:00
snipe 382fb31670 Updated translations (Finnish, Polish, Japanese, Turkish, Spanish) 2020-12-30 12:51:09 -08:00
snipe e6ba4a423d Fixed #8721 - duplicate asset tags in select list when asset has name 2020-12-21 13:43:54 -08:00
snipe 13ed6cde67 Migration to confirm password min complies with newer Laravel min 2020-12-21 12:39:19 -08:00
snipe cac78cdbf3 Use snipe-logo.png as default in settings seeder 2020-12-21 11:36:43 -08:00
snipe 8b67326e95 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-12-21 11:35:21 -08:00
snipe f65bc5caee Updated logos 2020-12-21 11:35:17 -08:00
Brady Wetherington 0329028e2c
Fixed #8926, #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927) 
* Fixed #8252 - circular references in location parents

* Remove non-translated translation changes

* Fix typo

* Add loop limit to avoid unforseen infinite loops

* Remove check against parent_id in location controllers

* Remove the Location->id=null piece (no longer needed)

* Fix some formatting and whitespace

* Re-introduce accidentally merged-out language file

Co-authored-by: Travis Miller <milletr@tulsaschools.org>
 2020-12-18 17:18:04 -08:00
snipe d3d96c8285 Reverted composer until we can figure out wtf happened 2020-12-15 17:25:17 -08:00
snipe 5909860c5a Updated exception handler 2020-12-15 17:25:05 -08:00
snipe 1023fa3edd Re-added updated slack library 2020-12-15 14:10:57 -08:00
snipe 65e6d56f1f Display the extension error at the bottom of the extension list to make it more noticable 2020-12-15 14:09:42 -08:00
snipe bf34385c3e Temp revert to old slack library 
Getting a weird error, need to troubleshoot remotely
 2020-12-15 13:43:18 -08:00
Godfrey Martinez 55a526a6b3
corrected background color for bulk checkout listable items in all da… (#8916) 
* corrected background color for bulk checkout listable items in all dark schemas

* resubmitting
 2020-12-15 12:37:22 -08:00
Evgeny bbf7fbcff4
Localization digit separator feature. (#8915) 
Provides an ability to localize the purchase_cost field in front-end hardware index table.
Has two digit separator formats in admin settings with comma and dot.
 2020-12-15 11:49:13 -08:00
snipe 4a5cb94d94 Switch version file back to develop 2020-12-14 17:47:02 -08:00
snipe cb184a9687 Updated composer.lock with newer packages 2020-12-14 17:46:39 -08:00
Alexander Chibrikin fb37dbed92
use supported package for slack (#8867) 
* Updated version.php to master

* use supported package for slack

Co-authored-by: snipe <snipe@snipe.net>
 2020-12-14 17:45:00 -08:00
João Paulo e410696a36
Fixed #8884: Fixed alpine image build (#8885) 
* Fixed #8884: update alpine image dependencies, fix permission error in vendor folder and laravel.log file

* Fixed #8884: Removes unnecessary changes to fix alpine image build

* Fixed #8884: Removes unnecessary changes to fix alpine image build

* Fixed #8884: Fix typo
 2020-12-14 17:42:43 -08:00
snipe 45bfec5cd3 Match setup admin on Quickstart password with min reqs for Settings model 2020-12-11 13:52:48 -08:00
snipe 055522510b Fixed logo in seeder 2020-12-09 08:48:47 -08:00
snipe f1d0d1bfe7 Merge remote-tracking branch 'origin/develop' 2020-12-09 08:19:18 -08:00
snipe c0aa6c153e Better callout for warning on api token page 2020-12-09 08:19:04 -08:00