DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-19 12:04:21 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
14882 commits 97 branches 267 tags 296 MiB
Commit graph

14882 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 7ddb9becd4 Add @AdnanAbuShahad as a contributor 2018-07-18 06:59:03 -07:00
snipe 7d96709ee2 Add @mrgluek as a contributor 2018-07-18 06:58:28 -07:00
snipe 4413a9f0b6 Add @jgroblesr85 as a contributor 2018-07-18 06:58:10 -07:00
snipe 9611b55fb9 Add @georgwallisch as a contributor 2018-07-18 06:57:39 -07:00
snipe dffd535f68 Add @gdraque as a contributor 2018-07-18 06:57:17 -07:00
snipe 4aaf2da651 Add @possebon as a contributor 2018-07-18 06:55:47 -07:00
snipe 80ac46af78 Add @fgbs as a contributor 2018-07-18 06:55:12 -07:00
snipe 13c58b54fa Add @frapposelli as a contributor 2018-07-18 06:54:39 -07:00
snipe 355119187a Add @Erlpil as a contributor 2018-07-18 06:54:03 -07:00
snipe 0d96587b04 Add @EpixFr as a contributor 2018-07-18 06:53:30 -07:00
snipe be806def91 Add @dominiksenti as a contributor 2018-07-18 06:50:59 -07:00
snipe 8acf8027e9 Add @danielcb as a contributor 2018-07-18 06:49:25 -07:00
snipe 893a1fec57 Add @danielheene as a contributor 2018-07-18 06:48:58 -07:00
snipe d182e40aef Add @da-friedl as a contributor 2018-07-18 06:48:34 -07:00
snipe 6118aca949 Add @dpyroc as a contributor 2018-07-18 06:48:11 -07:00
snipe f0ac83179f Add @Wxcafe as a contributor 2018-07-18 06:47:18 -07:00
snipe 8969ffc14b Update @CronKz as a contributor 2018-07-18 06:46:45 -07:00
snipe 9fb130146a Add @kopi-item as a contributor 2018-07-18 06:46:24 -07:00
snipe d285ff673a Add @Againstreality as a contributor 2018-07-18 06:46:00 -07:00
snipe 7f586da856 Add @cwlin0416 as a contributor 2018-07-18 06:45:24 -07:00
snipe c35f5b3116 Add @chibacityblues as a contributor 2018-07-18 06:44:40 -07:00
snipe 12927d2d54 Add @rudashi as a contributor 2018-07-18 06:43:43 -07:00
snipe 6b06b87547 Add @benunter as a contributor 2018-07-18 06:42:30 -07:00
snipe 058f8ae3b8 Add @aschiavon91 as a contributor 2018-07-18 06:40:14 -07:00
snipe 1faedac04b Add @angeldeejay as a contributor 2018-07-18 06:39:39 -07:00
snipe 666c7321af Add @xelan as a contributor 2018-07-18 06:39:05 -07:00
snipe 6cbaf7396a Add @sirrus as a contributor 2018-07-18 06:38:25 -07:00
snipe b706acaa9f Add @RealEnder as a contributor 2018-07-18 06:36:42 -07:00
snipe 5870acb193 Add @albertoaldrigo as a contributor 2018-07-18 06:36:04 -07:00
snipe c00b633312 Add @a-royal as a contributor 2018-07-18 06:33:05 -07:00
snipe 1c0ee7c4c5 Fixed license checkout gate 2018-07-18 05:33:14 -07:00
snipe 961741b809 Fixed license checkout gate 2018-07-18 05:31:59 -07:00
snipe 5a66f0f373 Include show_in_list option in select 2018-07-18 04:00:04 -07:00
snipe 5a1e1c73c9 Include show_in_list option in select 2018-07-18 03:59:02 -07:00
snipe 3be68ec721 Fix location edit permissions 2018-07-18 03:43:45 -07:00
snipe 0f81e494ee Fix location update permission 2018-07-18 03:42:43 -07:00
snipe d88f66b019 Updated to stale.yml 2018-07-18 02:57:05 -07:00
snipe 027edbdb21 Fixed #5872 - asset maintenances listing showing created_at instead of start_date 2018-07-18 02:24:53 -07:00
Daniel Meltzer cf03d25934 Fix importer emailformat (#5871) 
* Fix Importer emailformat

Str::slug() strips periods from the string, which caused our existing
logic to misbehave when generating a user's email on an import.  Adjust
logic to use generateEmail() helper on user instead.  Also clean up some
of the logic in this method.

* Remove dead code.

* More refactor/cleanup of the user create method.  I think it is almost readable now.
 2018-07-17 16:46:08 -07:00
snipe 75232d2a70 Added link to jamf2snipe 2018-07-17 14:17:13 -07:00
snipe bcb966af12 Updated composer 2018-07-17 14:17:02 -07:00
snipe 0272e58868 Add @DeusMaximus as a contributor 2018-07-17 01:11:39 -07:00
snipe bcd988bb81 Merge branch 'develop' of https://github.com/DeusMaximus/snipe-it into develop 
# Conflicts:
#	app/Http/Controllers/Auth/LoginController.php
 2018-07-17 01:11:15 -07:00
snipe aa6c21f38d Fixed typo 2018-07-17 01:03:32 -07:00
snipe 3fb5f6f5be Revert 2018-07-17 01:03:25 -07:00
snipe 5dc2ac9e22 Try to fix test 
This is a listing, not a single asset
 2018-07-17 00:20:06 -07:00
snipe 0f85d6810b Added login log 2018-07-16 23:49:08 -07:00
snipe bf761946da Fix activated check for login 2018-07-16 23:48:46 -07:00
snipe d9fa2f0e91 Fixed #5842 - added components to location detail view 2018-07-16 21:50:14 -07:00
snipe 8a25677a8d Bumped hash 2018-07-16 21:35:21 -07:00