Commit graph

15695 commits

Author SHA1 Message Date
snipe 76c4c19b3e Fixed small issues with select2 partials 2017-10-26 21:51:53 -07:00
snipe 1d212b59bd Added model select2 partial 2017-10-26 21:51:27 -07:00
snipe 1174d37c20 Added model selectlist route 2017-10-26 21:51:09 -07:00
snipe 6bcb55a129 Slight tweak to model name presenter 2017-10-26 21:50:39 -07:00
snipe a99e09e5e3 Removed extra with() calls, since we load those up via the select2 lists now 2017-10-26 21:50:27 -07:00
snipe 7d11cb0748 Added selectlist transformer for select2 API calls 2017-10-26 21:50:01 -07:00
snipe 9c29ee9c6d Fixed datepicker in asset checkout 2017-10-26 19:51:29 -07:00
snipe bdb95e4e3d Added companies ajax select2 endpoint 2017-10-26 16:37:41 -07:00
snipe 1fa6228fb7 Add @techincolor as a contributor 2017-10-26 16:32:32 -07:00
Danielle 8b535c1806 Default DB_HOST 127.0.0.1 instead of localhost (#4324) 2017-10-26 16:30:48 -07:00
snipe b71d0ab484 Fixed order number and warranty bug in importer 2017-10-26 16:13:35 -07:00
snipe ea07517ad5 Added more ajax select2 boxes to checkouts, remove helper ->with() methods 2017-10-26 03:43:28 -07:00
snipe 82690e1fd7 Integrate ajax select2 menus in all asset checkouts 2017-10-26 02:28:17 -07:00
snipe 75b527ab59 Features/image uploads (#4320)
* Locations API support for image

* Added manufacturers API support for image

* Added manufacturers API support for image

* Added image support for locations add/update

* Added manufacturer image upload support to controller

* General image string

* Added blade support for image uploads/delete image

* Added $request support (from Input::)

* Added image support in API transformers

* Added image to Manufacturers presenter for data table

* Migration to create image fields

* Ignore the contents of the new image directories

* Create new image upload directories

* Created components/consumables uploads directory

* Fixed missing textSearch scope from companies

* Added ignore for companies uploads directory

* Added blade support for image upload

* Fixed path to upload directory on edit

* Added company image upport to transformers, controllers

* Added image support for categories

* Added support for images in Departments

* Added support for image in Consumables

* Added image support for components
2017-10-25 22:35:58 -07:00
snipe b083541723 Fixed docblock copypasta 2017-10-25 20:23:59 -07:00
snipe 6dbb598616 Merge branch 'develop' 2017-10-25 20:18:24 -07:00
snipe e8d938e188 Bumped hash 2017-10-25 20:18:06 -07:00
snipe f7c92f61e1 Merge branch 'develop' 2017-10-25 20:16:16 -07:00
snipe 4f80eac467 Prod assets 2017-10-25 20:15:34 -07:00
snipe 0e5af78cf1 New route for menu state saving 2017-10-25 20:15:30 -07:00
snipe 0d34cc704a Added controller for state-saver for sidenav 2017-10-25 20:10:59 -07:00
snipe d4bb4d2edd Added state-save for open/cloed sidenav 2017-10-25 20:10:41 -07:00
snipe d008334f2d Fixed #2857 - better CSS for requestable assets page when no results 2017-10-25 20:07:10 -07:00
snipe 109ea82cb9 Merge branch 'develop' 2017-10-25 18:17:38 -07:00
snipe e8847753f4 Fixed importer using previous row’s custom field 2017-10-25 18:16:28 -07:00
snipe 7dad71d2b6 Fixed smaller button for import/cancel 2017-10-25 18:14:22 -07:00
snipe db5968f95a Fixed larger button size 2017-10-25 18:13:55 -07:00
snipe d97a1edeb4 Moved style sheet call back into page content 2017-10-25 18:13:41 -07:00
snipe 3dd39a46be Fixed large font size on importer 2017-10-25 18:13:21 -07:00
snipe dc9a908de7 Fixing laravel mix() fuckery, hopefully for the last time 2017-10-25 18:13:03 -07:00
snipe 687cf44d3d Use inline style for logo 2017-10-25 16:15:50 -07:00
snipe e054504669 lol whoops 2017-10-25 16:08:29 -07:00
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