DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-25 21:54:14 -08:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity
3058 commits 101 branches 268 tags 320 MiB
Commit graph

3058 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e77aae703b Bumped hash 2018-01-25 11:03:45 -08:00
snipe 76f52dd89b Fixed #4872 - Check for assigned in depreciation table 2018-01-25 11:02:46 -08:00
Daniel Meltzer 2f5d550df6 Hotfix: Disabling the event dispatcher broke model validation. (#4912) 
* Hotfix: Disabling the event dispatcher broke model validation.

This resulted in invalid data being imported.  Reenable the event dispatcher for now--this causes double logs, but at least validates properly.

* Actually disable the event dispatcher.

* Sign in where necessary to fix the importer unit test.  This catches the issues found manually in 4912
 2018-01-25 10:10:56 -08:00
snipe 4be8ae7f3d Fuckery. 2018-01-25 03:34:52 -08:00
snipe cf8feb37e1 Fixed crash if no model associated 
This should never be triggered. Bad data is getting in somehow.
 2018-01-25 03:00:54 -08:00
snipe 11505d5d06 Fix crash if no asset model 
(This should never happen, but shouldn’t crash if/when it does)
 2018-01-25 00:25:43 -08:00
snipe 1d04897b32 Order by default location 2018-01-24 14:27:12 -08:00
snipe eddcc0fbbd Fixed cookie issue on hardware 2018-01-24 14:23:19 -08:00
snipe bd80a77b78 Added default location to asset listing 2018-01-24 14:23:12 -08:00
snipe f5636f325d Bumped hash 2018-01-24 11:01:51 -08:00
snipe 739d3c72b7 Fixed #4902 - include last name in checkin email 2018-01-24 10:59:34 -08:00
snipe 60c38a0c47 Added setting to choose what appears in model select list - Fixes #4879 2018-01-24 10:43:46 -08:00
snipe 9566fbd3cd Fixed borked down() migrations 2018-01-24 10:41:49 -08:00
Anh DAO-DUY e41ee1bcf8 Fix upload images problem with Docker (#4906) 
Some folders were missing in this script file (Docker installation).
Missing folders caused errors while uploading some images.
 2018-01-24 09:13:03 -08:00
Tim Bishop bc14f225af Only use location currency if it's actually set. (#4904) 
This changes the depreciation report to only use the currency on a
location if it's actually set to something. Previously, if an asset had
a location it would use the currency even if it was blank rather than
falling back to the default.
 2018-01-24 08:55:51 -08:00
snipe fcb5eea951 Bumped hash 2018-01-24 08:28:53 -08:00
snipe 2c2910d1dd Handle shitty edge cases where an asset has no model without crashing 2018-01-24 08:16:05 -08:00
snipe 1dae7a2fe4 Fixed #3636 - removed thread_id (we don’t use this anymore) 2018-01-24 08:00:28 -08:00
snipe e19ab329bd Add @tdb as a contributor 2018-01-24 07:13:24 -08:00
snipe 922cb90cb3 Add @CronKz as a contributor 2018-01-24 07:12:59 -08:00
snipe 765295136a Added - ability to add custom footer text, hide user’s manual/support links 2018-01-24 07:02:30 -08:00
snipe 7579333ad3 Disallow LDAP settings if in demo mode 2018-01-24 05:50:31 -08:00
snipe 543ea28b72 Added qty to asset components - fixed #4876 2018-01-24 05:25:01 -08:00
snipe fefd6d60f6 Fixed #4899 - sorting in user history 2018-01-24 04:48:00 -08:00
snipe a7b8b4bf55 Added: ability to change actual location from bulk edit assets 2018-01-24 04:38:25 -08:00
snipe 7cafa194c1 Fix for counts 2018-01-24 04:26:15 -08:00
snipe b37f78dbbf Fixed #4858 - wrong params for id count 2018-01-24 04:24:45 -08:00
snipe e20cd42cc2 More parse error fixes 2018-01-24 03:42:49 -08:00
snipe 7b99f81f72 Fixed parse error on hardware blade 2018-01-24 03:38:29 -08:00
snipe f1bbdc9e59 Revert PR #4845 2018-01-24 03:32:45 -08:00
Richard Hofman 5219fb63a1 Add --base_dn option to LdapSync command. (#4888) 2018-01-23 18:15:36 -08:00
CronKz dcc379c3fa Adding missing translations. (#4896) 2018-01-23 18:13:55 -08:00
vcordes79 0fb8dc3418 check if user is allowed to view assets (#4845) 2018-01-23 18:10:05 -08:00
vcordes79 f4e9d245d0 Status labels (#4895) 
* fix statuslabels

* fix statuslabels
 2018-01-23 18:08:54 -08:00
snipe c75a2051ff Hide mfg button if no permissions to create 2018-01-22 14:02:23 -08:00
CronKz 691ec164b1 Added Translations (#4880) 2018-01-22 13:14:52 -08:00
vcordes79 7b596c750d API for (dis)associating fields with fieldsets (#4881) 
* start work on fields in fieldset api

* revert CustomFieldsetsController

* fieldset associate / disassociate api

* fix variable names and payload

* fix variable name
 2018-01-22 13:14:04 -08:00
Tim Bishop b346556caa Allow manager_id to be fillable. (#4882) 
The API UsersController accepts manager_id, but calls the following:

$user->fill($request->all());

This results in manager_id being ignored. I can't see any problem with
allowing a user's manager to be modified using the API, so this change
allows it.
 2018-01-22 13:12:02 -08:00
snipe 93ec7068df Removed a few additional unused badges 2018-01-20 08:54:49 -08:00
snipe 5f65f993a0 Small refactor for AssetPresenter method 2018-01-20 08:52:50 -08:00
snipe a9441521a4 Small refactor for Setting method 2018-01-20 08:52:50 -08:00
snipe 2dede67ae9 Removed unusued badges 2018-01-20 08:52:49 -08:00
Daniel Meltzer 6bf17e7d47 Reset the item between rows of import to avoid stale data. (#4868) 2018-01-20 08:40:01 -08:00
snipe a28fee1ff4 Bumped hash 2018-01-20 07:47:07 -08:00
snipe 57e5af2f69 Removed console logging from JS 2018-01-20 07:42:48 -08:00
snipe 58eedce6fe Updated language files 2018-01-20 04:53:04 -08:00
snipe f91704a372 Added Ukrianian to language dropdown 2018-01-20 04:49:40 -08:00
snipe f53c68e040 Bumped hash 2018-01-20 04:40:26 -08:00
snipe 99e55f84f0 Fixed misc UI permissions elements 2018-01-20 04:39:31 -08:00
snipe 913e6a5709 Bumped hash 2018-01-20 03:59:42 -08:00