DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 20:14:09 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
5806 commits 97 branches 267 tags 296 MiB
Commit graph

5806 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe c8d588871c Merge remote-tracking branch 'origin/develop' 2020-11-11 14:47:30 -08:00
snipe 8890372a69 Production assets with dark skin fixes 2020-11-11 14:47:13 -08:00
Godfrey Martinez 80f2d749a2
Corrected css to the bootstrap popovers for all dark mode skins (#8714) 
* added css to the bootstrap popovers in dark blue

* corrects the tool tips css for all dark mode skins other than dark blue
 2020-11-11 14:11:39 -08:00
snipe 7f7064c835 Make last_checkout fillable 2020-11-11 13:30:11 -08:00
snipe 31d0b4a46c Merge remote-tracking branch 'origin/develop' 2020-11-10 12:39:55 -08:00
snipe 5759d4819e
Improved upgrade.php script to check for PHP extensions (#8712) 
* Troubleshooting gd detection :(

* Welp, that didn’t work.

* Improvements to the update script that will make it easier to maintain

* Improved spacing

* Nicer intro

* Sorry for all the commits - I have to push in order to test :(

* More display improvements

* Phrasing!

* More formatting

* Removed extra line break

* Few more formatting changes

* Remove the config caching - it’s too confusing for users

* Added comments

* Temp required extension in the array so I can show output :)

* Added ascii x

* removed extra line break

* Made error message clearer

* Remove extra line

* Removed farts

* Changed phrasing for PHP upgrade warning

* Small tweaks per PR review

* Some spacing fixes

* Added confirmation of the either/ors

* Minor formatting tweaks

* Fixed weird indenting?

* Fixed missing $unused_file variable
 2020-11-10 12:39:10 -08:00
snipe c49788dd9f Fixed weird linebreaks in upgrade.php 2020-11-10 09:08:13 -08:00
snipe 3641a6d451 Additional extension checking 2020-11-10 09:06:44 -08:00
snipe 8c79070cd9 Added some extension checking for upgrade.php 2020-11-10 08:47:35 -08:00
snipe f8563bec94 Added some extension checking for upgrade.php 2020-11-10 08:46:19 -08:00
snipe fd7c0bc5fb Use newer blade facade for requests 2020-11-10 08:36:18 -08:00
snipe 7d708572fc Slightly nicer formatting for query 2020-11-10 07:43:54 -08:00
snipe ea68ff1284 Sigh. Typo 2020-11-10 06:51:40 -08:00
snipe 66ccf4da03 Merge remote-tracking branch 'origin/develop' 2020-11-10 06:44:10 -08:00
snipe 0b4a13156f Added more detail and dryrun to assigned_to vs log checker script 2020-11-10 06:43:36 -08:00
snipe a8a3962008 Merge remote-tracking branch 'origin/develop' 2020-11-10 06:17:04 -08:00
snipe e110a7b15e Experimental script to find mismatched IDs based on logs 2020-11-10 06:16:15 -08:00
snipe 30d68309a9 Add ability to checkout an asset if the user it’s assigned_to isn’t valid 
This would only happen if a merge-users went wonky
 2020-11-10 05:06:47 -08:00
snipe 547d1a5a93 Merge remote-tracking branch 'origin/develop' 2020-11-10 04:43:20 -08:00
snipe adf64361e8 Updated most recent translations 2020-11-10 04:43:02 -08:00
snipe a43fb060f4 Throw an error if the asset cannot be updated in the merge 2020-11-10 04:41:40 -08:00
snipe c607d89817 Merge remote-tracking branch 'origin/develop' 2020-11-10 01:59:18 -08:00
snipe 8c19b11e73 Fixed #8448 - “undefined” when testing email from quickstart 2020-11-10 01:48:18 -08:00
snipe 178ed82dc4 Fixed [ch9336] - Removed time stamp in Depreciation report 2020-11-10 01:13:13 -08:00
snipe 6757df5a2d Added Checkout Date Time to Asset Details Page [ch1418] 2020-11-10 01:02:08 -08:00
snipe 044dfe2620 Fixed [ch945] - Status colors are not displaying correctly in the chart on the dashboard 2020-11-10 00:54:39 -08:00
snipe 9e319e91d6 Merge remote-tracking branch 'origin/develop' 2020-11-09 23:56:33 -08:00
snipe 895a544d4c Fixed [ch15347] - added status in Depreciation Report 2020-11-09 23:56:16 -08:00
snipe 2aa9412565 Bumped version 
# Conflicts:
#	config/version.php
 2020-11-09 23:09:46 -08:00
snipe 35ab5c7df0 Bumped version 2020-11-09 23:09:10 -08:00
snipe 8a7cd87644 Merge remote-tracking branch 'origin/develop' 2020-11-09 23:05:40 -08:00
snipe 1cdf6f8263 Fixed #8673 - added category to accessories listing on Account > Assigned Assets 2020-11-09 23:05:19 -08:00
snipe b8ad930690 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:55:42 -08:00
snipe ec14a117b7 Display on the API token page the expiration in years 
TODO: Translate these strings
 2020-11-09 22:55:27 -08:00
snipe b7cc12a466 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:53:23 -08:00
snipe f4080a7aa9 Fixed created_at and expired_at order in API token screen 2020-11-09 22:53:07 -08:00
snipe 5abfbdd1d2 Allow API token expiration in years to be configured via env 2020-11-09 22:52:55 -08:00
snipe 31bbb2d035 Merge remote-tracking branch 'origin/develop' 2020-11-09 22:43:41 -08:00
snipe 33dca84ec7 Show expiry and created at date on API token page 2020-11-09 22:43:27 -08:00
snipe 460485d843 Make API tokens expire in 20 years 
TODO: Make this configurable and report the expiration in the UI
 2020-11-09 22:33:43 -08:00
snipe b59269d5e2 Bumped version 2020-11-09 21:46:42 -08:00
snipe 118931b6fb Merge remote-tracking branch 'origin/develop' 2020-11-09 21:46:26 -08:00
snipe 8bbf8409b1 Bumped hash 2020-11-09 21:46:08 -08:00
snipe b2101a5188 Merge remote-tracking branch 'origin/develop' 2020-11-09 21:09:05 -08:00
snipe ede20523f2 Fixed #8680 - location image path 2020-11-09 21:08:19 -08:00
snipe 89d9b830a0 Updated PHP requirement 2020-11-09 21:05:41 -08:00
snipe d76eea53c4 Bumped hash 2020-11-09 19:45:27 -08:00
snipe 63a8535de1 Merge remote-tracking branch 'origin/develop' 2020-11-09 19:11:37 -08:00
snipe ef7434b7ac Updated template 2020-11-09 19:11:18 -08:00
snipe 148b375ec2 Make 600 a string for ini_set 2020-11-09 19:11:00 -08:00