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

5581 commits

This branch
This branch
All branches
Author SHA1 Message Date
Wes Hulette
b09afef46f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-09-28 17:17:48 -04:00
Wes Hulette
ecf77e60df Added: #6246 - CSS Cleanup (#6247) 
* Streamlined CSS by using NPM

Removed unnecessary CSS files
Merged CSS files into one file

* Streamlined CSS by using NPM

Removed unnecessary CSS files
Merged CSS files into one file

* Removed override.less

* Moved bootstrap-color-picker css to file

Removed inline calls

* Changed css import on setup.blade.php

* Updated signature-pad.css import

* NPM Prod compile

* Fixed font family loading issue.
 2018-09-28 14:09:48 -07:00
snipe
10bc35d604 Fixed PHP warning Undefined offset: 1 in upgrade.php 2018-09-28 12:13:35 -07:00
snipe
eea65a3f26 Fixed manufacturers item count 2018-09-28 12:03:27 -07:00
snipe
3b21a19491 Updated language strings 2018-09-28 11:54:52 -07:00
snipe
7a52477294 Added Icelandic and Serbian to locale list 2018-09-28 11:47:59 -07:00
snipe
ef0bd72076 Bumped version 2018-09-28 11:21:39 -07:00
snipe
a5abb3e6a6 Fixes #6252 - activated flag not checked when editing active user 2018-09-28 11:19:43 -07:00
snipe
ff824ec4db Fixes #6252 - activated flag not checked when editing active user 2018-09-28 11:18:33 -07:00
Wes Hulette
ea63936947 Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-09-28 08:29:33 -04:00
snipe
68a04c7a23 Fixed #4151 - Undefined index: samaccountname on LDAP import 2018-09-27 16:13:27 -07:00
snipe
75032def9e Fixed #4151 - Undefined index: samaccountname on LDAP import 2018-09-27 16:11:09 -07:00
Wes Hulette
b64924440f Merge remote-tracking branch 'snipe-it-upstream/develop' into develop 2018-09-27 16:39:07 -04:00
snipe
e5d0f74ba7 Fixed #6248 - add free seats to licenses API endpoint 2018-09-27 12:07:13 -07:00
Ivan Nieto
309f102745 Weird syntax in layout.blade.php. Change the use of 'or' operator to the null coalesce operator (#6240) 2018-09-26 22:33:34 -07:00
snipe
3a0f738fb0 Added some hepful comments 2018-09-26 19:20:50 -07:00
snipe
55846cc717 Changed LOG:: to Log:: 2018-09-26 19:06:31 -07:00
snipe
1784278a59 Fixed importer email test 2018-09-26 19:06:09 -07:00
snipe
afac0bc441 Removed old isActive model (unused) 2018-09-26 19:05:42 -07:00
snipe
ffbee77f6f
Patch for 5965 - multiple email recipients no longer working (#6238) 2018-09-26 15:47:53 -07:00
Wes Hulette
16e56646b8 Fixed #5965: Allow multiple alert email addresses (#6233) 
* Fixed #5965: Allow multiple alert email addresses

* Style changes based on PR feedback.
 2018-09-26 14:07:41 -07:00
Wes Hulette
82affd5154 Added PHP_CS & PHPMD files (#6234) 
Added PHP_CS & PHP mess detector file to help with code standardization.
 2018-09-26 12:10:11 -07:00
Ivan Nieto
73e88faa00 Using changes proposed by dmeltzer to eliminate has_licenses function in some tests code (#6218) 2018-09-25 14:01:21 -07:00
snipe
bcf9d2f75c Don’t require statuslabel view to check for deployable status 2018-09-25 13:39:54 -07:00
nix
f85e3edfc7 fixed checking permissions for users with no permissions set (#6229) 
When a user has no permissions set (=NULL) in the database (like after an
LDAP import) but is a member of a group with permissions, those group
permissions would not have be applied, effectively denying every access
regardless of group permissions.
 2018-09-25 13:24:50 -07:00
snipe
115f718cd9 Fix view if model doesnt have a manufacturer 2018-09-24 19:10:24 -07:00
snipe
9108ff8caa fixed typo 2018-09-24 19:06:12 -07:00
snipe
d5cf0f1fbd Prevent deleting manufactureres via API if they have items/models 2018-09-24 19:04:00 -07:00
Brady Wetherington
c97db3259f
Merge pull request #5913 from tilldeeke/refactore-checkout-checkin-notification-sending 
Refactor: Decouple checkin/checkout notifications from logging
 2018-09-21 18:18:27 -07:00
snipe
4b2093b485 Added counts to location show() API method 2018-09-21 15:51:26 -07:00
snipe
b69b5fdf84 Added counts to location show() API method 2018-09-21 15:50:14 -07:00
snipe
24aaa36532 Applied 3159e7713a to develop 2018-09-19 17:27:34 -07:00
snipe
d84366c6c5 Add empty array to groups if none filled in 2018-09-19 17:24:34 -07:00
Brady Wetherington
89e06054bf
Merge pull request #6205 from dasjoe/patch-1 
Fixes #5630
 2018-09-17 21:45:48 -07:00
Minaev Dmitriy
2604d3c1fd Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2018-09-14 19:36:01 +03:00
Ivan Nieto
b692f67779 Revision of #5471 (#6148) 
* Search functionality in accessories/{accessory} issue #5471:
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.

* A better fix to issue #5471. Now using the established relationship to querying for the users. Also Case-insensitive.

* Fixed previous commit that has magic number in the find method parameter of AccessoriesController.
 2018-09-12 22:50:45 -07:00
Juho Taipale
05b03df600 Fix for issue #6165 (#6168) 
* Fix problem when using ValidatingTrait

* Checking that email alerts are enabled when trying to send expected check-in alerts (fix for issue #6169)
 2018-09-12 22:49:50 -07:00
Hajo Möller
3159e7713a
Fixes #5630 2018-09-11 13:07:45 +02:00
Till Deeke
e445e201f3 Adds a migration to create checkout acceptances 
This creates the checkout acceptances for assets (basically what was previously shown in the „Unaccepted Assets“-report) when migrating the database
 2018-09-10 17:37:24 +02:00
Till Deeke
bbd1d6059a Fixes errors in tests 2018-09-10 17:16:07 +02:00
Till Deeke
86f49d34c3 Redirects users from old acceptance screen to new overview 2018-09-10 17:13:16 +02:00
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
adf6e7d1cd Added group support for user API 2018-09-07 18:25:58 -07:00
snipe
ba3662a9ed Bumped hash 2018-09-07 18:12:29 -07:00
snipe
05ea61421f Added manager_id to fillable for locations API 2018-09-07 18:11:38 -07: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