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

12913 commits

This branch
This branch
All branches
Author SHA1 Message Date
snipe e1ad28aa20 Mix fuckery 2017-10-25 16:05:39 -07:00
snipe 87992b7f71 More mix() fuckery 2017-10-25 16:05:18 -07:00
snipe 32478f1a10 Fixed #4310 - logo not scaling correctly without text 2017-10-25 15:47:06 -07:00
snipe abc722b9c0 Fix path to overrides 2017-10-25 15:43:57 -07:00
snipe 49ebf4a314 Removed old build dir 2017-10-25 15:04:37 -07:00
snipe c503729a9a Removed build vue 2017-10-25 15:03:04 -07:00
snipe 0b7864b09c Fixed model number not saving in modal 2017-10-25 13:17:35 -07:00
snipe ede16eec3c Fixed #4308 - checkin and delete from user page 2017-10-25 11:11:32 -07:00
snipe 21c1ca2336 Bumped hash 2017-10-24 19:26:21 -07:00
snipe a305b1ea2d Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-24 19:24:39 -07:00
snipe 17d58d9cc5 Added snazzy rich user selection menu 
TODO:
- Abstract this out so it can be used by other select2 menus
- Write a select2 transformer to standardize output
 2017-10-24 19:24:35 -07:00
snipe c605984db0 Added nicer table formatting for “assets checked out to this user” table 2017-10-24 19:21:53 -07:00
snipe d678a0ebff Switched to using JS routes for better subdirectory support, removed debugging console logs 2017-10-24 19:20:00 -07:00
snipe e0fe383815 Removed debug message in SaveUserRequest 2017-10-24 19:18:53 -07:00
snipe 7140efc561 Use the transformers, Luke 2017-10-24 19:18:20 -07:00
snipe 99be54fd96 Fixed success message on saving new user 2017-10-24 19:17:30 -07:00
snipe 35da7906cc Fix standardized exception formatter for correct payload 2017-10-24 17:57:49 -07:00
snipe 680ad676ca Remove debugging 2017-10-24 17:10:42 -07:00
snipe 4628c15813 Fixed typo in comments 2017-10-24 16:57:04 -07:00
snipe 8a9960f830 Fixed missing break that would override password requirement 2017-10-24 16:56:46 -07:00
snipe 2b45433255 Removed copypasta commented out seeder code 2017-10-24 16:55:59 -07:00
snipe 715da63581 Check that model name exists before trying to display it 
I don’t know why this would ever trigger, but a user in Gitter complained earlier today, so… ¯\_(ツ)_/¯
 2017-10-24 16:53:46 -07:00
Brady Wetherington ad32bae62f Fix to bad relation definition in Location. (#4306) 2017-10-24 16:52:45 -07:00
snipe bbda0dc3b4 Always return an avatar, and set a fun default 2017-10-24 13:02:30 -07:00
snipe dc805dd9b1 Added user avatars to listing 2017-10-24 09:51:07 -07:00
snipe 167cd4e4a0 Merge branch 'develop' 2017-10-24 05:25:52 -07:00
snipe 8d68bb7a57 Sticky headers for bootstrap tables 2017-10-24 05:22:26 -07:00
snipe 7d64ab3158 Fixes #4294 - pass correct group ID for group user listings 2017-10-24 04:39:47 -07:00
snipe a41d603e0f Merge branch 'develop' 2017-10-23 21:17:43 -07:00
snipe c18220069d Bumped version 2017-10-23 21:17:23 -07:00
snipe fbf516284c One more time… 2017-10-23 21:13:39 -07:00
snipe 3db25dca7a Downgrade doctrine for php5.6 2017-10-23 20:54:52 -07:00
snipe 47c7061af5 Merge branch 'develop' 2017-10-23 20:11:01 -07:00
snipe 3799ab87ed Fixed search query for default sorting 2017-10-23 20:10:37 -07:00
snipe 6232a1f941 Merge branch 'develop' 2017-10-23 19:51:29 -07:00
snipe f5ce580593 Bumped version 2017-10-23 19:51:14 -07:00
snipe 3afa5f7cda Merge branch 'develop' 2017-10-23 19:50:09 -07:00
snipe 17b271918f Fix date picker for custom fields 2017-10-23 19:47:43 -07:00
snipe 3922569d7f Merge branch 'develop' 2017-10-23 19:14:13 -07:00
Nicolai Essig 3a302fe2d7 ref #2737 prevent assets with "rtd_location_id" null values to be removed on location sort (#4283) 2017-10-23 18:28:06 -07:00
snipe 249f86bb21 Merge branch 'develop' 2017-10-23 17:50:58 -07:00
snipe 0951a756cc Updated passport to 3.0 
Re: https://stackoverflow.com/a/45029309/200021
via @robertpearce
 2017-10-23 17:35:31 -07:00
snipe fc644925ea Fixes #4291 - adds phone to user listing 2017-10-23 14:21:51 -07:00
snipe 59c0b63ad0 Merge branch 'develop' 2017-10-20 20:22:42 -07:00
snipe c0f8b3773c Temp fix for markdown stuff 2017-10-20 20:22:14 -07:00
snipe fd210c6439 Fixes #4267 - email notifications showing model name as number 2017-10-20 18:58:11 -07:00
snipe f7e23cf7c8 Fixes #4272 - adds serial to assigned assets view 2017-10-20 18:51:14 -07:00
snipe 387351d7ed Merge branch 'master' of github.com:snipe/snipe-it 2017-10-20 17:44:35 -07:00
snipe 6438d30afc Merge branch 'develop' 2017-10-20 17:44:28 -07:00
snipe b4e1d37b16 Merge branch 'develop' of github.com:snipe/snipe-it into develop 2017-10-20 17:44:04 -07:00