lunax/snipe_it
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity Actions
4196 commits 1 branch 0 tags 220 MiB
Commit graph

4196 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Till Deeke
43437aac14 Adds acceptable contract to asset 2018-08-06 14:46:10 +02:00
Till Deeke
830a6cf67e Adds accepting/declining to new controller 2018-08-06 14:46:10 +02:00
Till Deeke
39e6b59335 Fixes some typos 2018-08-06 14:46:10 +02:00
Till Deeke
72b43b6526 Updates checkout notifications to use new routes for accepting 2018-08-06 14:46:10 +02:00
Till Deeke
e0423418d2 Moves logging checkin/checkout to separate listener 2018-08-06 14:46:10 +02:00
Till Deeke
e24f292a1a Updates checkout events to not depend on log 2018-08-06 14:46:10 +02:00
Till Deeke
17fc59f989 Adds back the checkin/checkout events after #5916 2018-08-06 14:46:10 +02:00
Till Deeke
775e46288e Cleanup of model attributes 2018-08-06 14:46:10 +02:00
Till Deeke
722f032895 Remove notification sending from loggable trait 2018-08-06 14:46:10 +02:00
Till Deeke
112a532618 Listen for checkout events and send appropriate notifications 2018-08-06 14:46:10 +02:00
Till Deeke
ef76908fce Listen for checkin events and send the appropriate notifications 2018-08-06 14:46:10 +02:00
Till Deeke
4a71542f23 Cleanup checkin notification constructors 2018-08-06 14:46:10 +02:00
Till Deeke
ea64abc607 Adds checkout events 2018-08-06 14:46:10 +02:00
Till Deeke
f0acf47101 Adds checkin events 2018-08-06 14:46:10 +02:00
Till Deeke
92a2a5ccbc Adds listeners for checking/checkout events 2018-08-06 14:46:10 +02:00
Daniel Meltzer
2d0df24ef3 Check for an existing username before getting creative. Fixes #6016 (#6039) 2018-08-03 16:35:13 -07:00
snipe
1a660911e7 Check for minimum PHP version in setup 2018-08-02 21:36:18 -07:00
snipe
84f20b6287 Added php version check to upgrade.php 2018-08-02 20:55:52 -07:00
snipe
134bddf4c7 Fixed #6029 - model number not appearing in checkin/checkout emails 2018-08-02 11:43:11 -07:00
Daniel Meltzer
e368a20427 Use filled instead of has. (#6033) 
I think this merged in a weird order and was missed by the global
find/replace.  This fixes bulkassets/bulkusers editing.

At some point we should look at refactoring BulkAssetsController@edit to
only run one DB query, rather than one per item.
 2018-08-02 09:54:19 -07:00