DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-26 22:19:41 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
3944 commits 101 branches 268 tags 288 MiB
Commit graph

3944 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8f6ea84fca Fixed #4568 - escaping values in custom report 2018-12-12 19:38:24 -08:00
snipe ea1b792a93 Fixed #6491 - cleaner return methods for PHP 7.3 compact() 2018-12-12 18:23:39 -08:00
Ben RUBSON 4ffb8f14b8 Improve Memcached settings (#6485) 
* Improved memcached settings

* Improved memcached settings
 2018-12-06 14:39:14 -08:00
Wes Hulette d023f61bc4 Fixed missing importer (#6413) 
Fixed missing manager_id
Fixed missing department_id
 2018-12-04 13:06:12 -08:00
snipe dd5ca73602 Set support footer and version footer to on when resetting the demo 2018-11-08 12:52:37 -08:00
snipe 2632f730d1 Sets activated to 0 in UserImporter if the activated column isn’t set 2018-11-07 22:36:58 -08:00
snipe 24c158bfe6 Added missing use statement for departments in importer 2018-11-07 18:33:43 -08:00
snipe 3d4a5a8066 More importer tweaks for dept and manager 2018-11-07 18:05:53 -08:00
snipe db7e0b56f2 Fixed department id on asset import with users 2018-11-07 17:36:34 -08:00
snipe f2478d813c Fix manager id if no manager is given in importer 2018-11-07 17:33:27 -08:00
snipe 192aa9eb71 Fixed #6386 - licenses not searching on category name 2018-11-02 17:14:08 -07:00
Tim Bishop 0eef0fc1dd Sync with develop branch. (#6377) 
Without this change argv[1] is ignored.
 2018-10-31 11:11:41 -07:00
snipe 81f8fe34cd Removed debugging line 2018-10-30 18:11:27 -07:00
snipe f744696043 Fixed #6375 - lowercase keys on findAndBindUser to address LDAP syncing issue 2018-10-30 13:12:10 -07:00
snipe 29b0780c6c Added company info to asset maintenances transforrmer 2018-10-30 00:20:16 -07:00
Wes Hulette 6b3b673daa Changed NULL coalesce from ?? (#6353) 
PHP 5 does not have the double question mark null coalesce support.
 2018-10-26 15:53:18 -07:00
snipe a4876e9f3e Updated language files 2018-10-26 15:51:38 -07:00
snipe 925258bfb4 Bumped version 2018-10-26 15:29:10 -07:00
snipe 1a10aa0dda Fixed #6349 - add view permission for print all assigned 2018-10-19 16:43:28 -07:00
snipe d6f8d1b464 Updated composer lock 2018-10-19 16:40:54 -07:00
snipe 09a102fea8 Only try to return a department if there is a matching field 2018-10-19 01:44:45 -07:00
snipe 304fce73fc Null if blank on user import 2018-10-19 01:38:14 -07:00
snipe 295a68bb7a Try false instead of null 2018-10-19 01:36:15 -07:00
snipe 3aeb521782 Patch PR #6335 to master 2018-10-19 01:30:05 -07:00
snipe f587d2248b
WIP: Better handle activation column in importer (#6290) 
* Better handle activation column

* Added comments for clarity on importer methods
 2018-10-19 00:23:12 -07:00
snipe 8579c5a68a Allow 0 as a consumable min amt 2018-10-15 17:04:51 -07:00
snipe 835b461d7d Fixed #6323 - typo in link for low inventory 2018-10-11 15:31:10 -07:00
Wes Hulette b8a37a0c73 Fixed Expiring Assets Email (#6321) 2018-10-11 14:03:00 -07:00
snipe 41b5b1dfd0 Bumped hash 2018-10-09 17:32:46 -07:00
snipe c7596e7741 Fixed image not uploading on asset create 2018-10-09 17:31:52 -07:00
snipe d4fa81301d Check if user can see assets in statuslabels gate 2018-10-09 16:34:12 -07:00
snipe ec7245965f Bumped to rollbar 2.4.1 
https://github.com/rollbar/rollbar-php-laravel/issues/65
 2018-10-04 17:09:12 -07:00
snipe de76e8db5f Re-enable rollbar 2018-10-04 12:11:36 -07:00
snipe a52575c7bf Lock rollbar to v2.3.0 
https://github.com/rollbar/rollbar-php-laravel/issues/65
https://github.com/rollbar/rollbar-php-laravel/issues/67
 2018-10-04 12:11:36 -07:00
Nenad Ticaric bf6703c2e8 fixing double word typo (#6292) 
Thanks!
 2018-10-04 09:41:50 -07:00
snipe 4db1dd8afc Fixed #6291 - send-welcome argument in cli importer 2018-10-04 04:43:06 -07:00
snipe c39e3acb59 Bumped hash 2018-10-04 02:24:41 -07:00
snipe 7a44da85a0 Fixed issue where admin users could disable activation when editing their own profile 2018-10-04 02:18:20 -07:00
snipe 890b613f71 Temporarily suppress rollbar 2018-10-03 15:47:56 -07:00
snipe 1014bd74e0 Updated rollbar 2018-10-03 14:58:14 -07:00
snipe db385e024b Possible proxy issue fix 2018-10-03 13:04:25 -07:00
snipe c8bff3ef38
Features/add manager and dept to importer (#6277) 
* Ignore the simlink for public storage

* Added manager and department to user import

* More UI importer tweaks

* Fisxed typos
 2018-10-02 15:43:54 -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 ff824ec4db Fixes #6252 - activated flag not checked when editing active user 2018-09-28 11:18:33 -07:00
snipe 75032def9e Fixed #4151 - Undefined index: samaccountname on LDAP import 2018-09-27 16:11:09 -07:00
snipe 3a0f738fb0 Added some hepful comments 2018-09-26 19:20:50 -07:00