Commit Graph

  • 1c09479d5f Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 10:34:43 -07:00
  • 682c75e990 Bumped version snipe 2016-08-02 10:34:30 -07:00
  • 1612562f41 Create log record and send EULA when creating a new asset that’s checked out snipe 2016-08-02 10:33:44 -07:00
  • 1b7f28598d Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 09:54:47 -07:00
  • 17d5e40e02 Fixes #2383 snipe 2016-08-02 09:54:31 -07:00
  • 099a85e26d Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 05:06:29 -07:00
  • 0e5209e80f Few more dashboard fixes snipe 2016-08-02 05:06:17 -07:00
  • 95328f0a6a Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 04:46:25 -07:00
  • cbc42f3e59 Fix for deleted users display snipe 2016-08-02 04:45:48 -07:00
  • 846356974d Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 04:26:19 -07:00
  • ef6fb69cee Fix translation snipe 2016-08-02 04:26:07 -07:00
  • fb1eab0978 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 04:24:09 -07:00
  • 39929c7d89 Better handling for deleted users snipe 2016-08-02 04:23:13 -07:00
  • d6ba0b67f0 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 03:50:20 -07:00
  • 66ad0f1d4c Better fix for location LDAP sync snipe 2016-08-02 03:50:08 -07:00
  • bfac25d445 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 03:45:17 -07:00
  • 3b247ba31f Ignore location field if no value is passed snipe 2016-08-02 03:45:03 -07:00
  • bc3482b281 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 03:26:53 -07:00
  • 23e23bab90 Remove display of port number since it’s ignored anyway snipe 2016-08-02 03:26:38 -07:00
  • 848e3837aa Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 02:36:40 -07:00
  • 1747be4b29 Enable .env file to point to location of CA Cert (#2382) Brady Wetherington 2016-08-02 02:36:00 -07:00
  • 565ea95803 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 02:33:04 -07:00
  • e7e8c487c9 Bumped version snipe 2016-08-02 02:32:52 -07:00
  • 5a242433fb Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 02:12:33 -07:00
  • 6204969639 Fixed requestable link snipe 2016-08-02 02:12:18 -07:00
  • cde5efd698 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 01:36:32 -07:00
  • 283bb4ae4b Fixes #2381 snipe 2016-08-02 01:36:14 -07:00
  • 3d1d248bb5 Merge remote-tracking branch 'origin/develop' snipe 2016-08-02 01:26:51 -07:00
  • 9c31c0edce Ignore uploaded barcodes snipe 2016-08-02 01:26:44 -07:00
  • 39450c1fe9 Eager load throttle query snipe 2016-08-02 01:23:53 -07:00
  • 64ffd261fc Bumped version snipe 2016-08-02 01:14:11 -07:00
  • de17da099f Fixed tests snipe 2016-08-02 01:12:58 -07:00
  • 886a31190c Fixed route snipe 2016-08-02 01:08:37 -07:00
  • 8246a319a2 Fixes #2363 and #1097 snipe 2016-08-02 00:54:38 -07:00
  • 27adeb427e Generate barcodes locally and try to serve them if they exist snipe 2016-08-01 22:56:28 -07:00
  • bfc18c758a Removed console message from JS snipe 2016-08-01 21:43:56 -07:00
  • 735595be07 Typeahead library snipe 2016-08-01 21:43:01 -07:00
  • 27dee1b793 Removed comment snipe 2016-08-01 20:15:25 -07:00
  • cdeccb399f Hide extra options if superadmin is checked snipe 2016-08-01 20:11:54 -07:00
  • 2f679ccc29 Merge remote-tracking branch 'origin/develop' snipe 2016-08-01 18:44:32 -07:00
  • eac6abe60a Fixes #2378 - disallow admins to create/edit superadmins snipe 2016-08-01 18:43:11 -07:00
  • c9d3cd724b Fix installer again (#2370) Daniel Meltzer 2016-08-01 13:08:46 -05:00
  • 1fa2fe3c24 Merge remote-tracking branch 'origin/develop' v3.1.0 snipe 2016-08-01 10:32:04 -07:00
  • b6986ad808 Bumped version snipe 2016-08-01 10:31:46 -07:00
  • 715c9aa780 Merge remote-tracking branch 'origin/develop' snipe 2016-08-01 10:18:01 -07:00
  • 139325d8ba Small tweaks for bad data snipe 2016-08-01 10:17:46 -07:00
  • d65a9091c8 Merge remote-tracking branch 'origin/develop' snipe 2016-07-30 17:27:29 -07:00
  • 1f30bdee99 Fixes #2361 snipe 2016-07-30 17:27:08 -07:00
  • 4e4f338680 Merge remote-tracking branch 'origin/develop' snipe 2016-07-29 14:32:49 -07:00
  • 0f72989953 Updated language strings snipe 2016-07-29 14:32:31 -07:00
  • 93e038006c Merge remote-tracking branch 'origin/develop' snipe 2016-07-29 14:18:21 -07:00
  • b63a3abf70 Bumped hash snipe 2016-07-29 14:18:05 -07:00
  • 46eca54b44 Moved bulk checkout into assets nav snipe 2016-07-29 14:17:59 -07:00
  • fcb1d6ac15 Fixed feedback on #2349 (#2359) zjean 2016-07-29 22:59:50 +02:00
  • 3f54c034dd Merge remote-tracking branch 'origin/develop' snipe 2016-07-29 12:15:45 -07:00
  • a53346be1f Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-07-29 12:15:14 -07:00
  • fd94c76874 Fixes asset created_at snipe 2016-07-29 12:15:09 -07:00
  • 108a3c9dad Updated view for #2324 (#2357) zjean 2016-07-29 20:55:16 +02:00
  • 85232c47da Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-07-28 21:31:58 -07:00
  • 47f6635992 A few more permissions tweaks snipe 2016-07-28 21:31:53 -07:00
  • eef8d1609e Small fixes (#2350) Daniel Meltzer 2016-07-28 22:59:42 -05:00
  • 8a9307f357 Wordwrap license key snipe 2016-07-28 18:56:02 -07:00
  • 0a73297f24 Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 12:51:01 -07:00
  • 1f0737cfb7 Allow super admins to override company snipe 2016-07-28 12:40:19 -07:00
  • fae9755ffb Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 09:16:46 -07:00
  • c07ad03e74 Removed unique from form request snipe 2016-07-28 09:16:30 -07:00
  • 011cb1120d Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 08:51:15 -07:00
  • 68b7b8f932 Fixes Carbon date snipe 2016-07-28 08:51:01 -07:00
  • f78a577210 Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 08:41:47 -07:00
  • c0f4e621ea Bumped version snipe 2016-07-28 08:41:33 -07:00
  • c78dbfc21f Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 08:39:59 -07:00
  • f31637adb4 Fixes #2346 snipe 2016-07-28 08:39:28 -07:00
  • 3e5d2b5385 Ability to remove field from fieldset snipe 2016-07-28 08:10:15 -07:00
  • fbd0059bbb Fixes #2317 snipe 2016-07-28 08:07:14 -07:00
  • f53c5706f6 Fixes #2341 snipe 2016-07-28 07:36:58 -07:00
  • 214a7d548d Bumped version snipe 2016-07-28 06:44:59 -07:00
  • 0ee5dea1a1 Fixes #2344 snipe 2016-07-28 06:43:31 -07:00
  • 29c60ee6b5 Merge remote-tracking branch 'origin/develop' snipe 2016-07-28 05:50:22 -07:00
  • 075f8fd021 Fixed typo snipe 2016-07-28 05:49:55 -07:00
  • 14b0a6315f Pass users path to get_src snipe 2016-07-28 05:49:41 -07:00
  • b99d300ab2 Merge remote-tracking branch 'origin/develop' snipe 2016-07-27 21:47:25 -07:00
  • 9dda0d02ea Change default zerofill to 5 snipe 2016-07-27 21:47:03 -07:00
  • 8e6c157e7e Merge remote-tracking branch 'origin/develop' snipe 2016-07-27 21:33:00 -07:00
  • 9fbe6c68ac Fixes #2304 snipe 2016-07-27 21:30:38 -07:00
  • eb508901c5 Zerofilling for auto-increment snipe 2016-07-27 21:28:00 -07:00
  • 07b70a8cd0 Merge remote-tracking branch 'origin/develop' snipe 2016-07-27 20:30:25 -07:00
  • e9eb5ad372 Bumped version snipe 2016-07-27 20:30:11 -07:00
  • 3fd5fb836f Restore linebreaks in notes snipe 2016-07-27 20:24:09 -07:00
  • 3514ae2c0d Merge branch 'develop' of github.com:snipe/snipe-it into develop snipe 2016-07-27 20:16:54 -07:00
  • 1493251794 Gitignore cleanup snipe 2016-07-27 20:16:46 -07:00
  • b4e54225a2 Fix exports (#2338) Daniel Meltzer 2016-07-27 21:45:45 -05:00
  • 4c9e75cec9 Install php-zip so backups work. Not needed in 14.04 because it looks like this is part of the php7 split. (#2340) Daniel Meltzer 2016-07-27 21:44:46 -05:00
  • a401986ef5 Only set the category_type in postEdit if the category is empty. (#2337) Daniel Meltzer 2016-07-27 19:13:54 -04:00
  • 288584cb60 Merge branch 'master' of github.com:snipe/snipe-it snipe 2016-07-26 16:33:32 -07:00
  • 399e70763b Scope requestable assets to company as well. Updates to #2206. (#2326) Daniel Meltzer 2016-07-26 18:22:56 -05:00
  • f145d6cc8c Change README to point to new documentation site Brady Wetherington 2016-07-26 13:56:40 -07:00
  • 9e4ac018ea Don't allow users without a company to change the company of items if full company support is enabled. (#2321) Daniel Meltzer 2016-07-26 15:31:36 -05:00
  • 0bf5c6978e Make sure the assigned user is actually shown in the dropdown list. Not sure why this wasn't throwing an error for me, but this makes it actually behave. (#2322) Daniel Meltzer 2016-07-26 15:06:38 -05:00
  • 9a9b214c1d Fixes #2319 snipe 2016-07-26 06:07:47 -07:00
  • b76dc25ac0 Duh, we don’t soft-delete companies snipe 2016-07-26 02:11:41 -07:00