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

937 commits

Author SHA1 Message Date
snipe
9a5d9eafeb
Merge pull request #9709 from morning-bird/master 
add CompanyableTrait
 2021-07-27 14:38:21 -07:00
Oskar Stenberg
5b5874499d Added import for min_amt for consumables 2021-07-12 11:46:19 +02:00
snipe
a016f4ecd0 Applies PR #9761 to integration 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 13:11:22 -07:00
snipe
19413a63da Make notes field searchable on status labels 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-28 11:53:17 -07:00
Petri Asikainen
ae2c77f97f Allow to bulk update min_amt 2021-06-17 00:36:04 +03:00
GMS ICT 2
ea7f18d0e6 add CompanyableTrait 2021-06-15 15:32:44 +07:00
snipe
fa786e615e Moved HasFactory 
Signed-off-by: snipe <snipe@snipe.net>
 2021-06-11 19:02:19 -07:00
Laravel Shift
b62d1f49e4 Shift cleanup 2021-06-10 20:19:27 +00:00
Laravel Shift
104b441e0d Shift to class based factories 2021-06-10 20:17:44 +00:00
Laravel Shift
9f43ce97e9 Convert deprecated $dates property to $casts 2021-06-10 20:17:18 +00:00
Laravel Shift
802dc9240d Shift bindings 
PHP 5.5.9+ adds the new static `class` property which provides the fully qualified class name. This is preferred over using class name strings as these references are checked by the parser.
 2021-06-10 20:16:56 +00:00
Laravel Shift
934afa036f Adopt Laravel coding style 
Shift automatically applies the Laravel coding style - which uses the PSR-2 coding style as a base with some minor additions.

