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

6209 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
d8a8e1cc09 Bumped version 2018-08-28 11:43:56 -07:00
snipe
5b8cbe29e1 Possible fix for #5054 - OpenLDAP (non-AD) LDAP users being deactivated 2018-08-27 14:51:37 -07:00
Minaev Dmitriy
a77b8c2023 Codestyle fix 2018-08-26 18:47:35 +03:00
Minaev Dmitriy
40dd34b5bf depreciation value rounding 2018-08-25 20:18:31 +03:00
Minaev Dmitriy
daba90b346 fix: add more checks at Depreciable.php 2018-08-25 19:17:48 +03:00
Minaev Dmitriy
7b70afa2a1 Integrate half-year convention inside working output 2018-08-24 20:30:22 +03:00
snipe
0b8d70c7ec Fixed #6124 2018-08-23 21:06:04 -07:00
snipe
522dc1db2a Fixed #6124 2018-08-23 21:05:10 -07:00
Minaev Dmitriy
8d3b201a49 Add a setting for the depreciation method 2018-08-23 20:49:20 +03:00
Minaev Dmitriy
49ecc08398 Add half-year convention in depreciation for Models/Depreciable.php 2018-08-23 20:29:03 +03: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
db907815ff Removed check for active in password reset form 2018-08-21 18:40:27 -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
ae6abdddad Check the user is active before displaying password reset 
This would only come into play if an inactive user already received a password reset email and then the system was upgraded to prevent those emails from being sent to inactive users
 2018-08-14 19:04:47 -07:00
snipe
63c9fbe10c Temporarily disbable notifying users on import 2018-08-14 18:27:46 -07:00
snipe
101dfd01f2 Bumped hash 2018-08-14 18:22:53 -07:00
snipe
1543cdbc61 Set activated checkbox to 1 by default on new user 2018-08-14 18:17:37 -07:00
snipe
5db5134ae0 Set activated to default on when new user is created 2018-08-14 18:14:41 -07:00
snipe
5294489b0e Fixed HTML typo 2018-08-14 18:14:29 -07:00
snipe
ce45c3af4e Updated password reset language 2018-08-14 18:11:32 -07:00
snipe
05b2b8fb59 Tweaked code/language for password reset 2018-08-14 18:09:33 -07:00
snipe
25097bce31 Only allow activated users to reset their password 2018-08-14 18:04:27 -07:00
snipe
0100c56046 Only allow password reset if user is active 2018-08-14 17:46:29 -07:00
Jordi Boggiano
e81b221fd1 Fix license identifier (#6043) 2018-08-08 20:36:45 -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