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

5829 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 24c43056ba
Moved pGenerator script to default layout footer 
This fixes an issue where the password generator wouldn’t load in a modal in Chrome
 2020-08-04 20:58:28 -07:00
snipe 4e0a9c7a94
Fart fix 
I just…. don’t ask.
 2020-08-03 12:35:34 -07:00
snipe 6a089f86f8
Fixed pathing for accessories 2020-08-03 11:17:56 -07:00
snipe 606b7e905d
Small edits to PR template 
Slight text changes to ask specifics about versions
 2020-07-31 17:02:33 -07:00
snipe d73ddad477
Created a PR template 
First draft of the PR guidelines template
 2020-07-31 16:59:26 -07:00
snipe 502b3c50a9
Fixed upload preview (fixed regression from #6736) 
This change appears to have been stomped on in one of the merges. :(
 2020-07-31 14:36:50 -07:00
snipe 9a39cf721e
Merge pull request #8258 from ballertv/features/consumable-api 
This looks great, thank you!
 2020-07-31 12:18:49 -07:00
snipe 2bb5ac61a9
Add @sanjay900 as a contributor 2020-07-31 11:02:06 -07:00
snipe 3e62a6ea2d
Merge branch 'develop' of https://github.com/snipe/snipe-it into develop 2020-07-31 11:01:35 -07:00
Brady Wetherington 7410b16835
Merge pull request #8270 from snipe/improve_ad_useraccountcontrol_v4 
Add new useraccountcontrol value for valid AD users
 2020-07-24 16:22:44 -07:00
andres 8994f3e15e cleanup 2020-07-22 19:57:06 -04:00
andres d23f1a77ca implement checkout API 2020-07-22 19:56:31 -04:00
snipe e955c983a3
Merge pull request #8250 from snipe/features/adds_addr_city_state_to_importer 
Added address, city, state and country to importer and city to bulk editor
 2020-07-22 13:43:29 -07:00
Brady Wetherington b09e7d19b3 Add new useraccountcontrol value for valid AD users; document algorithm and values 2020-07-22 13:32:16 -07:00
snipe 2fa17ac185
Merge pull request #8254 from Godmartinz/gmartinez_adds_email_formats 
Added firstinitial.lastname, lastname_firstinitial, firstnamelastname…
 2020-07-22 12:06:31 -07:00
Godfrey Martinez 3b1e46f72b
Update general.php 2020-07-22 11:25:57 -07:00
Godfrey Martinez 0c1a1de2a2
Update general.php 
fixed typo
 2020-07-22 11:24:36 -07:00
Godfrey M 20c9ae5818 Added firstinitial.lastname, lastname_firstinitial, firstnamelastname and firstnamelastinitial to username formats 2020-07-22 10:21:19 -07:00
snipe eed41e4549
Moved address down further, fixed broken HTML 2020-07-21 16:57:32 -07:00
snipe b750f4754f
Added city to bulk user importer 2020-07-21 16:49:54 -07:00
snipe c17a06792a
Added address, city, state, country to user importer 2020-07-21 16:49:38 -07:00
snipe 4f76cc6cfb
I don’t actually know what this file is for 2020-07-21 16:46:13 -07:00
snipe b905154373
Fixed #8247 - added notes field to user details display 2020-07-20 14:29:32 -07:00
snipe daf748e531
Bumped hash 2020-07-17 12:32:01 -07:00
snipe 799a93c46a
Allow for email/username search on users 2020-07-17 12:11:32 -07:00
snipe 34aa12e229
Merge pull request #8239 from snipe/fixes/api_rtd_to_location_on_create 
Set location_id to rtd_location_id on asset creation
 2020-07-16 17:44:13 -07:00
snipe 897757bd04
Removed added line for location 2020-07-16 17:43:44 -07:00
snipe c7125c3937
Set location_id to rtd_location_id on asset creation 2020-07-16 16:34:39 -07:00
snipe 0238c88a3e
Merge pull request #8228 from snipe/fix_select2_ajax_pulldowns_v5 
Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5
 2020-07-16 15:37:42 -07:00
Brady Wetherington 145dfe5847 Rebuild assets 2020-07-16 15:36:10 -07:00
Brady Wetherington 68263ff806 Changed selectlist results to be 'items' for internal consistency 2020-07-16 15:33:38 -07:00
snipe 81a6332889
Removed license ID from seats table cookie info 
This typically wouldn’t be necessary, since most people would want to view the same *types* of data across licenses
 2020-07-14 13:55:38 -07:00
snipe 6e563f6e4b
Merge branch 'master' of https://github.com/snipe/snipe-it 2020-07-13 21:16:54 -07:00
snipe 5320f5c67c
Disallow non-super users from editing their own permissions 2020-07-13 21:16:45 -07:00
snipe 7f69ae953b
Merge pull request #8227 from snipe/fix_select2_ajax_pulldowns 
Changes how we do AJAX calls via Select2 for dynamic drop-down menus
 2020-07-13 21:16:00 -07:00
Brady Wetherington 17f6fbabfa Switch to 'items' to maintain compatbility with other internal API's 2020-07-13 21:12:03 -07:00
Brady Wetherington 318da67230 Fix Select2 'infinite scroll' drop-downs for Snipe-IT v5 2020-07-13 17:43:15 -07:00
snipe c79f8c1baf
Merge pull request #8207 from EDVLeer/patch-1 
Update snipeit.sh
 2020-07-13 17:42:16 -07:00
Brady Wetherington e7a820f7c9 Changes how we do AJAX calls via Select2 for dynamic drop-down menus 2020-07-13 17:14:31 -07:00
snipe 9c9fc2754c
Merge pull request #8226 from inietov/fixes/edit_asset_error_php74 
Change the form input name for serials in the view
 2020-07-13 12:59:28 -07:00
Ivan Nieto 8fd4529fad Change the form input name for serials in the view 2020-07-13 13:49:21 -05:00
snipe 12c92e30b7
Show whether or not the user was imported via LDAP in the view page 2020-07-10 16:21:27 -07:00
snipe 5b02cfade4
Merge pull request #8220 from sean-borg/sean/expected-checkin-dates 
This looks great, thanks!
 2020-07-10 13:07:15 -07:00
snipe fd10b755b0
Removed the sr-only tag in table headers 
It was breaking Bootstrap Tables column selector :(
 2020-07-10 11:30:01 -07:00
Sean Borg 567a9639f4 Enhanced #5762 Able to bulk edit expected checkin date 
In light of the need to edit 500+ devices #5762 (comment)
I added the expected checkin date to the bulk edit page for assets
 2020-07-10 19:21:34 +01:00
Sean Borg 7a433f8598 Updated purchase date format in hardware/bulkedit 
The Purchase date box in hardware/bulkedit was a different style
to the normal hardware/{id}/edit

It also prevents a strange bug I see in firefox when clicking the old datepicker
it presented 2 datepicker boxes
 2020-07-10 19:21:22 +01:00
Sean Borg 3d8823ede5 Added #5762 Modify expected checkin dates 
It is now possible to edit expected checkin dates for assets in Actions > Edit Asset
 2020-07-10 19:21:04 +01:00
snipe dbbb7680d9
A few more fixes for the cli 
Do not check out a piece of software if it’s already been checked out to the user
 2020-07-09 21:12:50 -07:00
snipe cf0dd5bbad
Small fixes for cli tool 2020-07-09 20:43:13 -07:00
snipe 25e53d8c7f
Merge pull request #8216 from snipe/features/checkout_license_to_all_users 
Added CLI tool to checkout license to all users
 2020-07-09 20:27:01 -07:00