You may customize the adopted coding style by adding your own [PHP CS Fixer][1] `.php_cs` config file to your project root. Feel free to use [Shift's Laravel ruleset][2] to help you get started.

[1]: https://github.com/FriendsOfPHP/PHP-CS-Fixer
[2]: https://gist.github.com/laravel-shift/cab527923ed2a109dda047b97d53c200
 2021-06-10 20:15:52 +00:00
Ivan Nieto Vivanco
d9f5f1182a Delete a couple lines that rewrites validation rules for asset tags in the model Asset.php:save() method. 2021-05-25 23:09:27 -05:00
snipe
a704614397 Bumped max for country on model 
Signed-off-by: snipe <snipe@snipe.net>
 2021-05-07 16:42:26 -07:00
Istvan Basa
b037d0efdd
fix ldap ad authentication filter query mechanism (#7441) 2021-04-20 21:25:45 -07:00
Ivan Nieto Vivanco
36bc47c61c
Handle regex format when assigned from API (#9443) 2021-04-20 14:44:47 -07:00
snipe
2986765a68 Implements #9373 
Signed-off-by: snipe <snipe@snipe.net>
 2021-04-14 11:17:59 -07:00
Godfrey Martinez
246cc0eaa8
Feature/ch16172/adding other fields to ldap sync settings (#9416) 
* new branch, added manager as an additional field. Currently having DB issues

* WIP DB Issue with eloquent

* added department to LDAP sync

* removed unused variables
 2021-04-14 10:17:57 -07:00
Sxderp
f01c93e162
Extend #6229 to include superuser permission check (#6772) 2021-04-05 20:26:06 -07:00
Ivan Nieto Vivanco
90a24539b0
Fixes/cli importer issue (#9199) 
* Added logic to handle the CLI importer.

* Fix bug introduced with the commit previous to the regression.

* Adds a validation for  variable when is null, add comments to clarify where the  class variable came from.

* Add support for when  variable is an instance of User class.
 2021-04-05 19:28:31 -07:00
Godfrey Martinez
5ea759f615
Fixed #7211, #9197, #7864, [ch15504] - Added additional LDAP fields to sync (#9318) 
* LDAP and Active Directory has plenty of other [ch15504]

* removed department id from ldap sync

* removed department id from ldap sync

* Update 2021_03_18_184102_adds_several_ldap_fields.php
 2021-04-05 19:26:04 -07:00
Ivan Nieto Vivanco
eb0ae74ef8
Fixes typo that doesn't accepts 'textarea' as custom field type element. (#9387) 2021-04-01 18:23:05 -07:00
snipe
a199c75f5c Added textarea and checkbox to validation rules 
Signed-off-by: snipe <snipe@snipe.net>
 2021-03-31 14:04:01 -07:00
Marc Leuser
90b7d34c69
Added #6695: add API endpoint for license seats (#8058) 
* remove miselading comment line

* added dedicated API endpoint for license seats

* don't display a seat name via API
it makes no sense and we don't have any particular sorting order
so the numbering would be inconsistent anyway

* reduce amount of IFs

* add sanity checks to show()

* fix goofed logging logic

* add tests for action log entries
 2021-03-29 19:41:26 -07:00
Jo Drexl
0114373468
Fixing #9224 (#9328) 2021-03-22 12:57:26 -07:00
Brady Wetherington
44eee019d9
Add variable declaration for $result (#9168) 2021-02-19 10:19:24 -08:00
snipe
5754f0aa3f Revert "Added logic to handle the CLI importer. (#9088)" 
This reverts commit 2e2d087639.
 2021-02-18 14:21:19 -08:00
Ivan Nieto
2e2d087639
Added logic to handle the CLI importer. (#9088) 2021-02-17 13:13:17 -08:00
Ivan Nieto
f89d789832
Fixes #8918 The validation rules on Manufacturer Model 'name' attribute are malformed. (#9133) 
* Fixes the validation rules on Manufacturer Model

* Fixes a little issue; if the manufacturer is active soft-deletes it, if is already deleted permanently deletes it
 2021-02-16 12:52:55 -08:00
Ivan Nieto
6772835efc
Added support for radio buttons in Custom Fields. (#9053) 2021-01-27 14:41:58 -08:00
snipe
0031fab0fe
Added termination date, depreciation in license column selection [ch14505] (#9052) 2021-01-27 01:34:32 -08:00
snipe
9f7f1460e9 Simplified availableForCheckout() on asset 2021-01-26 22:12:24 -08:00
snipe
75a8639a20 Fixed weird checkbox display 
TODO: fix the 500 on the save
 2021-01-12 18:16:42 -08:00
Brady Wetherington
0329028e2c
Fixed #8926, #8252 - introduce circular reference check for location parent_id - rebased from #8253 (#8927) 
* Fixed #8252 - circular references in location parents

* Remove non-translated translation changes

* Fix typo

* Add loop limit to avoid unforseen infinite loops

* Remove check against parent_id in location controllers

* Remove the Location->id=null piece (no longer needed)

* Fix some formatting and whitespace

* Re-introduce accidentally merged-out language file

Co-authored-by: Travis Miller <milletr@tulsaschools.org>
 2020-12-18 17:18:04 -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
6cf5426540 Removed unused validation rule 2020-11-25 11:00:28 -08:00
snipe
72fc03aa50 Adds location to searchableRelations for asset model 2020-11-24 19:49:46 -08:00
snipe
2c0b9f959b Comment with possible alternatve to the custom undeleted validator 2020-11-24 12:01:09 -08:00
snipe
2ea805b7ed Added search/sort by Location OU, added to listing 2020-11-17 22:17:07 -08:00
snipe
0286cf6d46 Prevent license categories from being deleted if there are licenses in that category 2020-11-17 19:22:10 -08:00
snipe
08784f9cc5 Make expected_checkin fillable 2020-11-13 03:22:26 -08:00
snipe
5ea9c31eab Removed debugging 2020-11-12 15:14:56 -08:00
snipe
f0e04ab9e4 Fixed #8726 - disallow archived assets to be checked out 2020-11-12 15:01:13 -08:00
snipe
7f7064c835 Make last_checkout fillable 2020-11-11 13:30:11 -08:00
snipe
30d68309a9 Add ability to checkout an asset if the user it’s assigned_to isn’t valid 
This would only happen if a merge-users went wonky
 2020-11-10 05:06:47 -08:00
snipe
bbd7a752a0 Minor cleanup 2020-11-02 23:58:49 -08:00
Brady Wetherington
0eda53c484 Add a new custom validator for Users to prevent someone from managing themselves 2020-10-23 16:55:10 -07:00
snipe
2aa8e1e76b
Merge pull request #8596 from snipe/fixes/8462_move_accessory_notes 
Fixes #8462 - move accessory notes into pivot table
 2020-10-23 14:19:51 -07:00
snipe
d03d4deef9 Temp fix for #8561 - manager_id validation error 2020-10-23 11:55:53 -07:00
snipe
21ceea0aed Removed extra debugging 2020-10-23 08:19:04 -07:00