DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-02 08:21:09 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
3236 commits 52 branches 269 tags 311 MiB
Commit graph

3236 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe 984275ff05 Merge branch 'develop' 2018-01-19 23:47:54 -08:00
snipe e6f70f2ab7 Fixed #4821 - add username to user selection dropdown 2018-01-19 23:47:37 -08:00
snipe f7de252f67 Wrong branch. :( 2018-01-19 23:46:42 -08:00
snipe 532b299c40 Fixed #4821 - add username to user selection dropdown 2018-01-19 23:46:12 -08:00
snipe 5dcc63dc74 Merge branch 'develop' 2018-01-19 20:49:20 -08:00
snipe 6eb8acf319 Swich to panel box for dashboard message 2018-01-19 20:49:02 -08:00
snipe 862251ab36 Change label to stale 2018-01-19 20:45:25 -08:00
snipe 95a9742571 Fixed #4768 - adds dashboard message option to settings 2018-01-19 20:43:55 -08:00
snipe 81d0921782 Merge branch 'develop' 2018-01-19 19:18:43 -08:00
snipe 0fa556da1d Exempt ready for dev and bounty tags from stale collection 2018-01-19 19:16:35 -08:00
snipe 05bc238c9a Merge branch 'develop' 2018-01-19 18:17:38 -08:00
snipe 782813ab49 Check for valid category before checking acceptance 2018-01-19 18:17:23 -08:00
snipe cbca126d9d Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-19 17:53:15 -08:00
snipe a9ffe8d210 Bumped hash 2018-01-19 17:52:40 -08:00
snipe c242abb42e Added Company policy to fix company deletion issue 2018-01-19 17:51:28 -08:00
snipe 2c722ffc4f Fixed issue template with correct path to storage logs 2018-01-19 16:31:01 -08:00
snipe 484c47cef8 Added stale.yml to auto-close stale issues 2018-01-19 16:23:28 -08:00
snipe f38dc37152 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 19:31:09 -08:00
snipe 6133f09056 Bumped hash 2018-01-17 19:30:31 -08:00
snipe 2a959edeba Added - Setting to allow archived assets in List All 2018-01-17 19:18:48 -08:00
snipe 8995d689b8 Fixed #4817 - [BREAKING API CHANGE] - changed user API response from firstname, lastname to first_name, last_name 2018-01-17 13:25:11 -08:00
snipe f08bec6c78 Merge branch 'develop' 2018-01-17 13:12:58 -08:00
snipe d920d91786 Fixed #4593 - do not require model_id to update asset custom fields via API 2018-01-17 13:12:32 -08:00
snipe e35b3745eb Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 12:41:51 -08:00
snipe e8252d9468 Bumped hash 2018-01-17 12:41:11 -08:00
snipe 8fff6a1a06 Update asset location based on user checkout in bulk checkout 2018-01-17 12:39:49 -08:00
snipe 0eff821928 Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-17 12:12:33 -08:00
snipe 9e605e0f79 Bumped hash 2018-01-17 12:11:39 -08:00
snipe 8fb991110e Fixed #4652 - asset not correctly checking out to user on creation 2018-01-17 12:10:28 -08:00
snipe b383ebee48 Add @fordster78 as a contributor 2018-01-17 10:59:00 -08:00
fordster78 138313dcb9 Setup changes (#4813) 
* Add Asset Tag settings to Setup

* Add Locale Settings to Setup

* Add multiple company support to setup

* Changed the locale label name from 'site_name' to locale
Added default value for language to 'en' and multiple companies support
to 0 (false)
Switched out the old Input facade to the preferred $request->input
method for the setup page.
 2018-01-17 10:58:03 -08:00
snipe f254958db9 Check if db_column foield already exists 2018-01-17 06:48:14 -08:00
snipe 09eff88679 Merge branch 'develop' 2018-01-17 06:28:11 -08:00
snipe 24b356dba4 Fixed typos in default blade that cause components to not show up for non-superadmins 2018-01-17 06:27:23 -08:00
snipe 91bca5fcba Fixed #4844 - use input value for ids in user bulk edit 2018-01-17 06:15:52 -08:00
vcordes79 96a469db36 allow changing user activated field via api (#4843) 2018-01-17 05:38:10 -08:00
snipe 9ab05e7037 Add @vcordes79 as a contributor 2018-01-17 05:36:15 -08:00
vcordes79 52a99faf68 fix phone number update in api (#4842) 2018-01-17 05:33:55 -08:00
vcordes79 94cf1f8741 Fixes #4829 - add fields api (#4840) 
* add fields api

* change route names
 2018-01-17 05:31:57 -08:00
snipe e2a8f9b790 Merge branch 'develop' 2018-01-17 03:27:03 -08:00
snipe 409f5cc4fd Added - display asset model category on hardware view page 2018-01-16 16:26:24 -08:00
snipe 3b5e4c44eb Fixed depreciation report not showing assigned to 2018-01-16 07:46:34 -08:00
snipe 69a7ea63e2 Pass nopages to dashboard stuff 2018-01-16 07:37:20 -08:00
snipe aac379daeb If nopages is passed, hide page numbers 
This seems weird since we’re checking for a negative, but there are only a few spots where we wouldn’t want page numbers, namely the dashboard sruff
 2018-01-16 07:37:06 -08:00
snipe 1d3472b5c4 Truncate the checkout_requests field on seed 2018-01-16 07:36:14 -08:00
snipe 66a590b774 Account for user’s that have been deleted in the requested list 2018-01-16 07:36:03 -08:00
snipe dc4472e9e9 Misc export table fixes 2018-01-15 21:03:46 -08:00
snipe 6bfd428c2e Use real status label names, even if deployed 2018-01-15 21:03:26 -08:00
snipe f4623bd277 Add user group membership to user view page 2018-01-15 20:31:10 -08:00
snipe 1f04d7aafd Merge branch 'develop' 
# Conflicts:
#	config/version.php
 2018-01-11 15:27:17 -08:00