Commit Graph

  • 98b20fc1cd Added option to include model information on asset labels. (#5301) Jason 2018-07-12 18:23:12 -07:00
  • 980dccf31c Add @5quirrel as a contributor snipe 2018-07-12 18:19:35 -07:00
  • bb2193d481 Add @tilldeeke as a contributor snipe 2018-07-12 18:19:14 -07:00
  • bf8fe316df Fix for #4901 (#5829) 5quirrel 2018-07-13 09:15:12 +09:30
  • 96716626c6 Fixed #5828 - typo snipe 2018-07-12 14:07:07 -07:00
  • e20338ff9e Merge branch 'develop' v4.5.0 snipe 2018-07-09 22:38:04 -07:00
  • 78530ae123 Fix tests snipe 2018-07-09 21:57:45 -07:00
  • 52d605d13e Merge branch 'develop' snipe 2018-07-09 19:21:23 -07:00
  • 0182615e7e Bumped version snipe 2018-07-09 19:18:38 -07:00
  • fad84d4437 Merge branch 'develop' snipe 2018-07-09 19:07:49 -07:00
  • c162e9a4de Bumped hash snipe 2018-07-09 19:06:56 -07:00
  • bf1e742df6 Merge branch 'develop' snipe 2018-07-09 19:05:19 -07:00
  • 0e88a6b268 Fixed bug in branding image upload size text snipe 2018-07-09 19:04:00 -07:00
  • c1e870528e Fixes the label association (#5510) (#5790) Till Deeke 2018-07-09 23:51:17 +02:00
  • 35fc001c58 Fixed #5742 - create_function() is deprecated snipe 2018-07-05 20:49:01 -07:00
  • 339263a295 Fixed #5751 - added option for unique constraint on serial snipe 2018-07-05 19:30:36 -07:00
  • a44bd9abe0 Disallow deleting category if there are licenses snipe 2018-07-05 18:02:25 -07:00
  • b850d47282 Merge branch 'develop' snipe 2018-07-05 15:40:07 -07:00
  • 4099c06b27 fix middleware priority: handle trusted proxies prior setup check snipe 2018-07-05 15:36:59 -07:00
  • e559879f91 Add @plexorama as a contributor snipe 2018-07-05 15:35:37 -07:00
  • abb95e7872 Tweaked custom field default value layout snipe 2018-07-05 15:31:27 -07:00
  • 869de3d251 Fixed broken pagination on status labels API snipe 2018-07-05 14:42:39 -07:00
  • f3526eccb9 Merge branch 'features/textarea-custom-field' into develop snipe 2018-07-05 12:37:07 -07:00
  • 880faa83a6 Importer2 checkout (#5771) Daniel Meltzer 2018-07-05 15:22:24 -04:00
  • 311f9fcefb Implemented method to get info on the current user of the API (#5722) Juan Font 2018-07-03 05:35:10 +02:00
  • 8732f299e6 Added logo class for logo override in custom CSS snipe 2018-07-02 18:47:24 -07:00
  • b30aac536a fixed the alignment of a couple navbar icons (#5764) Arunas Skirius 2018-07-03 02:10:25 +01:00
  • d7dc4ae0c0 Added manager to custom report snipe 2018-06-27 00:45:09 -07:00
  • 5bb4c85ccb Update twitter handle snipe 2018-06-27 00:44:54 -07:00
  • 80dda198c5 Parse line breaks in the detail view snipe 2018-06-21 09:44:10 -07:00
  • 9442736518 Adds textarea as a custom field type snipe 2018-06-21 09:35:04 -07:00
  • 2fbad52c71 Merge branch 'develop' snipe 2018-06-21 07:54:01 -07:00
  • 5975c9fac7 Add @ParadoxGuitarist as a contributor snipe 2018-06-21 07:52:24 -07:00
  • 7b0e392ecd Add @thelamer as a contributor snipe 2018-06-21 07:52:04 -07:00
  • b51a10b46b Add @RichardRay as a contributor snipe 2018-06-21 07:51:39 -07:00
  • 6c58f59d72 Add @EarlRamirez as a contributor snipe 2018-06-21 07:51:24 -07:00
  • cd9caa24ad Add @SjamonDaal as a contributor snipe 2018-06-21 07:51:13 -07:00
  • cbb4b4d846 Merge branch 'develop' snipe 2018-06-21 07:46:27 -07:00
  • ea4cdadc6e Bumped version snipe 2018-06-21 07:44:58 -07:00
  • 6638d64d68 Merge remote-tracking branch 'origin/master' into develop snipe 2018-06-21 07:43:32 -07:00
  • eb412c2bcb Missed one snipe 2018-06-21 07:43:12 -07:00
  • fde4a59510 Bumped version snipe 2018-06-21 07:40:37 -07:00
  • 1ee394aa69 Added Select2 to class for dropdowns snipe 2018-06-21 07:40:30 -07:00
  • 707f90573c Merge branch 'thelamer-docker-fixes' into develop snipe 2018-06-21 07:31:55 -07:00
  • f8429ad357 Merge branch 'docker-fixes' of https://github.com/thelamer/snipe-it into thelamer-docker-fixes snipe 2018-06-21 07:31:15 -07:00
  • aa5003d297 Merge branch 'develop' snipe 2018-06-21 07:21:24 -07:00
  • e9901f5e58 Set composer timeout to 3000 snipe 2018-06-12 13:05:51 -07:00
  • f0d04a4a57 End help text with a period consistently. (#5731) Djamon Staal 2018-06-21 16:13:29 +02:00
  • 32e3f748d8 Make version footer configurable. (#5730) Djamon Staal 2018-06-21 16:12:16 +02:00
  • fa465a84df Added cron to list of packages (#5729) Earl Ramirez 2018-06-21 02:28:35 -04:00
  • 82cf1a4467 Updated SELinux label (#5728) Earl Ramirez 2018-06-21 02:28:20 -04:00
  • 3bbd49dbad Don't run composer as root (#5689) tiagom62 2018-06-20 22:59:44 -04:00
  • ad21857cae Update my email address across files. (#5716) Daniel Meltzer 2018-06-20 04:59:59 -04:00
  • 2d18b73138 Fix #5408. (#5715) Daniel Meltzer 2018-06-20 04:59:04 -04:00
  • e7bc18dad4 Fixed inconsistent or incorrect comment labels (#5691) Richard Ray Thomas 2018-06-11 22:11:58 -05:00
  • 62e4eabab0 Fixed #5693 - don’t truncate license key snipe 2018-06-11 18:46:49 -07:00
  • d204eebab9 Ubuntu Bionic Beaver 18.04 support (#5687) tiagom62 2018-06-09 14:21:28 -04:00
  • ed5823151b in order to avoid manual user intervention of running "php artisan migrate" before installation on a clean database pulling in migration scripts on startup if needed, also ownership of keys needs to be the docker user thelamer 2018-06-07 22:29:00 -07:00
  • 968d7d1f11 Fixed #5354 - adds dd/mm/yyyy to localization snipe 2018-06-05 15:30:50 -07:00
  • 086683319a Fixed #5172 - autosum on assets detail view for components tab snipe 2018-06-02 06:21:51 -07:00
  • e5c1f4847d Added emoji to exempt list to match current labels snipe 2018-06-01 13:55:39 -07:00
  • 087e114d34 Merge branch 'develop' snipe 2018-05-31 16:34:25 -07:00
  • 5a6b8bb856 Make default custom field value null snipe 2018-05-31 14:21:18 -07:00
  • 102f567cb5 Fixed typo snipe 2018-05-31 10:55:13 -07:00
  • 1a64879b65 Only allow remote user settings to be saved if the app is not in demo mode snipe 2018-05-31 10:53:56 -07:00
  • 4a0e5e4b88 Possible fix for oauth issue in Docker Brady Wetherington 2018-05-31 01:36:51 -07:00
  • 01857fb056 Added created_at to file upload UI, added header/footer to files modal, fixed string for actions snipe 2018-05-29 16:38:23 -07:00
  • 3afe4938f9 Fixed #5616 - removed duplicate call to ekkoLightbox on asset view snipe 2018-05-29 16:36:42 -07:00
  • 9e0544e735 Fixed #5617 - incorrect url to fieldset editing snipe 2018-05-29 10:41:46 -07:00
  • 3993c6ad6b Use custom header color in emails snipe 2018-05-29 10:23:24 -07:00
  • 649563457d Added notes field to acessories and consumable checkout pages. Resolves request #5607. (#5608) Brian Monroe 2018-05-28 14:30:18 -07:00
  • 6ec75714f0 Force default srtorage engine snipe 2018-05-22 14:57:05 -07:00
  • 15916e6668 Allow checkout to non-user objects even if the object requires checkout snipe 2018-05-21 17:35:04 -07:00
  • 76d0562716 Added last name to expected checkin notification snipe 2018-05-21 17:34:27 -07:00
  • 2ecc4aead7 Merge branch 'develop' v4.4.1 snipe 2018-05-21 15:43:48 -07:00
  • d8210847a4 Bumped version snipe 2018-05-21 15:43:04 -07:00
  • ece916e12f Merge branch 'develop' snipe 2018-05-21 15:41:40 -07:00
  • 1a29d4f60f Check for > 0 expected assets snipe 2018-05-21 15:41:19 -07:00
  • 11832daf5c Merge branch 'develop' v4.4.0 snipe 2018-05-21 15:17:40 -07:00
  • 79555f5647 Bumped version snipe 2018-05-21 15:16:56 -07:00
  • 1868013704 Merge branch 'develop' snipe 2018-05-21 14:59:08 -07:00
  • 39cc13f155 Bumped version snipe 2018-05-21 14:58:16 -07:00
  • e636875797 Merge branch 'develop' snipe 2018-05-21 14:56:57 -07:00
  • 260749337e Updated languages snipe 2018-05-21 14:54:36 -07:00
  • 20a3b556bb Removed log snipe 2018-05-21 14:33:10 -07:00
  • fa0c58e42a Don't install require-dev packages. (#5549) Tim Bishop 2018-05-19 00:06:05 +01:00
  • abbb94239d Add @doekman as a contributor snipe 2018-05-18 16:04:54 -07:00
  • d89ef43834 Make category counters ints snipe 2018-05-18 15:48:48 -07:00
  • f84ab2beda Fixed bug #5540 (#5550) Doeke Zanstra 2018-05-19 01:04:34 +02:00
  • 86d398abda Fixed category test snipe 2018-05-18 14:58:06 -07:00
  • 883c65981b More test fixes snipe 2018-05-16 20:09:18 -07:00
  • 8eb96efa13 Merge branch 'develop' snipe 2018-05-16 19:38:23 -07:00
  • e9973670ea Could should not be equal to 1 snipe 2018-05-16 19:38:02 -07:00
  • ef8d2d06df Fixes #5519 - count() for php 7.2 snipe 2018-05-16 19:35:14 -07:00
  • 0b5bb520a7 Merge branch 'develop' snipe 2018-05-16 19:24:31 -07:00
  • 233fb23cb8 Create asset maintenance - Added orange bar for required asset to edit view (#5520) lea-mink 2018-05-17 04:23:23 +02:00
  • fa89f45cb8 Bumped hash snipe 2018-05-16 19:22:59 -07:00
  • 4c656c0321 De-normalize new counters from 4.3.0 (#5547) snipe 2018-05-16 19:20:43 -07:00
  • 87c6ee2035 Importer test fixes snipe 2018-05-16 19:05:00 -07:00
  • aab190423f Partial fix for license+category tests snipe 2018-05-16 18:35:11 -07:00