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

2761 commits

Author SHA1 Message Date
snipe f8ac9a3f77 Fixes #2110 2016-06-03 11:48:20 -07:00
snipe c5d96812f3 Fixed erronerously removed save methods 2016-06-02 17:22:23 -07:00
snipe 2d5a0deb31 Eager loading for requestable assets account page 2016-06-02 02:57:22 -07:00
snipe 7d2ea36997 Use permission gates on routes 2016-06-02 02:50:00 -07:00
snipe 049e13e365 Switch to gate for permission check 2016-06-02 02:48:52 -07:00
snipe dddb0f7267 Fixed group error message 2016-06-02 02:46:49 -07:00
snipe 46d3a784a2 Fixes groups for cloning users 2016-06-02 00:41:10 -07:00
snipe 04610e7864 Just use model validation for new user 2016-06-01 18:04:11 -07:00
snipe cffa76e627 Find first record, instead of hardcoded id 1 2016-06-01 15:50:50 -07:00
snipe 9c4cd9c3ce Save email/username format in settings controller 2016-06-01 15:45:26 -07:00
snipe eacf70ee3f Updated validation 2016-06-01 15:45:05 -07:00
snipe f3c6275f8d Removed settings form request 2016-06-01 15:43:12 -07:00
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 8b072fddcf Fixes middleware for locale 2016-05-14 17:25:56 -07:00
snipe 415b60a293 Added check for setup in Setting model 2016-05-14 16:09:00 -07:00
snipe 9a8e4a55e7 Check for DB table 2016-05-14 15:05:28 -07:00
snipe 1a14abed05 Check that the table exists 
Should probably find a way to handle this that doesn't require a DB call
 2016-05-14 15:05:20 -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
snipe 3eb09871cf Fixed model name 2016-04-23 03:12:39 -07:00
snipe 1b5ef695f2 Add custom fields to modals in create asset 2016-04-23 03:12:31 -07:00
snipe 7a65fe8f89 Only get fieldset rules if there if is a model selected 2016-04-23 02:35:31 -07:00
snipe 93e7715c28 Fixes dumb timestamp if the user manually removes date 2016-04-23 02:34:29 -07:00
snipe 7e0ab645bf Removed junk text 2016-04-23 02:09:52 -07:00
snipe 4d4b4ffd36 Use new checkout/checkin method 2016-04-23 02:08:38 -07:00
snipe 466f660a63 Removed older commented out code 2016-04-23 02:08:18 -07:00
snipe aa13b24bbc Remove Parsefloat. Again. 2016-04-23 02:08:04 -07:00
snipe c9d285cf47 Fixed float for purchase_cost 2016-04-21 22:23:08 -07:00
snipe 44f7305e12 Fix restore assets 2016-04-21 21:01:57 -07:00
snipe 6b982ec253 Check for accessories 2016-04-21 21:01:45 -07:00
snipe a0b080b91d Fixed restore again. 
For some reason, $user->restore() isn't working? WTF.
 2016-04-21 20:52:32 -07:00
snipe 0a5e7214aa Fixed restore method 2016-04-21 20:27:03 -07:00
snipe c39e27cc5e Fixes #1955 - searching within locations 2016-04-19 20:23:04 -07:00
snipe 4efc30c63e Escape search query text 2016-04-19 20:22:37 -07:00
snipe f2d883e711 Removed box header 2016-04-19 07:43:49 -07:00
snipe 13f85e82bb Fixes #1909 - allow 0 month depreciation 2016-04-19 07:39:54 -07:00
snipe 3e84d66c80 Re-use settings to prevent 1001 queries 2016-04-19 06:11:20 -07:00
snipe c4ea4f80b1 Fixes #1693 - hide soft-deletes assets from asset model view 2016-04-19 04:55:16 -07:00
snipe 49c09dd356 Added ability to purge soft-deletes from admin 2016-04-19 04:36:07 -07:00
snipe 78aa0cc378 Fixes #1918 - wrong link for status 2016-04-19 02:44:59 -07:00
snipe cd0df27516 Comment edit 2016-04-12 19:24:02 -07:00
snipe b6fa3a2a89 Added todos, fixed ID casing 2016-04-07 17:23:52 -07:00
snipe 4b168e8cfa Fixes #1932 - disallow category delete if there are assets/accessories/etc 2016-04-07 17:15:30 -07:00
snipe d601db2090 Updated docs 2016-04-07 17:08:38 -07:00
snipe bf728da39d Updated to use 5.2 trans() instead of Lang::get for localization 2016-04-07 13:39:35 -07:00
snipe a62859dc6d Updated docblocks 2016-04-07 13:21:09 -07:00
snipe 95e4845176 Fix userlist for accessory checkout 2016-04-07 05:03:14 -07:00
snipe 4a7b0c0d0f Updated docblocks 2016-03-28 22:51:49 -07:00
snipe 6f9bad1005 Use lightbox for images in asset file listing 2016-03-25 20:38:27 -07:00
snipe 90d4a8b2e3 Cleanup namespaces a bit 2016-03-25 19:26:22 -07:00
snipe e7405e8d89 Coding is still hard, apparently. 2016-03-25 18:51:44 -07:00
snipe a10da2e148 Fixes error loading consumables 2016-03-25 18:29:45 -07:00
snipe 41384dc62f Fixes #1845 - remove ability for users to change their email and password 2016-03-25 18:20:57 -07:00
snipe f1558706ff Updated docblocks 2016-03-25 18:07:12 -07:00
snipe 46a76e2c55 More compact user code 2016-03-25 17:45:50 -07:00
snipe bd1cb921fc Nicer namespacing and lazy eager loading for 101 queries in location assets 2016-03-25 17:38:17 -07:00
snipe 95e2825716 A few more path fixes 2016-03-25 17:20:28 -07:00
snipe bddb7fca23 Additional doc blocks, added private_uploads path 2016-03-25 15:50:08 -07:00
snipe 27543d16f6 Additional escaping 2016-03-25 15:24:12 -07:00
snipe 4b9dc430c4 Escape data in datatables 2016-03-25 06:50:24 -07:00
snipe 753a7333f1 If the settings table is empty, set a default 2016-03-25 05:39:08 -07:00
snipe 7ec109c4d8 Fixed slug helper 2016-03-25 03:32:35 -07:00
snipe aff133b5f1 Applied updates from PR for LDAP pagination 2016-03-25 01:38:10 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00