DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-09-24 01:37:34 -07:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4066 commits 89 branches 265 tags 291 MiB
Commit graph

4066 commits

This branch
This branch
All branches
Author SHA1 Message Date
Till Deeke 007e8fbdf9 simplified checkout event handling per @uberbrady’s suggestion 
This generalizes the checkout events into the CheckoutableCheckedOut and CheckoutableCheckedIn events.
 2018-09-10 16:40:26 +02:00
snipe e45b4efa1a Better info buttons on audit 
TODO: translated strings instead
 2018-09-07 18:08:18 -07:00
snipe 10d19be66c Added manager ID to validation 2018-09-07 17:27:31 -07:00
snipe b903ca05f7 Added manager ID to fillable fields in Location model 
This should enable the API to update manager ID
 2018-09-07 17:27:19 -07:00
Wes Hulette 1dff71e4df Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-09-07 13:36:12 -04:00
snipe 827295a989 Fixed tooltips 2018-09-07 05:39:56 -07:00
snipe ff879e2018 Added the ability to update asset location when auditing - per #5854 2018-09-07 05:39:41 -07:00
snipe e89b33f865 Enable popovers 2018-09-07 05:09:24 -07:00
snipe 181e75adb4 Apply hotfix for fixed category model scope 2018-09-07 03:56:17 -07:00
snipe 827a86b2ef Only send inventory report to users if they have things checked out to them 2018-09-07 03:08:32 -07:00
snipe 451f4c3320 Bumped watson validating package version, laravel to v5.7.2 2018-09-07 03:08:08 -07:00
snipe 77cdb2f409 Added console command to send inventory reports to users 2018-09-07 02:24:41 -07:00
snipe 26fd7f7e79 I have no idea why this was necessary suddenly 2018-09-06 14:28:04 -07:00
snipe b80b91514d Fixed Laravel 5.7 compatibility issue re: boot() method 
This was causing the error: Undefined index: App\Models\CustomField (View: /Users/snipe/Sites/snipe-it/snipe-it/resources/views/hardware/index.blade.php)

and pointed to the Eloquent model library method:

```
protected function initializeTraits()
    {
        foreach (static::$traitInitializers[static::class] as $method) {
            $this->{$method}();
        }
    }
```

Thanks to https://github.com/laravel/framework/issues/25455 for the clue.
 2018-09-05 19:27:37 -07:00
