Commit graph

2193 commits

Author SHA1 Message Date
Daniel Meltzer
3ddaa88694 Fix image processing when editing an existing asset. Also reenable the image scaling on the server, but boost limit to 800x800 2016-05-31 19:50:58 -05:00
Daniel Meltzer
fcc79456fd Play with a mobile friendly capture-image-from device when adding an asset. This also involved rewriting the upload to be all ajaxy and stuff 2016-05-31 19:50:58 -05:00
Daniel Meltzer
4af5cdd64f asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
0fa82743a1 Remove remaining DB::Raw(concat) calls to make things more sqlite friendly. This adds one new method to the Asset Model to return the formatted string that was used by the license and asset maintence controller. It also fixes a potential sqlite-only issue where '' and null are different. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
45d93ffa8c Use a transaction while creating license seats. Makes adding a license with a large number of seats much more managable. 2016-05-31 19:41:14 -05:00
Daniel Meltzer
4b98711e07 Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly 2016-05-31 19:41:14 -05:00
Daniel Meltzer
004c63cd5d Improve web imported. Show a list of all items with that were not imported correctly after import. Modify ObjectImporter and add a web-import parameter that causes it to spit out json errors exclusively. Long term I want to separate the console command and the logic so we aren't calling the console command directly, but rather a class that does everything. This would allow for easier progress reports and ajaxification. 2016-05-26 21:29:29 -05:00
Daniel Meltzer
715e385925 Two things. One, try to make the import uploads directory if it doesn't exist. Two, call the object importer instead of the old asset importer. TODO: Feed output from object importer back to import page. 2016-05-26 08:00:00 -05:00
snipe
37be587c39 Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet 2016-05-24 16:19:44 -07:00
snipe
0c33575962 Merge branch 'v3' of github.com:snipe/snipe-it into v3 2016-05-24 16:10:45 -07:00
snipe
4edc2a7a66 Route and controller for dashboard chart 2016-05-24 16:06:09 -07:00
Daniel Meltzer
293b8c0dea Fix strings for StatusLabels, they still referenced locations. 2016-05-24 17:54:44 -05:00
snipe
780c0e678d Changed min dimensions to 500 from 300 2016-05-24 13:21:18 -07:00
snipe
6c6e65b8ca Fixes #2076 2016-05-24 09:46:43 -07:00
snipe
f844bf4b41 Nicer focus handling for asset search 2016-05-24 01:10:05 -07:00
snipe
fb35e40342 Search by asset tag
Compatible with barcode scanners
2016-05-20 17:02:28 -07:00
snipe
7fd6051514 Fixes #2062 - old permissions masks to new 2016-05-20 12:23:31 -07:00
snipe
2c7b345ad2 Merge pull request #2057 from dmeltzer/fix-settings-table-for-sqlite
Fix Settings Table for Sqlite
2016-05-19 20:27:56 -07:00
Daniel Meltzer
a6849fc689 Remove stray code from my commit and add a migration to fix the Settings issue the proper way. 2016-05-19 21:52:49 -05:00
snipe
db6305bf1f Merge pull request #2056 from dmeltzer/make-categories-limit-work
Make limit/offset work in getDataView
2016-05-19 19:50:22 -07:00
snipe
cbcc155f27 Settings tweaks 2016-05-19 19:49:25 -07:00
Daniel Meltzer
1148750c9a Make limit/offset work in getDataView 2016-05-19 21:45:48 -05:00
snipe
15eb6df1db Add settings for alert interval threshold and inventory threshold 2016-05-19 19:33:53 -07:00
snipe
29e54830e1 Added 2D barcodes to labels 2016-05-19 19:12:42 -07:00
Daniel Meltzer
5821127a79 Update/port ObjectImportComandd to work with v3. Also change to do one big transactional commit instead of writing to db after each item. Went from a 2 minute import to a 5 second import for a 2000 item file. I still need to do some more santization of the input and work on error handling, but this seems to be in decent shape. 2016-05-18 22:40:02 -05:00
snipe
5333c7083a More dashboard fixes 2016-05-18 19:48:19 -07:00
snipe
47c70141c7 Gross copypasta fix for #1932 2016-05-18 19:08:16 -07:00
snipe
b0b7cfa999 Better handling for show/hide columns in depreciation report 2016-05-18 16:06:29 -07:00
snipe
7ee13113e0 Add depreciation name and months to depreciation report 2016-05-18 15:59:54 -07:00
snipe
631aade6c4 Cleaned up language strings for categories 2016-05-17 21:16:12 -07:00
snipe
0ea5b090af Fixes issue with HTTPS key not found on non-HTTPS installs 2016-05-17 21:15:48 -07:00
snipe
f9572ffa0c Fixes #2048 2016-05-17 21:15:29 -07:00
snipe
e552c36a0a Add model_no, item_no, and manufacturer to consumables 2016-05-16 17:11:31 -07:00
snipe
63f4bbe412 Temporarily remove clone option from categories view 2016-05-14 18:06:49 -07:00
snipe
4dd3a95b6d Fix https detection 2016-05-14 15:04:59 -07:00
snipe
f4490b14f8 [Feature] Re-order custom fields (drag and drop) 2016-05-14 14:06:59 -07:00
snipe
a726934cde Fixed bulk delete+checkin for users 2016-05-12 21:01:31 -07:00
snipe
73327d31e3 Updated backup paths for config variables in laravel-backups 3.7.0 2016-05-12 17:16:10 -07:00
snipe
b9b8149234 Minor backups fixes 2016-05-12 16:20:23 -07:00
snipe
720274446e Fixes #1997 - save user groups without Sentry crap 2016-05-12 15:26:48 -07:00
snipe
6d91774943 [Feature Request] Fixes #2030 - allow asset name change on checkin 2016-05-12 12:34:44 -07:00
snipe
062cbeb18f Fixed bug in categories asset listing for hardware 2016-05-12 10:39:19 -07:00
snipe
ae8a03fec3 Add manufacturer name/sorting/searching on assets 2016-05-12 10:38:57 -07:00
snipe
c56c398d4c Fixes #1996 - replace old Sentry methods with laravel native 2016-05-09 15:40:27 -07:00
snipe
d40289fbc9 Fixes #1997 and #1996 - replace sentry functions 2016-04-28 21:59:43 -07:00
snipe
ba01b20ad4 Use updated redirect() reference 2016-04-28 21:06:41 -07:00
snipe
8dd0e72284 Remove erroneous comment 2016-04-28 21:05:45 -07:00
snipe
d927aa3273 Fix delete method for groups 2016-04-28 21:03:56 -07:00
snipe
7d8af579cf Updated controller with correct helper namespace 2016-04-28 20:57:02 -07:00
snipe
449163c875 Fixes #1995 - updated group admin to use native permissions 2016-04-28 14:03:54 -07:00