DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-10 07:34:06 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4126 commits 97 branches 266 tags 291 MiB
Commit graph

4126 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
snipe b69b5fdf84 Added counts to location show() API method 2018-09-21 15:50:14 -07:00
Brady Wetherington 89e06054bf
Merge pull request #6205 from dasjoe/patch-1 
Fixes #5630
 2018-09-17 21:45:48 -07:00
Hajo Möller 3159e7713a
Fixes #5630 2018-09-11 13:07:45 +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 22ef2ce0b6 Bumped hash 2018-09-07 03:20:31 -07:00
snipe 51d3d130e4 Fixed Not unique table/alias: 'models' on custom report triggered when category is selected 2018-09-07 03:19:54 -07:00
snipe d8a8e1cc09 Bumped version 2018-08-28 11:43:56 -07:00
snipe 522dc1db2a Fixed #6124 2018-08-23 21:05:10 -07:00
snipe db907815ff Removed check for active in password reset form 2018-08-21 18:40:27 -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