DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-11-18 19:44:07 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
4219 commits 96 branches 267 tags 296 MiB
Commit graph

4219 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe af7b7664c5 Added license seat location method 2018-01-10 20:34:44 -08:00
snipe c31362655c Refactored BS tables include for clearer separation of simple v not simple 2018-01-10 20:34:36 -08:00
snipe c6a956382f Fixed #4784 - cookie not always being set correctly for ajax tables 2018-01-10 20:04:41 -08:00
snipe bab0bda174 Added custom formatter for license seats (WIP) 2018-01-10 18:58:55 -08:00
snipe bb52a8417c Switch view code to AJAX table 2018-01-10 18:58:41 -08:00
snipe e3d7be23cb Added new seats controller method 2018-01-10 18:47:57 -08:00
snipe 3d5545494e Added new seats transformer 2018-01-10 18:47:40 -08:00
snipe 7f1a535b30 Added new seats API route 2018-01-10 18:47:27 -08:00
snipe 254234b0dc Fixed #4787 - don’t try to display category if it is invalid 
This shouldn’t be needed, but in case data got weird (manual editing, etc)
 2018-01-10 06:33:59 -08:00
snipe 3566f37981 Merge branch 'develop' 2018-01-10 06:25:06 -08:00
snipe e6259eb6e1 Fixed #4774 - show assets assigned to assets in asset view 
Todo: Fix text search on the asset to asset tab. It’s currently broken so I’ve disabled it.
 2018-01-10 05:44:11 -08:00
snipe eeb3d1eb42 Use language strings for tab text 2018-01-10 05:42:34 -08:00
snipe 79295f6434 Use dataTableLayout for table 2018-01-10 05:33:45 -08:00
snipe 285e4e2e52 Allow bulk language update in user edit 2018-01-10 05:33:26 -08:00
snipe 5587b64d64 Fixed #4770 - broken licenses, etc on company view, added users and components 2018-01-10 03:52:21 -08:00
snipe f0f2a5aa67 Workaround for #4784 - make changes tab always visible 
Not sure why the cookie isn’t cookie-ing
 2018-01-10 01:56:24 -08:00
Brady Wetherington 061317866b Changes to Models in the asset-edit screen maintain chosen values (#4781) 
Fixed for #2195
 2018-01-09 23:45:20 -08:00
snipe 65ffc01583 Merge branch 'develop' 2018-01-09 20:19:50 -08:00
snipe f5f7a63a23 Production assets 2018-01-09 20:19:04 -08:00
snipe b6a7fd1cec Run production assets - because modern web development. Sigh. 2018-01-09 20:18:49 -08:00
snipe 6245f92e16 Merge branch 'develop' 2018-01-09 20:12:44 -08:00
snipe 0abab2107c Fixed #4779 - show selected filename on filepicker 2018-01-09 20:12:07 -08:00
snipe afc7116260 Fixed #4778 - added notes to asset model view 2018-01-09 20:00:06 -08:00
Geoff Young 0b3d2b46e0 Add attributes to delete asset file button (#4336) 
This adds attributes to the delete file buttons on the View Asset page.
The attributes will fill the confirmation modal that prompts users
before deleting. They also activate a tooltip on the button.
 2018-01-03 17:25:50 -08:00
Brandon Daniel Bailey f786e07179 Allow auto increment through the API (#4690) 
* Allow auto incrementing asset_id from the API when the setting is enabled

* Cleaned up the if else statement

* Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix

* Auto incrementing through the API
 2018-01-03 17:24:32 -08:00
Daniel Meltzer b2469bb34f Fix double create log on import. (#4706) 
* Fix double create log on import.

* Fix code error causing component importer to implode.

* More component importer oldities
 2018-01-03 17:22:02 -08:00
Brandon Daniel Bailey b721bfcc84 Added prefix to the orWhereRaw which causes a database error if the configuration uses a prefix (#4703) 2017-12-28 20:09:36 -08:00
Daniel Meltzer f16ce09a7a Importer again (#4702) 
* If a user id is provided in the name column of an import, we should assume that it is a user id and check out to it.

* Fix build of vue files.  The location is public/js/build, not public/build

* Ensure a status type is set before allowing submission of an import.

Also expand the status text label to change color based on success/failure.

Fixes #4658

* Use right key to lookup emails when importing users.  Fixes 4619.

* Import serial for components, and make unique matches based on the serial as well as the name.  Fixes #4569

* Set the location_id when importing an item properly.

This moves as well to using the Asset::checkout() method, which should consolidate the logic into a useful spot.
Fixes #4563 (I think)

* Production assets.

* Case insensitive field map guessing and repopulate when changingin import type.
 2017-12-28 20:08:45 -08:00
snipe bbe9df306b Merge branch 'develop' 2017-12-26 17:33:06 -08:00
snipe 1bd7392531 Account for audits on deleted assets 2017-12-26 17:32:45 -08:00
snipe 2002dfca17 Merge branch 'develop' 2017-12-26 17:13:49 -08:00
snipe 38c2ecbd0c Fixed migration use 2017-12-26 17:13:26 -08:00
snipe ce97faa8d4 Merge branch 'develop' 2017-12-26 17:11:40 -08:00
snipe 31ca4bff8c Break audit date denorm migrations into two separate migrations 2017-12-26 17:11:08 -08:00
snipe 6f9033b2fd Merge branch 'develop' 2017-12-26 16:49:42 -08:00
snipe 8864f81402 Fixed manufacturer error on printable user page 
Manufacturer is not required for accessories, so need to account for that
 2017-12-26 16:49:01 -08:00
snipe 71ba1af647 Fixed button class on asset view 2017-12-26 16:48:28 -08:00
snipe b894a4c19a Merge branch 'develop' 2017-12-20 12:36:45 -08:00
snipe c3a44f25fd Fixed #4663 - duplicate manufacturer name in selectlist 2017-12-20 12:32:55 -08:00
snipe 1f36e7997f Bumped version 2017-12-20 03:31:43 -08:00
snipe 33b5c26da5 Bumped hashcount 2017-12-19 22:16:31 -08:00
snipe e5a7e6619f Merge branch 'develop' 2017-12-19 22:15:51 -08:00
snipe d2e2c1c05f Stub and 404 registration routes 2017-12-19 22:14:51 -08:00
snipe 557b8b0ded Merge branch 'develop' 2017-12-19 20:57:46 -08:00
snipe 37d4cf3afb Fixed #4647 - requestable model button not clickable 2017-12-19 20:48:26 -08:00
snipe b716db225f Added “new” buttons for manufacturer and category in asset model creation 2017-12-19 20:30:46 -08:00
snipe fbe093705d Fixed #4640 - add username to user detail 2017-12-19 13:42:34 -08:00
snipe db278e9109 Merge branch 'develop' 2017-12-19 00:48:44 -08:00
snipe 88798435f6 Fixed inefficient query for inventory alerts 2017-12-19 00:32:39 -08:00
snipe 6220f0d8a5 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2017-12-15 18:57:21 -08:00