Commit Graph

  • d14ab7e3e1 Porting change from #8053 to master snipe 2020-05-27 00:22:44 -07:00
  • f137c1ca09 Merge pull request #8044 from snipe/flysystem_tweaks snipe 2020-05-27 00:22:28 -07:00
  • f196b5bd94 Merge pull request #8077 from dmeltzer/more-paving snipe 2020-05-26 21:18:22 -07:00
  • e0d9cc4e73 Merge pull request #8053 from CharlotteDunoisLabs/fix-gravatar snipe 2020-05-26 19:58:45 -07:00
  • 5b4e4c8dcd Merge pull request #8061 from Godmartinz/develop snipe 2020-05-26 19:52:14 -07:00
  • dee1f5ec35 Merge pull request #8078 from dmeltzer/wrong-id snipe 2020-05-26 19:51:38 -07:00
  • 850bfc40d4 Merge pull request #8079 from dmeltzer/misc-fixes snipe 2020-05-26 19:50:39 -07:00
  • e7f74d94c1 Label_Woes Godfrey M 2020-05-26 17:22:45 -07:00
  • e97cf011b6 Label_Woes Godfrey M 2020-05-26 17:15:39 -07:00
  • ed23505054 Label_Woes Godfrey M 2020-05-26 17:10:45 -07:00
  • b3fe47bfa7 Remove/Reorganize logic to make codacy happier. Daniel Meltzer 2020-05-23 14:58:44 -04:00
  • 1e5d40f32e Clean up extra code in notifications files. Daniel Meltzer 2020-05-23 14:56:56 -04:00
  • f0546bf689 Clean up Transformers and extract an isDeletable() method to models where it makes sense. Daniel Meltzer 2020-05-23 13:36:02 -04:00
  • 136df9418f Deadcode-- Daniel Meltzer 2020-05-23 12:19:44 -04:00
  • 7ea862787c Refactor controller to use one method that shows all modals based on name. Daniel Meltzer 2020-05-23 12:19:19 -04:00
  • 25d6ceee6e Remove old code. Daniel Meltzer 2020-05-23 12:18:27 -04:00
  • 4fef065010 Refactor big switch to lookup in array. A bit cleaner/codacy happier. Daniel Meltzer 2020-05-23 12:17:56 -04:00
  • fe74394ae6 Short circuit checkout logic to prevent iterating if we're not checking out to an asset Daniel Meltzer 2020-05-23 11:48:02 -04:00
  • 7a76cb08a0 We accept xlsx in uploads Daniel Meltzer 2020-05-23 11:36:47 -04:00
  • c70bd62a0f Missing includes. Fix by using the request object instead of facade. Daniel Meltzer 2020-05-23 11:36:16 -04:00
  • ad1db2c640 Fix incorrectly named parameter. Daniel Meltzer 2020-05-23 10:26:56 -04:00
  • 2e936a9883 Sync paveit command with new database tables. Daniel Meltzer 2020-05-23 09:08:10 -04:00
  • 3db4480bba Merge pull request #8062 from dmeltzer/fix-modal-select-html snipe 2020-05-20 10:24:20 -07:00
  • 001e721530 Merge pull request #8063 from dmeltzer/backport-8092 snipe 2020-05-20 10:21:52 -07:00
  • 8210da6e82 Fix Missing Category selection in Asset Model Modal dialog. Daniel Meltzer 2020-05-20 10:29:27 -04:00
  • 6a80f95769 Fix Missing Category selection in Asset Model Modal dialog. Daniel Meltzer 2020-05-20 10:23:04 -04:00
  • edd4797178 fixed a table header error Godfrey M 2020-05-19 16:59:09 -07:00
  • f88683766b Roll back previous change snipe 2020-05-14 00:55:47 -07:00
  • e4385c0f8c Fixes #8051 regression snipe 2020-05-14 00:48:30 -07:00
  • 7f8c6fe282 Take gravatar email into account in presenter Charlotte Dunois 2020-05-13 20:30:47 +02:00
  • 8cc9e61983 Ugh snipe 2020-05-12 20:38:32 -07:00
  • c5560e466e Removed fieldset from test snipe 2020-05-12 20:17:35 -07:00
  • 157a2ee869 Merge pull request #8048 from dmeltzer/license-importer-checkout-fix snipe 2020-05-12 13:51:36 -07:00
  • de7ee40863 Fixed failing test snipe 2020-05-12 11:52:08 -07:00
  • a6f90cb3fc Assorted licenses UI fixes while testing. Daniel Meltzer 2020-05-12 14:36:14 -04:00
  • 1321304720 Importer UI: Removed misleading checked out to field. Add full name and asset tag fields to licenses. Daniel Meltzer 2020-05-12 14:34:36 -04:00
  • e4888b23e2 Save User ID when checking out a license. Also buff up importing tests to confirm license can be checked out. Daniel Meltzer 2020-05-12 14:32:55 -04:00
  • 274f82893f Regenerate session ID on logout snipe 2020-05-12 10:38:00 -07:00
  • 0550fe0ffa Fix for session fixation vulnerability snipe 2020-05-12 10:31:54 -07:00
  • 730632e2eb Apply PR #8043 to develop snipe 2020-05-11 22:57:55 -07:00
  • 7fb3a9b82c Merge pull request #8043 from snipe/features/backup-optional-in-import-and-ldap snipe 2020-05-11 22:41:36 -07:00
  • b03f8a2425 Tweak to Flysystem's filesystems.php to make it work with Snipe-IT Brady Wetherington 2020-05-11 21:41:56 -07:00
  • ecb1e87fe6 Updated assets snipe 2020-05-11 20:45:15 -07:00
  • f43df5f041 Fixed form label snipe 2020-05-11 20:44:46 -07:00
  • 95cc48e422 Added option to disable backup in import snipe 2020-05-11 20:41:10 -07:00
  • 9a2ed804ca Fixed mismatched HTML header tags snipe 2020-05-11 20:28:42 -07:00
  • d20fad28e5 Use more modern request helper snipe 2020-05-11 20:28:24 -07:00
  • ae813ddf75 Add @alek13 as a contributor snipe 2020-05-11 18:11:16 -07:00
  • bb42109c0c Added a clarifying comment snipe 2020-05-11 18:10:45 -07:00
  • f46ecf8ec0 Updated composer lock snipe 2020-05-11 18:07:20 -07:00
  • b9e821c0e6 Small fix for Group Functional Tests snipe 2020-05-11 18:07:14 -07:00
  • 9ee28c7513 Switched to use info instead of danger on undeployable statuses snipe 2020-05-11 18:07:02 -07:00
  • 1a8ba06702 Merge branch 'master' of https://github.com/snipe/snipe-it snipe 2020-05-11 17:53:32 -07:00
  • 0fd232e70d Fixed group functional test snipe 2020-05-11 17:53:24 -07:00
  • ee4d69b1c5 Merge pull request #8041 from alek13/patch-1 snipe 2020-05-11 17:52:45 -07:00
  • d22be8ee0e Merge pull request #8036 from johnson-yi/features/saml_auth snipe 2020-05-11 17:04:37 -07:00
  • d1ad111949 use supported package for slack Alexander Chibrikin 2020-05-11 20:31:13 +03:00
  • 572185ac96 Revised how saml sp info is displayed Johnson Yi 2020-05-09 09:44:51 +10:00
  • 3d8fce50d0 Removed unnecessary default saml settings Johnson Yi 2020-05-09 01:51:48 +10:00
  • 6018a9c6ee Add @johnson-yi as a contributor snipe 2020-05-06 19:21:56 -07:00
  • c3d8024e1f Merge pull request #8023 from johnson-yi/features/saml_auth snipe 2020-05-06 17:28:30 -07:00
  • c1c37d521c Allow downloading sp metadata without idp Johnson Yi 2020-05-06 19:50:50 +10:00
  • b2930d6069 Added #542: add saml authentication Johnson Yi 2020-05-06 00:06:19 +10:00
  • 8ecb7969df Fixed incorrect route for saving groups snipe 2020-05-01 01:26:15 -07:00
  • 31c5350941 Fixed incorrect route for groups edit snipe 2020-05-01 01:05:48 -07:00
  • 85712a1960 Only override fieldset_id with custom_fieldset_id if it’s present snipe 2020-04-30 20:59:42 -07:00
  • e9cb17394c Small validation fix on reset password snipe 2020-04-30 19:10:07 -07:00
  • 8507bcd16b Merge pull request #8008 from dmeltzer/component-checkinout-fixes snipe 2020-04-30 17:49:22 -07:00
  • e47c44d055 Merge pull request #8007 from dmeltzer/permissions-form-cleanup snipe 2020-04-30 17:48:24 -07:00
  • b488cffc7e Merge pull request #8006 from dmeltzer/api-test-fixes snipe 2020-04-30 17:46:25 -07:00
  • 8bb3c01f78 Addressed merge issue for reset password for #7997 snipe 2020-04-30 17:45:05 -07:00
  • 82e02490fd Removed duplicate update method (per #7997) snipe 2020-04-30 17:23:56 -07:00
  • bfba30058c Fix incorrect routing. Daniel Meltzer 2020-04-30 10:35:26 -04:00
  • debdccf5f1 Remove old help text translation that doesn't exist any more Daniel Meltzer 2020-04-30 10:35:11 -04:00
  • 441049d8ac Sort license seats by their number only, making the sort order more logical Daniel Meltzer 2020-04-30 10:34:30 -04:00
  • b28a4f3108 Add component unit test and unify some validation. Daniel Meltzer 2020-04-30 09:50:12 -04:00
  • 68224757f4 Validate when editing the quantity of a component that the new quantity is > the amount checked out Daniel Meltzer 2020-04-29 13:25:04 -04:00
  • 358609720a Component checkout/checkin fixes. Daniel Meltzer 2020-04-29 12:50:09 -04:00
  • 42e1e9a0bd Permissions edit cleanups. Daniel Meltzer 2020-04-29 12:26:31 -04:00
  • 1f8c3cc670 Test fixes. Daniel Meltzer 2020-04-29 11:01:52 -04:00
  • f8d18a8eb0 Revert asset-checkout-different validation. Daniel Meltzer 2020-04-29 10:59:00 -04:00
  • c34650458f Merge pull request #8003 from dmeltzer/test-fixes snipe 2020-04-28 16:33:51 -07:00
  • c65b8f97bb Laravel 6 drops support for php7.1, add php7.4 instead. Daniel Meltzer 2020-04-28 12:16:37 -04:00
  • 61a216a531 Rearrange seeder order so that users validate properly on first seed run. This hopefully fixes the actionlog seeder error. Daniel Meltzer 2020-04-28 12:14:23 -04:00
  • 3e7fbb02b7 Notes and style cleanups Daniel Meltzer 2020-04-28 11:44:17 -04:00
  • 9520ccae47 Unit test fix. Cleaner this way. Daniel Meltzer 2020-04-28 11:37:13 -04:00
  • 05187eb27f Fix Functional Tests. Daniel Meltzer 2020-04-28 11:31:30 -04:00
  • bb50828ca0 Remove General serial field now that the serial is part of the multi asset creation. Daniel Meltzer 2020-04-28 11:28:14 -04:00
  • c74b904f14 Fix Location parent different validation on new location creation. Daniel Meltzer 2020-04-28 11:27:44 -04:00
  • 82de51f23e Some unittest fixes for local running adapting to various factory changes. Daniel Meltzer 2020-04-27 21:02:14 -04:00
  • c2f1fd4942 Make user form a little nicer looking snipe 2020-04-28 00:01:47 -07:00
  • 412caebf69 Fixed logo uploads snipe 2020-04-27 23:22:52 -07:00
  • 3613da3685 Fixed dashboard boxes snipe 2020-04-27 23:05:04 -07:00
  • b433b49469 Ficing webpack, CSS and JS (*whew* that sucked) snipe 2020-04-27 22:41:33 -07:00
  • 72a1616b3c Removed wonky assets snipe 2020-04-27 21:02:42 -07:00
  • f172747495 Handle parse error in custom fields edit per #7997 snipe 2020-04-27 19:36:07 -07:00
  • 6427f46a6b Removed mix (switched to url()) for now until assets are fixed snipe 2020-04-27 19:35:21 -07:00
  • b76b97d89b Fix path in seeder snipe 2020-04-27 18:17:44 -07:00
  • 6847a331a7 Backport the column icon fix from master snipe 2020-04-24 05:55:38 -07:00
  • 7eb70e17e0 Merge pull request #7993 from snipe/fixes/7989_column_selector snipe 2020-04-24 04:50:37 -07:00