DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-28 15:09:40 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5696 commits 101 branches 268 tags 288 MiB
Commit graph

5696 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 10cadecd14 Moved a few of the user edit fields to make more sense (optional stuff further down) 2020-11-13 11:52:09 -08:00
snipe 644084658a Merge remote-tracking branch 'origin/develop' 2020-11-13 04:30:03 -08:00
snipe 07936ea901 Changed asset name to asset tag in maintenances 2020-11-13 03:38:31 -08:00
snipe 08784f9cc5 Make expected_checkin fillable 2020-11-13 03:22:26 -08:00
snipe a87e615e7f Fixed #8544 - escaping on maintenance notes 2020-11-12 23:55:16 -08:00
snipe df5cc7525e Merge remote-tracking branch 'origin/develop' 2020-11-12 23:39:09 -08:00
snipe 75b8c3455c Fixed #8609 - custom fieldsets not draggable anymore (regression) 2020-11-12 23:38:12 -08:00
snipe 81d38a0ded Fixed #8733 - typo in unaccepted assets report 2020-11-12 23:26:05 -08:00
snipe b2a8af2fa9 Fixed #8647 - Added additional help info on importer page 2020-11-12 22:46:51 -08:00
snipe 9d2363741e Improved 2FA reset layout 2020-11-12 22:25:07 -08:00
snipe fc6a33ad38 Added some LDAP debugging - related to #8670 2020-11-12 22:19:16 -08:00
snipe 896ce3456e Possible fix for #8670 - LDAP users deactivated on login 2020-11-12 22:18:49 -08:00
snipe 9db191f0b2 Fixes for #8732 - Flysystem paths, migrator script 2020-11-12 21:46:06 -08:00
snipe c7d752fb65 Added S3 url into CSP 2020-11-12 19:50:01 -08:00
snipe 5026177161 Added link to bricelabelle/snipe-it-bulkedit 2020-11-12 18:55:02 -08:00
snipe d2805442ad Updated Laravel version 2020-11-12 18:54:49 -08:00
snipe 7765c87387 Fixed #8669 - Allow application/xml in SAML upload in Safari 2020-11-12 18:47:19 -08:00
snipe 6dccf399a5 Fixed offset issue for #8732 2020-11-12 15:51:31 -08:00
snipe 7432e3fb2d Add @dampfklon as a contributor 2020-11-12 15:28:29 -08:00
snipe caeea9f530 Merge remote-tracking branch 'origin/develop' 2020-11-12 15:27:49 -08:00
snipe 0fdfd013e7 Fixed #8715 - wrong API url for unaccepted assets 2020-11-12 15:26:50 -08:00
snipe d537fc5c32 Added linebreak to console confirmation 2020-11-12 15:21:00 -08:00
snipe 9164dda64f Added artisan command to purge logins 2020-11-12 15:20:15 -08:00
snipe 5ea9c31eab Removed debugging 2020-11-12 15:14:56 -08:00
snipe c8572deb5c Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-12 15:13:50 -08:00
snipe 57d25ebb20 Fixed #8719 - use same convention for file names on licenses as we do on assets 2020-11-12 15:13:45 -08:00
Dampfklon be114176a2
Refactor Expected Checkin Notification into markdown and enable translation (#8236) 
Co-authored-by: snipe <snipe@snipe.net>
 2020-11-12 15:09:40 -08:00
Dampfklon 1f9b04405c
Enable translation of accept-asset page (#8237) 2020-11-12 15:07:45 -08:00
Dampfklon 4ef11c463c
Enable translations of checkin notifications (#8235) 2020-11-12 15:05:57 -08:00
Dampfklon 5fb31a5a3f
Use translated salutation from other notifications (#8234) 2020-11-12 15:05:22 -08:00
snipe f0e04ab9e4 Fixed #8726 - disallow archived assets to be checked out 2020-11-12 15:01:13 -08:00
snipe 8a65081768 Possible fix for #8732 2020-11-12 14:47:38 -08:00
snipe c451fde466 Fixed exception namespace 2020-11-12 14:27:59 -08:00
snipe 5098d69c05 Fixed stupid auto-indent 2020-11-12 14:20:54 -08:00
snipe b12de13041 Fixed markdown in expiring licenses alert 2020-11-12 14:10:45 -08:00
snipe 72126f7d44 Removed duplicate extension checks 2020-11-12 13:24:53 -08:00
snipe df000ce32f Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-12 13:22:54 -08:00
snipe 6a2e21f502 More in depth error reporting on mail test failure 2020-11-12 13:22:49 -08:00
Brady Wetherington 5ad6234584
Merge pull request #8730 from winstan/patch-1 
Fixed #8699: exclude blank LDAP attributes from searches
 2020-11-12 11:26:19 -08:00
Anthony Winstanley cc79bb1449
Exclude blank LDAP attributes 
Asking for '' attributes is an error for some LDAP servers.
 2020-11-12 09:34:28 -08:00
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