DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-11 08:04:09 -08:00
Code Issues Actions 11 Packages Projects Releases Wiki Activity
6172 commits 97 branches 266 tags 292 MiB
Commit graph

6172 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
snipe da3451bf0d Merge remote-tracking branch 'origin/develop' 2020-12-09 08:15:04 -08:00
snipe 5f76e03616 Clarified API url info in account > api 2020-12-09 08:14:44 -08:00
snipe 84710eac98 Merge remote-tracking branch 'origin/develop' 2020-12-08 21:10:05 -08:00
snipe 81bf41a091 Added an explanation for folks trying to access the API base endpoint with no real endpoint 2020-12-08 21:05:01 -08:00
snipe 134acf3b87 Merge remote-tracking branch 'origin/develop' 2020-12-08 20:04:19 -08:00
snipe 82d8b2ab82 Fixed weird parsing in newer markdown 2020-12-08 20:04:01 -08:00
snipe adc0d3a6ac Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-12-08 16:53:43 -08:00
snipe 8b15841c4b Bumped version 2020-12-07 19:16:42 -08:00
snipe fd4ee60276 Merge remote-tracking branch 'origin/develop' 2020-12-07 19:14:00 -08:00
Brady Wetherington 93358b5872
Merge pull request #8863 from johnson-yi/fixes/saml_debug 
Fixes #8853 - allow saml to be more easily debugged
 2020-12-07 14:50:23 -08:00
Johnson Yi 1c4e20c712 Allow saml to be more easily debugged 2020-12-04 21:54:04 +11:00
snipe 0e1f6a3fd1 Merge remote-tracking branch 'origin/develop' 2020-12-02 12:38:16 -08:00
snipe 71d0e6369e Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-12-02 11:01:10 -08:00
snipe b27aeb1952 Added LDAP flag in users API for #8741 2020-12-02 11:01:05 -08:00
snipe bec2b170ec Only overwrite notes if the LDAP user is new 2020-12-02 11:00:18 -08:00
snipe 269d3fe509 Make assigned_to_id nullable 2020-12-02 10:48:34 -08:00
Brady Wetherington 34d5473553
Fixes 8472 (again) - LDAP sync was assigning a bad default location (#8846) 2020-12-01 21:26:52 -08:00
snipe 4ac15daee7 Fixed #8147 - allow webp image format for public file uploads 2020-12-01 19:06:53 -08:00
snipe 5f3a1f6287 Merge remote-tracking branch 'origin/develop' 2020-11-30 20:47:03 -08:00
snipe bfc60864dd Fixed typo on route for licenses 2020-11-30 20:46:45 -08:00
snipe ffa2701f89 Fixed typo in demo logo 2020-11-30 18:59:44 -08:00
snipe 60d269afb5 Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-11-30 17:28:46 -08:00
snipe e2cb7a0242 Bumped version 2020-11-30 17:28:03 -08:00
snipe f9b1fdc36b Merge remote-tracking branch 'origin/develop' 2020-11-30 17:26:31 -08:00
Brady Wetherington 93cf8d4e0a
Forward-port of the old LDAP sync system (#8801) 
* Forward-port of the old LDAP sync system

* Need to rename the class to avoid classname conflicts

* Make 'classic' LDAP sync not add surrounding parens to filters that already have them

* Re-work Test LDAP button to return 10 sample users

* Remove useless debugging code
 2020-11-30 17:11:44 -08:00
snipe e83bc03d97 Switch backup files array order to show latest first [ch15486]' 2020-11-30 14:46:10 -08:00
snipe b0d493ee51 Merge remote-tracking branch 'origin/develop' 2020-11-30 12:54:30 -08:00
snipe 4882b01787 Added purchase order and order number to user > licenses view 2020-11-30 12:54:15 -08:00
snipe f9dcf0783a Added phantomjs to package.json 2020-11-28 16:58:02 -08:00
snipe 985f3658be Added wider logo 2020-11-27 18:17:09 -08:00
snipe 705dd34f3e Removed older SAML fields 2020-11-27 18:14:32 -08:00
snipe 6cf5426540 Removed unused validation rule 2020-11-25 11:00:28 -08:00
snipe 2105a1ec1d Merge remote-tracking branch 'origin/develop' 2020-11-25 08:55:14 -08:00
snipe f475bdbb2d Fixed #8797 - use html_entity_decode in fullName presenter for User 2020-11-25 08:54:23 -08:00
snipe 96eb623229 Merge remote-tracking branch 'origin/develop' 2020-11-25 01:53:21 -08:00
snipe 820a39cc90 Fixed #8814 - added App\Models\Recipients\AlertRecipient 2020-11-25 01:52:56 -08:00
snipe 615051cf66 Skip posix_getpwuid in upgrader if posix isn’t installed 
We don’t need it for anything else, so no need to require it. Posix not being installed usually means it’s a windows machine.
 2020-11-25 01:19:32 -08:00
snipe bef42eb43c Merge remote-tracking branch 'origin/develop' 2020-11-25 00:47:15 -08:00
snipe 6f99ce2b07 Branding page UI improvements (image previews inline) 2020-11-25 00:45:46 -08:00
snipe 76ee5a679b Fixed #8810 - email logo was not being used in emails 2020-11-25 00:05:02 -08:00
snipe 26e4354433 Merge remote-tracking branch 'origin/develop' 2020-11-24 19:49:59 -08:00
snipe 72fc03aa50 Adds location to searchableRelations for asset model 2020-11-24 19:49:46 -08:00
snipe bf1f8659cb Merge remote-tracking branch 'origin/develop' 2020-11-24 16:06:01 -08:00
snipe c0d7564658 Fixed #8794 - Switched to firstOrCreate to create parents on import 2020-11-24 16:05:24 -08:00
snipe 74b26a349c Merge remote-tracking branch 'origin/develop' 
# Conflicts:
#	config/version.php
 2020-11-24 13:54:02 -08:00
snipe e9bfb157bb Bumped version. Again. 2020-11-24 13:53:28 -08:00
snipe ef957399aa Merge remote-tracking branch 'origin/develop' 2020-11-24 13:51:19 -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