Commit Graph

  • b3454b1c24 Fix bug in image process logic that wouldn't resize the height. Also make it possible to choose files from android as well as pictures directly. Daniel Meltzer 2016-05-22 15:03:59 -05:00
  • 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 Daniel Meltzer 2016-05-20 19:23:34 -05:00
  • 11c400f12b Merge pull request #2095 from dmeltzer/importer-improvements snipe 2016-05-31 17:45:29 -07:00
  • 823273f565 Merge pull request #2092 from dmeltzer/installer snipe 2016-05-31 17:45:18 -07:00
  • a542b18a04 Merge pull request #2050 from dmeltzer/sqlite-fixes snipe 2016-05-31 17:45:04 -07:00
  • f2a5337ad2 Simplify Daniel Meltzer 2016-05-25 23:26:15 -05:00
  • 4af5cdd64f asset_id is not allowed to be null in asset_log according to db schema. 0 it out here to make sqlite happy. Daniel Meltzer 2016-05-25 20:32:45 -05:00
  • 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. Daniel Meltzer 2016-05-24 20:05:48 -05:00
  • 45d93ffa8c Use a transaction while creating license seats. Makes adding a license with a large number of seats much more managable. Daniel Meltzer 2016-05-17 23:44:27 -05:00
  • 4b98711e07 Replace the assorted concat() methods with a full_name method in the User model and adjust queries accordingly Daniel Meltzer 2016-05-17 23:31:57 -05:00
  • a729038ccd Fix typo. Daniel Meltzer 2016-05-31 19:00:11 -05:00
  • e5bd6a8a26 A bit more detailed message when starting the installer to share what version of OS we've detected. Daniel Meltzer 2016-05-31 18:51:56 -05:00
  • 5e03fe40a7 Fix some more centos6 stuff. Daniel Meltzer 2016-05-31 18:33:23 -05:00
  • dab2a50982 Only display errors in import table if things actually prevent the asset from being created. Also some table formatting improvements. Daniel Meltzer 2016-05-31 18:04:01 -05:00
  • 0e0b31bba6 Company name length to 1 snipe 2016-05-31 15:04:13 -07:00
  • c9d00b1f06 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-31 14:27:39 -07:00
  • 9bb258bb99 Updated alt tag snipe 2016-05-31 14:27:33 -07:00
  • ac10a199ea Merge pull request #2083 from dmeltzer/importer-improvements snipe 2016-05-31 14:25:33 -07:00
  • 5952181454 Fix missing -p in mysql call on centos6. Daniel Meltzer 2016-05-31 09:05:51 -05:00
  • 0da1e186d7 Fix some weird bash issues caused when merging the v2 and v3 versions of the script. Daniel Meltzer 2016-05-29 15:54:20 -05:00
  • d92de14413 Fix installer for v3. Tested with centos7 and ubuntu 16.0.4. Daniel Meltzer 2016-05-28 20:35:28 -05:00
  • 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. Daniel Meltzer 2016-05-26 21:29:29 -05:00
  • 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. Daniel Meltzer 2016-05-26 08:00:00 -05:00
  • 891c37b2ed Add warranty months. Also fix a merge issue where things reverted back to comment instead of log. Daniel Meltzer 2016-05-25 21:13:26 -05:00
  • e353df588f Importer improvements. If user real name doesn't exist don't try to create the user. Daniel Meltzer 2016-05-24 21:40:52 -05:00
  • fd0d04eba4 Import status labels. Daniel Meltzer 2016-05-24 18:14:01 -04:00
  • 22c6f32e92 Instead of a field in the csv, set whether assets, consumables, or accessories are generated by an option on the command line. Also Adjustconsumables/accessories to function smoother. Daniel Meltzer 2016-05-25 20:19:12 -05:00
  • 04428d2d07 Replace console output in ObjectImporter with a logging mechanism. Also track all model/validation errors and output them at the end of the import, rather than inline. Daniel Meltzer 2016-05-25 19:34:54 -05:00
  • c89f357e4a Fixes #2082 snipe 2016-05-25 13:32:33 -07:00
  • 8a968b4dfb Responsive dashboard table snipe 2016-05-24 19:04:56 -07:00
  • 9aff515c0a More mobile fixes snipe 2016-05-24 18:50:54 -07:00
  • 5f91329397 Some responsive fixes snipe 2016-05-24 17:59:02 -07:00
  • 37be587c39 Make regular and highlight colors the same, since we're not using highlight colors in the pie chart yet snipe 2016-05-24 16:19:44 -07:00
  • 0c33575962 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-24 16:10:45 -07:00
  • 84edc9cf25 New generated JS snipe 2016-05-24 16:10:04 -07:00
  • 14dac9b371 Updated versioned js snipe 2016-05-24 16:09:37 -07:00
  • 8e18d02f7a Updated chartJS snipe 2016-05-24 16:09:28 -07:00
  • d0ebdd03bd Added legend template for chartJS, even though it doesn't seem to do a fucking thing snipe 2016-05-24 16:08:56 -07:00
  • bfc3f69adb Better comments on model methods snipe 2016-05-24 16:08:18 -07:00
  • cde0d49e18 Added assets method snipe 2016-05-24 16:06:22 -07:00
  • abf027059f Fixed comment snipe 2016-05-24 16:06:15 -07:00
  • 4edc2a7a66 Route and controller for dashboard chart snipe 2016-05-24 16:06:09 -07:00
  • 3b838ca867 Added static colors for charts snipe 2016-05-24 16:05:51 -07:00
  • 8b023adba3 Merge pull request #2078 from dmeltzer/fix-statuslabels-translations snipe 2016-05-24 15:56:10 -07:00
  • 293b8c0dea Fix strings for StatusLabels, they still referenced locations. Daniel Meltzer 2016-05-24 17:54:44 -05:00
  • d6dc57286f Merge pull request #2077 from dmeltzer/fix-settings-table-for-sqlite snipe 2016-05-24 15:45:25 -07:00
  • 52b61c9d49 Fix mistake in the settings table kerfuffle. Daniel Meltzer 2016-05-24 18:14:57 -04:00
  • 780c0e678d Changed min dimensions to 500 from 300 snipe 2016-05-24 13:21:18 -07:00
  • 5bceb5ce52 Display escaped parsedown note snipe 2016-05-24 10:21:45 -07:00
  • de5e1ca86b Add persedown helper snipe 2016-05-24 10:21:33 -07:00
  • 6c6e65b8ca Fixes #2076 snipe 2016-05-24 09:46:43 -07:00
  • 64d818e56e Fixed License and LicenseSeat namespaces for importer snipe 2016-05-24 02:17:10 -07:00
  • d6715914e1 Fixed supplier namespace snipe 2016-05-24 02:13:28 -07:00
  • f10b3b7cdb Fix for license importer snipe 2016-05-24 01:51:47 -07:00
  • f844bf4b41 Nicer focus handling for asset search snipe 2016-05-24 01:10:05 -07:00
  • 6e006a6873 Redundant top nav snipe 2016-05-24 00:58:59 -07:00
  • cb91829729 Fixed division by zero error snipe 2016-05-24 00:49:56 -07:00
  • 086b13c17e Fixed version number v2.1.1 snipe 2016-05-23 23:12:01 -07:00
  • 2620da186b Few more importer fixes snipe 2016-05-23 23:10:58 -07:00
  • 3689a52894 More status label fixes on import snipe 2016-05-23 22:50:03 -07:00
  • 725a9320cb Make sure status label is never null or empty snipe 2016-05-23 22:40:48 -07:00
  • 12996cafac Added status label, supplier and warranty months to importer snipe 2016-05-23 22:09:02 -07:00
  • 859c53e975 Merge remote-tracking branch 'origin/master' into develop snipe 2016-05-23 20:56:28 -07:00
  • 1322d81d64 Merge branch 'master' of github.com:snipe/snipe-it snipe 2016-05-23 20:55:50 -07:00
  • 3ab828a4cd Make licenses sortable by name, serial snipe 2016-05-23 20:55:41 -07:00
  • 5ca572b914 Merge pull request #2073 from merid14/patch-4 snipe 2016-05-23 12:01:15 -07:00
  • 1bc7ff9941 Fix for casematch in case statements Walter 2016-05-23 14:57:38 -04:00
  • fb35e40342 Search by asset tag v3.0-alpha2 snipe 2016-05-20 17:02:28 -07:00
  • b796e72faf Remove old search snipe 2016-05-20 16:01:23 -07:00
  • c56ceebb40 Default timezone back to UTC snipe 2016-05-20 14:29:15 -07:00
  • b855f2fa2b Merge pull request #1986 from TahsinAbrar/develop snipe 2016-05-20 13:51:39 -07:00
  • 114e6ec6cc Merge pull request #2065 from merid14/patch-3 snipe 2016-05-20 12:25:33 -07:00
  • 78fc6dec3c Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-20 12:23:36 -07:00
  • 7fd6051514 Fixes #2062 - old permissions masks to new snipe 2016-05-20 12:23:31 -07:00
  • be4230af81 Fix supported distros Walter 2016-05-20 15:21:44 -04:00
  • 072923826d Merge pull request #2060 from dmeltzer/fix-settings-table-for-sqlite snipe 2016-05-20 10:52:00 -07:00
  • c52e3b5f9c Check if the column exists before dropping. Also recreate the column in a rollback to make the migrations happy. Also break into two migrations to make sqlite happy. Daniel Meltzer 2016-05-20 10:03:04 -05:00
  • f6cdd90e41 New docs links in README snipe 2016-05-20 01:44:24 -07:00
  • 975b266cb0 Icon display on recent activity snipe 2016-05-20 01:17:00 -07:00
  • aad1ba4ab3 Updated language strings snipe 2016-05-20 00:47:03 -07:00
  • 6b5d0a5abf Translations and nicer formatting for login/password reset snipe 2016-05-20 00:25:45 -07:00
  • 6724489be2 Added additional dump variables v3.0-alpha snipe 2016-05-19 23:37:36 -07:00
  • be0a60e049 Updated strings snipe 2016-05-19 23:27:08 -07:00
  • 3d1f051e16 Remove demo login info snipe 2016-05-19 23:21:01 -07:00
  • 66beeeb26d Added notes back to asset file uploads snipe 2016-05-19 23:12:27 -07:00
  • 2c7b345ad2 Merge pull request #2057 from dmeltzer/fix-settings-table-for-sqlite snipe 2016-05-19 20:27:56 -07:00
  • a6849fc689 Remove stray code from my commit and add a migration to fix the Settings issue the proper way. Daniel Meltzer 2016-05-19 21:51:31 -05:00
  • db6305bf1f Merge pull request #2056 from dmeltzer/make-categories-limit-work snipe 2016-05-19 19:50:22 -07:00
  • cbcc155f27 Settings tweaks snipe 2016-05-19 19:49:25 -07:00
  • 1148750c9a Make limit/offset work in getDataView Daniel Meltzer 2016-05-19 21:45:48 -05:00
  • c4a699f109 Validation for new alert settings snipe 2016-05-19 19:43:05 -07:00
  • 2b1bf9f7f3 Merge branch 'v3' of github.com:snipe/snipe-it into v3 snipe 2016-05-19 19:34:11 -07:00
  • 15eb6df1db Add settings for alert interval threshold and inventory threshold snipe 2016-05-19 19:33:53 -07:00
  • 29e54830e1 Added 2D barcodes to labels snipe 2016-05-19 19:12:42 -07:00
  • 486d74fa64 Merge pull request #2052 from dmeltzer/remove-sentry-from-importer snipe 2016-05-18 23:40:48 -07:00
  • 592ce4c2de Readd sample.csv. Also port away from Sentry in the importer to be laravel5 compliant. Daniel Meltzer 2016-05-18 23:33:18 -05:00
  • 7fe020f836 Merge pull request #2051 from dmeltzer/importer-for-v3 snipe 2016-05-18 20:59:26 -07:00
  • 6b0bd52f5c Merge branch 'importer-for-v3' of github.com:dmeltzer/snipe-it into importer-for-v3 Daniel Meltzer 2016-05-18 22:41:58 -05:00
  • 4f70fa88d9 Rename to snipeit:import Daniel Meltzer 2016-05-18 22:38:19 -05:00
  • 173c3de36a Add the asset to the cache after creating it as well. Daniel Meltzer 2016-05-18 22:37:59 -05:00