snipe 60459d07ce Added email image auto-embed support 2018-09-05 18:57:49 -07:00
snipe 84cc90e427 Added alt text to email headers 2018-09-05 18:57:36 -07:00
snipe bd40bd5a22 Upgrade to laravel 5.7.0 2018-09-05 14:58:07 -07:00
snipe 0e46b6fd42 Fixed #6152 - typo in upgrade script 2018-09-05 14:58:07 -07:00
Wes Hulette 161271b53a Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-09-04 12:04:53 -04:00
Wes Hulette a865f79d5e Fixed dashboard tables not showing data (#6143) 
Needed data-pagination="true" set
 2018-08-29 12:29:47 -07:00
Wes Hulette e9f6cbc97f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-08-29 12:45:56 -04:00
Wes Hulette 59559b1966 Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-08-28 16:39:07 -04:00
snipe a8b5fbde91 Add @inietov as a contributor 2018-08-28 13:31:36 -07:00
Ivan Nieto 0014ef054b Search functionality in accessories/{accessory} issue #5471: (#6070) 
From the collection of users displayed just filtered the data with the method where() and concat()
for the user can search for first name or last name. The solution is case sensitive.
 2018-08-28 13:25:16 -07:00
snipe 652548957d Add @Seldaek as a contributor 2018-08-28 13:15:21 -07:00
snipe 761ea4e581 Add @liquidhorse as a contributor 2018-08-28 13:15:08 -07:00
snipe 9c24d4300c Add @VELIKII-DIVAN as a contributor 2018-08-28 13:14:55 -07:00
snipe 39ab488d90 Add @patrict as a contributor 2018-08-28 13:14:41 -07:00
snipe ec67d03a7c Add @jwhulette as a contributor 2018-08-28 13:14:26 -07:00
Wes Hulette bfb5920677 Added #5956 - Moved bootstrap-tables to npm (#6139) 
Created single bootstrap-tables js and css file.
 2018-08-28 13:10:27 -07:00
Wes Hulette 0c02ff70f6
Merge pull request #1 from snipe/develop 
Develop
 2018-08-28 15:47:16 -04:00
patrict cf2d2ecdfc Depreciation Report: (#6135) 
* Added monthly depreciation column
* Right aligned amount column headings
* Added monthly depreciation heading text for en, en-GB & af
 2018-08-28 12:40:06 -07:00
Wes Hulette 3831ee9f5a Fixed #5811 - Non US Characters in user export (#6132) 
* Added Freebsd as vagrant machine for development

* Ran npm audit fix

Manually added peer depenencies

* Added charset=UTF-8 to content-type

Removed reference to throttle model as is is not longer included.
 2018-08-28 12:37:58 -07:00
Dmitriy Minaev bc8fa31eb2 Add depreciation with half-year convention. Fixed #1237 (#6128) 
* Add half-year convention in depreciation for Models/Depreciable.php

* Add a setting for the depreciation method

* Integrate half-year convention inside working output

* fix: add more checks at Depreciable.php

* depreciation value rounding

* Codestyle fix
 2018-08-28 12:32:46 -07:00
liquidhorse 678ba228cb Fixed #6079: QR Code unnecessarily squished. (#6080) 
* Fixed 2D barcode from being squished unnecessarily when 1D barcode is omitted.
Added one character of whitespace for code readability.
 2018-08-28 12:29:50 -07:00
snipe 5b8cbe29e1 Possible fix for #5054 - OpenLDAP (non-AD) LDAP users being deactivated 2018-08-27 14:51:37 -07:00
snipe 0b8d70c7ec Fixed #6124 2018-08-23 21:06:04 -07:00
snipe e4f6aefdad Added self-checkout permission option 2018-08-21 23:26:12 -07:00
snipe 771265113e Added cookie serialization for Laravel v5.6.30 2018-08-21 22:40:14 -07:00
snipe 3c23745508 Bumped to laravel 5.6.30 
Lower Laravel versions still triggered Roave/SecurityAdvisories :-/
 2018-08-21 20:08:34 -07:00
snipe f6971b8ab2 Fixed #6082 - don’t show expected checkin in email if none given 2018-08-16 14:30:06 -07:00
snipe aed769c0be Honor active status for forgotten password request forms 2018-08-14 20:05:57 -07:00
snipe 1543cdbc61 Set activated checkbox to 1 by default on new user 2018-08-14 18:17:37 -07:00
snipe ce45c3af4e Updated password reset language 2018-08-14 18:11:32 -07:00
snipe 25097bce31 Only allow activated users to reset their password 2018-08-14 18:04:27 -07:00
Till Deeke 62195a805a Adding some comments 2018-08-06 14:47:26 +02:00
Till Deeke 8c96e8fd4b Updates asset acceptance report to show unaccepted assets 2018-08-06 14:47:26 +02:00
Till Deeke 1bdf71b584 Handle side effects of accepting/declining 
When declining an asset, it gets checked in.
 2018-08-06 14:47:26 +02:00
Till Deeke 8648d53d25 Adds checkout acceptances 
A checkout acceptance gets generated for every item that needs to be checked out. This resource tracks the user user who can accept the item and their signature
 2018-08-06 14:47:26 +02:00
Till Deeke 6b05106dcb Moves license checkout stuff to the license seat 
Since we are really checking out a license seat instead of the whole license, we operate the checkin/checkout on the license seat instance.
 2018-08-06 14:47:26 +02:00