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 c0d7564658 Fixed #8794 - Switched to firstOrCreate to create parents on import 2020-11-24 16:05:24 -08:00
snipe e9bfb157bb Bumped version. Again. 2020-11-24 13:53:28 -08:00
snipe 973eacf6c3 Small fixes for SAML 
The SAML routes are in a service provide (sigh), so they did not have the `web` middleware group assigned to it.

I also added some additional checks so that the setup blade won’t fail (the migrations wouldn’t have been run yet, so outside of a try/catch, it would return an error since those tables don’t exist.)
 2020-11-24 13:51:02 -08:00
snipe b2660002b9
Fixed #8781 - added asset count by status type (#8806) 2020-11-24 12:15:07 -08:00
snipe 2c0b9f959b Comment with possible alternatve to the custom undeleted validator 2020-11-24 12:01:09 -08:00
snipe 51286d2244 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-24 11:40:35 -08:00
snipe 712363f861 Bumped version 2020-11-23 12:33:07 -08:00
johnson-yi 0cdd83aabf
Fixes #8584, #8654, #8727 - fixes and improvements for saml (#8795) 
* Let onelogin/php-saml know to use 'X-Forwarded-*' headers if it is from a trusted proxy

* Gracefully handle the case where openssl_csr_new fails when openssl.cnf is invalid/missing

* Improve ui of saml sp metadata by displaying it's url and a download button
 2020-11-20 18:54:25 -08:00
snipe 8a38b9d018 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-20 14:34:35 -08:00
Brady Wetherington 734cb941dd
Fix for #8772 - initial LDAP import of users are deactivated (#8776) 2020-11-20 11:11:14 -08:00
snipe c66f8c04c8 For for deleted user API 2020-11-18 14:57:44 -08:00
Brady Wetherington fa24799d2b
Change license serial type to TEXT for longer license files (#8782) 2020-11-18 14:22:51 -08:00
snipe 57d6a7d35e Fixed #8753 - create-asset-from-model did not preselect the model 2020-11-18 13:59:02 -08:00
snipe 551e28eec9 Fixed #8749 - added more default colors to prevent missing index in pie chart math 2020-11-18 07:06:14 -08:00
Brady Wetherington 8457207c8f
Fix for 500-page on deactivated LDAP user trying to log in (#8774) 2020-11-17 22:31:22 -08:00
snipe 2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
Brady Wetherington 3dda4c9116
Add a new UAC setting to valid User Accounts for Active Directory (#8775) 2020-11-17 19:25:49 -08:00
snipe 0286cf6d46 Prevent license categories from being deleted if there are licenses in that category 2020-11-17 19:22:10 -08:00
snipe 68487e1200 Added img-responsive class to preview images 2020-11-17 16:15:25 -08:00
snipe f19b9a44fc Fixed #8773 - wrong path for suppliers image on suppliers edit 2020-11-17 16:10:54 -08:00
snipe 7f126969d0 Fixed #8601 - Switched to “attachment” from “base64” 2020-11-17 14:33:16 -08:00
snipe 7ab44ca963 Ignore php-lint cache 2020-11-17 13:43:24 -08:00
snipe 4898b58bdb Fixed #8765 - UI not indicating model is required 2020-11-17 13:40:15 -08:00
snipe 9b1e7ba8a6 Updated translations with new strings 2020-11-17 13:22:53 -08:00
snipe e3d2369151 Fixed #8769 - incorrect translation for “DELETE” in purge 2020-11-17 12:01:02 -08:00
Brady Wetherington de6f3f866f
Attempt to solve LDAP sync overriding administrator choices (#8742) 2020-11-17 00:11:00 -08:00
snipe 8444a60bc9 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-16 23:57:23 -08:00
snipe 3237411b5d Bumped version 2020-11-16 23:57:17 -08:00
snipe 5ba1659563 Removed dupe date 2020-11-16 23:56:48 -08:00
snipe 6e068ec339 Add @chamilton-ccn as a contributor 2020-11-16 22:15:59 -08:00
Charles Hamilton 4fd666716f
Fixed #8482 - Ubuntu version (#8598) 
* Bash cannot compare floating point numbers natively. This modification addresses issue #8482 and retains the intended function of the previous code.

* Bash cannot compare floating point numbers natively. This modification addresses issue #8482 and retains the intended function of the previous code.

Co-authored-by: Charles Hamilton <chamilton@dyercpa.com>
 2020-11-16 22:15:40 -08:00
snipe 6eb860ca24 Swapped travis build badge for chipper build badge 2020-11-16 21:49:57 -08:00
snipe 903698a7b0 Merge remote-tracking branch 'origin/develop' 2020-11-16 21:35:26 -08:00
snipe 513faf2db5 Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-11-16 21:34:59 -08:00
snipe 9e46bc6c28 Fix for spanish translation 2020-11-16 21:34:47 -08:00
NMC 402fecd408
Fixed #7850: allow xlsx file. (#8386) 
Thanks!
 2020-11-16 21:32:15 -08:00
Brady Wetherington a97b15ec96
Re-add LDAP "test login" feature to LDAP settings (helps with #8751) (#8757) 
* Start work on re-adding back the "Test LDAP logins" feature to develop

* Add back-end method to allow LDAP test users to try to log in.
 2020-11-16 21:23:08 -08:00
snipe 8504c9e8b9 Added phplint to dev in composer 2020-11-16 19:08:04 -08:00
snipe 4ebfd6624c Merge remote-tracking branch 'origin/develop' 2020-11-16 17:24:57 -08:00
snipe fbaf6e2494 Fixed #8747 - upload path for uploaded images 2020-11-16 16:39:02 -08:00
snipe 612d3f9b2a Merge remote-tracking branch 'origin/develop' 2020-11-16 13:32:53 -08:00
Brady Wetherington 6e4ab5cd96
Fix for #8746 - missing comma in a translation file (#8756) 2020-11-16 13:29:57 -08:00
snipe 849966d2c5 Merge remote-tracking branch 'origin/develop' 2020-11-13 16:48:58 -08:00
snipe 1f5bcf2475 Added option to download activity report 2020-11-13 16:25:05 -08:00
snipe 58c476195b Bumped hash 2020-11-13 14:14:27 -08:00
snipe dcd98a7bf1 Bumped hash 2020-11-13 14:13:44 -08:00
snipe 686ab681e5 Removed duplicate badge 2020-11-13 13:54:27 -08:00
snipe 052f8e2c42 Addresses - not fixes - #8740 
More investigation here is needed
 2020-11-13 12:34:42 -08:00
snipe e9578ba8a1 Fixed #8737 - incorrect validation string for components update 2020-11-13 12:09:48 -08:00
snipe 0c0de5e351 Added clarity in language as to what the activated flag does on LDAP screens 2020-11-13 11:52:34 -08:00