Commit Graph

  • e8b4bdf6f4 Added location_id to assets table to denorm snipe 2017-10-27 20:35:34 -07:00
  • 7e0c33d535 Speed up user factory by only bcrypting once snipe 2017-10-27 20:35:13 -07:00
  • 24211cb674 Setup firewall rules on CentOS 7. (#4329) tiagom62 2017-10-27 21:27:44 -04:00
  • 2d758be0e1 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-27 18:01:46 -07:00
  • f49ecbdb61 Code cleanup snipe 2017-10-27 18:01:42 -07:00
  • 3cea12565b Add missing policies (#4330) Daniel Meltzer 2017-10-27 21:01:11 -04:00
  • b1ac024725 Refined upload code snipe 2017-10-27 17:40:10 -07:00
  • ec68bd7842 Small refactoring for code quality snipe 2017-10-27 17:38:11 -07:00
  • a224904ade Removed uncessary code snipe 2017-10-27 17:00:33 -07:00
  • cb3b294baa Clesned up status label model for code quality snipe 2017-10-26 22:54:07 -07:00
  • 0788347990 Cleaned up status label method snipe 2017-10-26 22:49:57 -07:00
  • 7496a902bd Removed unused getDataView controller method snipe 2017-10-26 22:39:41 -07:00
  • f2d04be8fe Remove unused methods in Settings API controller (for now) snipe 2017-10-26 22:35:01 -07:00
  • f2499fc7d2 Removed else condition on custom fields API for code quality snipe 2017-10-26 22:33:40 -07:00
  • 00d910ddbc Added manufacturers and categories select lists snipe 2017-10-26 22:09:08 -07:00
  • c6d191bcba Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-26 21:52:04 -07:00
  • f13836eb55 Use select2 partials snipe 2017-10-26 21:52:00 -07:00
  • 76c4c19b3e Fixed small issues with select2 partials snipe 2017-10-26 21:51:53 -07:00
  • 1d212b59bd Added model select2 partial snipe 2017-10-26 21:51:27 -07:00
  • 1174d37c20 Added model selectlist route snipe 2017-10-26 21:51:09 -07:00
  • 6bcb55a129 Slight tweak to model name presenter snipe 2017-10-26 21:50:39 -07:00
  • a99e09e5e3 Removed extra with() calls, since we load those up via the select2 lists now snipe 2017-10-26 21:50:27 -07:00
  • 7d11cb0748 Added selectlist transformer for select2 API calls snipe 2017-10-26 21:50:01 -07:00
  • 9c29ee9c6d Fixed datepicker in asset checkout snipe 2017-10-26 19:51:29 -07:00
  • bdb95e4e3d Added companies ajax select2 endpoint snipe 2017-10-26 16:37:41 -07:00
  • 1fa6228fb7 Add @techincolor as a contributor snipe 2017-10-26 16:32:32 -07:00
  • 8b535c1806 Default DB_HOST 127.0.0.1 instead of localhost (#4324) Danielle 2017-10-26 16:30:48 -07:00
  • b71d0ab484 Fixed order number and warranty bug in importer snipe 2017-10-26 16:13:35 -07:00
  • ea07517ad5 Added more ajax select2 boxes to checkouts, remove helper ->with() methods snipe 2017-10-26 03:43:28 -07:00
  • 82690e1fd7 Integrate ajax select2 menus in all asset checkouts snipe 2017-10-26 02:28:17 -07:00
  • 75b527ab59 Features/image uploads (#4320) snipe 2017-10-25 22:35:58 -07:00
  • b083541723 Fixed docblock copypasta snipe 2017-10-25 20:23:59 -07:00
  • 6dbb598616 Merge branch 'develop' snipe 2017-10-25 20:18:24 -07:00
  • e8d938e188 Bumped hash snipe 2017-10-25 20:18:06 -07:00
  • f7c92f61e1 Merge branch 'develop' snipe 2017-10-25 20:16:16 -07:00
  • 4f80eac467 Prod assets snipe 2017-10-25 20:15:34 -07:00
  • 0e5af78cf1 New route for menu state saving snipe 2017-10-25 20:15:30 -07:00
  • 0d34cc704a Added controller for state-saver for sidenav snipe 2017-10-25 20:10:59 -07:00
  • d4bb4d2edd Added state-save for open/cloed sidenav snipe 2017-10-25 20:10:41 -07:00
  • d008334f2d Fixed #2857 - better CSS for requestable assets page when no results snipe 2017-10-25 20:07:10 -07:00
  • 109ea82cb9 Merge branch 'develop' snipe 2017-10-25 18:17:38 -07:00
  • e8847753f4 Fixed importer using previous row’s custom field snipe 2017-10-25 18:16:28 -07:00
  • 7dad71d2b6 Fixed smaller button for import/cancel snipe 2017-10-25 18:14:22 -07:00
  • db5968f95a Fixed larger button size snipe 2017-10-25 18:13:55 -07:00
  • d97a1edeb4 Moved style sheet call back into page content snipe 2017-10-25 18:13:41 -07:00
  • 3dd39a46be Fixed large font size on importer snipe 2017-10-25 18:13:21 -07:00
  • dc9a908de7 Fixing laravel mix() fuckery, hopefully for the last time snipe 2017-10-25 18:13:03 -07:00
  • 687cf44d3d Use inline style for logo snipe 2017-10-25 16:15:50 -07:00
  • e054504669 lol whoops snipe 2017-10-25 16:08:29 -07:00
  • e1ad28aa20 Mix fuckery snipe 2017-10-25 16:05:39 -07:00
  • 87992b7f71 More mix() fuckery snipe 2017-10-25 16:05:18 -07:00
  • 32478f1a10 Fixed #4310 - logo not scaling correctly without text snipe 2017-10-25 15:47:06 -07:00
  • abc722b9c0 Fix path to overrides snipe 2017-10-25 15:43:57 -07:00
  • 49ebf4a314 Removed old build dir snipe 2017-10-25 15:04:37 -07:00
  • c503729a9a Removed build vue snipe 2017-10-25 15:03:04 -07:00
  • 0b7864b09c Fixed model number not saving in modal snipe 2017-10-25 13:17:35 -07:00
  • ede16eec3c Fixed #4308 - checkin and delete from user page snipe 2017-10-25 11:11:32 -07:00
  • 21c1ca2336 Bumped hash snipe 2017-10-24 19:26:21 -07:00
  • a305b1ea2d Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-24 19:24:39 -07:00
  • 17d58d9cc5 Added snazzy rich user selection menu snipe 2017-10-24 19:24:35 -07:00
  • c605984db0 Added nicer table formatting for “assets checked out to this user” table snipe 2017-10-24 19:21:53 -07:00
  • d678a0ebff Switched to using JS routes for better subdirectory support, removed debugging console logs snipe 2017-10-24 19:20:00 -07:00
  • e0fe383815 Removed debug message in SaveUserRequest snipe 2017-10-24 19:18:53 -07:00
  • 7140efc561 Use the transformers, Luke snipe 2017-10-24 19:18:20 -07:00
  • 99be54fd96 Fixed success message on saving new user snipe 2017-10-24 19:17:30 -07:00
  • 35da7906cc Fix standardized exception formatter for correct payload snipe 2017-10-24 17:57:49 -07:00
  • 680ad676ca Remove debugging snipe 2017-10-24 17:10:42 -07:00
  • 4628c15813 Fixed typo in comments snipe 2017-10-24 16:57:04 -07:00
  • 8a9960f830 Fixed missing break that would override password requirement snipe 2017-10-24 16:56:46 -07:00
  • 2b45433255 Removed copypasta commented out seeder code snipe 2017-10-24 16:55:59 -07:00
  • 715da63581 Check that model name exists before trying to display it snipe 2017-10-24 16:53:46 -07:00
  • ad32bae62f Fix to bad relation definition in Location. (#4306) Brady Wetherington 2017-10-24 16:52:45 -07:00
  • bbda0dc3b4 Always return an avatar, and set a fun default snipe 2017-10-24 13:02:30 -07:00
  • dc805dd9b1 Added user avatars to listing snipe 2017-10-24 09:51:07 -07:00
  • 167cd4e4a0 Merge branch 'develop' snipe 2017-10-24 05:25:52 -07:00
  • 8d68bb7a57 Sticky headers for bootstrap tables snipe 2017-10-24 05:22:26 -07:00
  • 7d64ab3158 Fixes #4294 - pass correct group ID for group user listings snipe 2017-10-24 04:39:47 -07:00
  • a41d603e0f Merge branch 'develop' v4.0.15 snipe 2017-10-23 21:17:43 -07:00
  • c18220069d Bumped version snipe 2017-10-23 21:17:23 -07:00
  • fbf516284c One more time… snipe 2017-10-23 21:13:39 -07:00
  • 3db25dca7a Downgrade doctrine for php5.6 snipe 2017-10-23 20:54:52 -07:00
  • 47c7061af5 Merge branch 'develop' v4.0.14 snipe 2017-10-23 20:11:01 -07:00
  • 3799ab87ed Fixed search query for default sorting snipe 2017-10-23 20:10:37 -07:00
  • 6232a1f941 Merge branch 'develop' snipe 2017-10-23 19:51:29 -07:00
  • f5ce580593 Bumped version snipe 2017-10-23 19:51:14 -07:00
  • 3afa5f7cda Merge branch 'develop' snipe 2017-10-23 19:50:09 -07:00
  • 17b271918f Fix date picker for custom fields snipe 2017-10-23 19:47:43 -07:00
  • 3922569d7f Merge branch 'develop' snipe 2017-10-23 19:14:13 -07:00
  • 3a302fe2d7 ref #2737 prevent assets with "rtd_location_id" null values to be removed on location sort (#4283) Nicolai Essig 2017-10-24 03:28:06 +02:00
  • 249f86bb21 Merge branch 'develop' snipe 2017-10-23 17:50:58 -07:00
  • 0951a756cc Updated passport to 3.0 snipe 2017-10-23 17:35:31 -07:00
  • fc644925ea Fixes #4291 - adds phone to user listing snipe 2017-10-23 14:21:51 -07:00
  • 59c0b63ad0 Merge branch 'develop' snipe 2017-10-20 20:22:42 -07:00
  • c0f8b3773c Temp fix for markdown stuff snipe 2017-10-20 20:22:14 -07:00
  • fd210c6439 Fixes #4267 - email notifications showing model name as number snipe 2017-10-20 18:58:11 -07:00
  • f7e23cf7c8 Fixes #4272 - adds serial to assigned assets view snipe 2017-10-20 18:51:14 -07:00
  • 387351d7ed Merge branch 'master' of github.com:snipe/snipe-it snipe 2017-10-20 17:44:35 -07:00
  • 6438d30afc Merge branch 'develop' snipe 2017-10-20 17:44:28 -07:00
  • b4e1d37b16 Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2017-10-20 17:44:04 -07:00
  • 8ac57d0121 Need to prefix status_id with assets. for uniqueness (#4279) Brady Wetherington 2017-10-20 17:37:46 -07:00