DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-16 02:24:09 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity
5082 commits 96 branches 267 tags 295 MiB
Commit graph

5082 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 8d23398176 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-07-18 20:07:14 -07:00
snipe 5aae930e8c Bumped version 2018-07-18 20:05:48 -07:00
snipe 6db096c336 Add @takuy as a contributor 2018-07-18 20:04:09 -07:00
snipe 78d27e82c8 Updated language strings 2018-07-18 20:03:31 -07:00
Sam 2a4fef6a61 adds select-id as an option for the asset-select partial. allows you to manually override the ID of an element. currently, the bulk-checkout partial has two asset-selects, with conflicting IDs. attempts to resolve #5882 (#5883) 2018-07-18 19:55:13 -07:00
snipe 9daeeeb851
Features/nicer notifications (#5886) 
* Improved expiring licenses notification

* Improved expiring assets notification

* Nicee low inventory notification

* Refactored stupid language strings

* Oops

* Use settings variable
 2018-07-18 19:15:45 -07:00
Daniel Meltzer 92671823d8 Userimport fixes/improvements (#5884) 
* Send notification when user is created.
* Flesh out default user mappings
* Add user importing test.
 2018-07-18 19:15:07 -07:00
Daniel Meltzer 19396b2107 Logic Fix (#5877) 
If we have a username, we should look that up even if we do not have a
first name.
 2018-07-18 19:10:36 -07:00
Brady Wetherington f0332a7388
Add DB port number to docker 
which gets copied to the docker image's `.env` file during installation. This closes #5718
 2018-07-18 19:10:06 -07:00
snipe 70cb5ed215 Updated language strings 2018-07-18 08:55:38 -07:00
snipe d309f67df0 Set activated to zero if no values passed for active user 2018-07-18 08:27:26 -07:00
snipe 7dc070ec2c Add @engrzhou as a contributor 2018-07-18 07:39:46 -07:00
snipe 2ecdf19569 Add @GodUseVPN as a contributor 2018-07-18 07:39:23 -07:00
snipe c56f2625b7 Add @grayhoax as a contributor 2018-07-18 07:38:57 -07:00
snipe 3dc154991a Add @wira-sandy as a contributor 2018-07-18 07:37:56 -07:00
snipe a5f57c050f Add @vipsystem as a contributor 2018-07-18 07:37:30 -07:00
snipe 36c4cd98e0 Add @vinzruzell as a contributor 2018-07-18 07:36:31 -07:00
snipe f6ef6039f4 Add @fraccie as a contributor 2018-07-18 07:35:55 -07:00
snipe 6867563e4a Add @dheche as a contributor 2018-07-18 07:33:19 -07:00
snipe 21820262ce Add @reinvanhaaren as a contributor 2018-07-18 07:29:12 -07:00
snipe bae1203b64 Add @ragnarcx as a contributor 2018-07-18 07:28:41 -07:00
snipe 0f2ff7aba2 Add @ProfFan as a contributor 2018-07-18 07:28:03 -07:00
snipe 0ce90834f6 Add @priatna as a contributor 2018-07-18 07:27:42 -07:00
snipe 0e182bb2b9 Add @bodrovics as a contributor 2018-07-18 07:26:54 -07:00
snipe 7afff69fab Add @pawel1615 as a contributor 2018-07-18 07:26:12 -07:00
snipe 136d59e4b9 Add @drcryo as a contributor 2018-07-18 07:25:49 -07:00
snipe 6d9cbac928 Add @pooot as a contributor 2018-07-18 07:25:25 -07:00
snipe efcd8d339b Add @saymd as a contributor 2018-07-18 07:24:51 -07:00
snipe 7e09ce468b Add @omego as a contributor 2018-07-18 07:24:08 -07:00
snipe baf714b41f Add @MohammedFota as a contributor 2018-07-18 07:22:56 -07:00
snipe b0808e846d Add @IxFail as a contributor 2018-07-18 07:22:15 -07:00
snipe 0e3e10a707 Add @mikaelssen as a contributor 2018-07-18 07:21:32 -07:00
snipe cbf3d5d071 Add @micaelrodrigues as a contributor 2018-07-18 07:20:20 -07:00
snipe 68d355a33d Add @meyerf99 as a contributor 2018-07-18 07:19:59 -07:00
snipe 853923013a Add @stubben as a contributor 2018-07-18 07:19:00 -07:00
snipe 737061a983 Add @msjohansen as a contributor 2018-07-18 07:17:34 -07:00
snipe 0438d55284 Add @mariejoyacajes as a contributor 2018-07-18 07:17:08 -07:00
snipe 924962c156 Add @MarcosBL as a contributor 2018-07-18 07:16:30 -07:00
snipe a8c42843f6 Add @lstrojny as a contributor 2018-07-18 07:15:10 -07:00
snipe 63c4b7b6b6 Add @laopangzi as a contributor 2018-07-18 07:14:47 -07:00
snipe ff06387d90 Add @joxelito94 as a contributor 2018-07-18 07:11:31 -07:00
snipe fa46622bad Add @JohnWillker as a contributor 2018-07-18 07:07:13 -07:00
snipe fd65780287 Add @jarby1211 as a contributor 2018-07-18 07:05:34 -07:00
snipe 6478ec86ac Add @itangiang as a contributor 2018-07-18 07:04:23 -07:00
snipe 748e0eb44f Add @igolman as a contributor 2018-07-18 07:03:30 -07:00
snipe 507c07e9eb Add @abaalkh as a contributor 2018-07-18 07:03:09 -07:00
snipe 5185a9e590 Add @husnulyaqien as a contributor 2018-07-18 07:02:34 -07:00
snipe 1ade088a8f Add @Kentsson as a contributor 2018-07-18 07:00:50 -07:00
snipe 5c087181be Add @fofwisdom as a contributor 2018-07-18 07:00:21 -07:00
snipe 08bb314bbc Add @Hafidzi as a contributor 2018-07-18 06:59:43 -07:00