DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-13 17:14:10 -08:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity
5293 commits 95 branches 267 tags 294 MiB
Commit graph

5293 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e0f6f9b839
Artisan command to check in licenses from all users 2020-08-14 14:43:37 -07:00
snipe f1a6308002
Check for Auth::user before trying to log id (for cli) 2020-08-14 14:43:07 -07:00
snipe 19d8d7b146
Updated components and consumables to use storage facade 2020-08-12 13:02:54 -07:00
snipe b999c50a2e
Merge pull request #8316 from Godmartinz/bug/ch15028/missing-or-incorrect-error-message-translation 
Looks great, thank you!
 2020-08-12 12:37:47 -07:00
Godfrey M e3906b245c added translation for admin/licenses/message.not_found 2020-08-12 12:27:18 -07:00
Brady Wetherington 9ca20e4964
Merge pull request #8313 from snipe/improve_ldap_search_error_reporting 
Improve ldap search error reporting
 2020-08-11 17:33:19 -07:00
Brady Wetherington 456a74d88c De-merge out incorrectly merged files. Whoops! 2020-08-11 16:41:20 -07:00
Brady Wetherington 799c059070 Add internationalized version of LDAP error message 2020-08-11 16:39:02 -07:00
Brady Wetherington c62d43a778 Improve Exception management in Artisan LDAP Sync method. Still need to localize this better 2020-08-11 16:39:02 -07:00
Brady Wetherington b725bd0fae Add @PeterUpfold as a contributor 2020-08-11 16:39:02 -07:00
snipe 09190e05ae
Add @PeterUpfold as a contributor 2020-08-10 17:24:20 -07:00
Brady Wetherington e0644dbbf6
Merge pull request #8105 from PeterUpfold/PeterUpfold-7661workaround 
Propose workaround for #7661 — suppress E_DEPRECATED on ldap_control_paged_result()
 2020-08-10 17:22:31 -07:00
snipe 5b6925b00c
Removed debugging :( 2020-08-04 21:00:37 -07:00
snipe df17a859bf
Changed modal IDs so manager creation modal works on user creation main page 2020-08-04 20:59:54 -07:00
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