Commit graph

Select branches

Hide pull requests

td_dev

Mono Color

• 9d609805f2 Merge remote-tracking branch 'origin/develop' snipe 2025-04-02 18:33:48 +01:00
• df1c7c4f95
  Merge pull request #16609 from snipe/login_throttle_update snipe 2025-04-02 18:28:34 +01:00
• 7120b19d3b Fixed namespace snipe 2025-04-02 18:24:27 +01:00
• e2b9ca8254 Merge remote-tracking branch 'origin/develop' snipe 2025-04-02 14:03:22 +01:00
• 2197b46658 Link to admin user snipe 2025-04-02 14:03:09 +01:00
• e16a2fe8af Merge remote-tracking branch 'origin/develop' snipe 2025-04-02 13:51:09 +01:00
• 785f576b19
  Merge pull request #16621 from snipe/add_notes_to_location_sidebar snipe 2025-04-02 13:27:48 +01:00
• 31e337255a Use adminuser instead of created_by snipe 2025-04-02 13:26:12 +01:00
• f12d173581 Fixed #16618 - added notes to location sidebar snipe 2025-04-02 13:23:33 +01:00
• 22d61a533d Merge remote-tracking branch 'origin/develop' snipe 2025-04-02 12:50:35 +01:00
• eb3dbb8c7a Bumped hash snipe 2025-04-02 12:49:53 +01:00
• ed908be2eb
  Merge pull request #16620 from snipe/#16619_fix_accessory_clone_population snipe 2025-04-02 12:48:25 +01:00
• e215c5f9ee Fixed #16619 - accesory clone snipe 2025-04-02 12:43:42 +01:00
• 78f3c879ff
  Merge pull request #16617 from snipe/add_pdf_logo_upload snipe 2025-04-02 12:22:43 +01:00
• cb59c23f0b Added pdf logo to the blade snipe 2025-04-02 12:13:34 +01:00
• d0f750edea Added pdf logo to the controller snipe 2025-04-02 12:13:28 +01:00
• 56ae9d0ba9 Nicer upload logo labels snipe 2025-04-02 12:10:27 +01:00
• 15917d5f99 Use new logo snipe 2025-04-02 12:10:14 +01:00
• a59d69cb0d Updated strings snipe 2025-04-02 12:10:05 +01:00
• 97cba45509 Added migration snipe 2025-04-02 12:09:57 +01:00
• 365ce34940
  Merge pull request #16613 from marcusmoore/chore/update-rollbar snipe 2025-04-02 10:48:51 +01:00
• 7048eceb9d
  Update rollbar/rollbar-laravel Marcus Moore 2025-04-01 16:05:32 -07:00
• af408bb45f Merge remote-tracking branch 'origin/develop' snipe 2025-04-01 21:33:07 +01:00
• 9d61234f0c
  Merge pull request #16612 from snipe/re-fix_db_dump_ssl_fix snipe 2025-04-01 21:32:15 +01:00
• bef650757d Fixes #16610, regression in #16543 snipe 2025-04-01 21:25:35 +01:00
• 24bfbc06f0 Merge remote-tracking branch 'origin/develop' snipe 2025-04-01 19:40:03 +01:00
• cb6e7f7b6e
  Merge pull request #16561 from spencerrlongg/bug/api_get_by_serial_add_pagination snipe 2025-04-01 19:26:28 +01:00
• c305284930
  Merge pull request #15922 from spencerrlongg/feature/sc-24347 snipe 2025-04-01 18:15:42 +01:00
• 6c47f1c07f Added test snipe 2025-04-01 17:44:44 +01:00
• 5d265f5bfd Change to minutes snipe 2025-04-01 15:01:34 +01:00
• daaad4fe9d Removed unneeded strings snipe 2025-04-01 14:36:53 +01:00
• 40ae5d421b Updated maxLoginAttempts and throttle duration snipe 2025-04-01 14:36:45 +01:00
• 5eb9f353b5 Merge remote-tracking branch 'origin/develop' snipe 2025-04-01 11:25:33 +01:00
• d96498ab1f this is a redo after a borked rebase akemidx 2025-03-31 18:33:20 -04:00
• bfd827e529 added more eager loading spencerrlongg 2025-03-31 12:28:03 -05:00
• d95549bbcf
  Merge pull request #16594 from uberbrady/fix_consumable_model_copy snipe 2025-03-31 18:26:46 +01:00
• e10071a68e
  Merge pull request #16595 from uberbrady/fix_whitespace_encrypted_custom_fields_display snipe 2025-03-31 18:25:13 +01:00
• 92a77afd0b Fixes the clipboard button copying whitespace at the end of custom fields Brady Wetherington 2025-03-31 13:55:38 +01:00
• 1369b993a4 Fix JS copy-to-clipboard for consumable model_num Brady Wetherington 2025-03-31 13:13:37 +01:00
• 382414df98
  Merge pull request #16559 from Godmartinz/StoreLabelSettings_fix snipe 2025-03-31 12:39:08 +01:00
• 6846c7d510
  Merge pull request #16536 from akemidx/moving_warranty_info snipe 2025-03-31 12:35:32 +01:00
• 1d3069fe84
  Merge pull request #16540 from marcusmoore/bug/sc-28607 snipe 2025-03-31 12:34:22 +01:00
• 13940071a9
  Merge pull request #16546 from marcusmoore/bug/sc-28024 snipe 2025-03-31 12:32:50 +01:00
• 6870698cdc Add @ntaylor-86 as a contributor snipe 2025-03-31 12:32:25 +01:00
• 4aa13c8dd4
  Merge pull request #16543 from ntaylor-86/fixes/laravel-backup-ssl-error snipe 2025-03-31 12:32:00 +01:00
• 44db2dc78e
  Merge pull request #16520 from marcusmoore/bug/sc-28673 snipe 2025-03-31 12:31:12 +01:00
• 2e17e80ea9 [Snyk] Upgrade acorn from 8.14.0 to 8.14.1 #16587 snipe 2025-03-31 12:30:09 +01:00
• 836d7ca8f9 [Snyk] Upgrade bootstrap-table from 1.24.0 to 1.24.1 #16588 snipe 2025-03-31 12:29:00 +01:00
• 18e6a18389
  Merge pull request #16576 from marcusmoore/fixes/api_company_note snipe 2025-03-31 12:20:36 +01:00
• 1dd050ac0f
  Merge pull request #16577 from marcusmoore/tests/login-logging snipe 2025-03-29 23:30:05 -01:00
• b8b0e3200e
  Add tests around loggin login attempts Marcus Moore 2025-03-27 17:27:28 -07:00
• bc77c8c885
  Add notes to $fillable Marcus Moore 2025-03-27 10:57:34 -07:00
• c095f330e1
  Add failing tests Marcus Moore 2025-03-27 10:56:33 -07:00
• e0e08f284e
  Add tests for creating and patching companies via api Marcus Moore 2025-03-27 10:54:42 -07:00
• e273c7cbc5 Refactor asset retrieval to support pagination. spencerrlongg 2025-03-25 15:21:18 -05:00
• d28cc024cf add DefaultLabel if no label2_template is selected Godfrey M 2025-03-25 12:40:23 -07:00
• 168a3df157 Fix condition in statusMeta for correct property check spencerrlongg 2025-03-25 14:39:51 -05:00
• ac597b517b
  Remove blank line Marcus Moore 2025-03-24 12:39:17 -07:00
• ac56640d40
  Spilt test scenarios Marcus Moore 2025-03-20 16:21:42 -07:00
• ce585539aa
  Improve test name Marcus Moore 2025-03-20 16:13:13 -07:00
• 2cfff8e07c
  Formatting Marcus Moore 2025-03-20 16:12:31 -07:00
• 0ceda098ff
  Spilt test scenarios Marcus Moore 2025-03-20 16:10:01 -07:00
• db81209fe1
  Organize existing tests Marcus Moore 2025-03-20 16:01:28 -07:00
• 02f109c3b5
  Include input when redirecting back Marcus Moore 2025-03-20 14:04:19 -07:00
• 0ed0a7f9f3
  Avoid sending emails for asset checkouts that failed Marcus Moore 2025-03-20 14:01:48 -07:00
• b721b7d9c9
  Add tests Marcus Moore 2025-03-20 13:57:42 -07:00
• 976b3dc5ae
  Improve test case Marcus Moore 2025-03-20 13:38:12 -07:00
• 2d3514bbf8
  Merge pull request #16545 from Godmartinz/activity_report_column_name_fix snipe 2025-03-20 19:37:42 -01:00
• 5dcd4b2942
  Return valid error message Marcus Moore 2025-03-20 13:26:27 -07:00
• d645b42e12
  Add failing test Marcus Moore 2025-03-20 13:26:06 -07:00
• 0ad985cbcd change translation Godfrey M 2025-03-20 12:40:46 -07:00
• ad5099fac9 added .env variable to the other .env files ntaylor-86 2025-03-20 23:27:29 +10:00
• 32736e2f74 added .env variable and database config to skip ssl for DB DUMP ntaylor-86 2025-03-20 23:06:15 +10:00
• cef83ad652
  Avoid hard failure on missing accessory in location transformer Marcus Moore 2025-03-19 14:11:47 -07:00
• e6ccff103f
  Add simple null check to avoid attempting to transform missing relationship Marcus Moore 2025-03-19 12:52:01 -07:00
• 5944034b8b moving warranty/depreciation to be with the other cost/eol values akemidx 2025-03-19 15:22:09 -04:00
• 473ce15f47
  Merge pull request #16526 from snipe/develop snipe 2025-03-19 15:31:50 -01:00
• 881cde4d98 change namesspaces and use create instead of make Godfrey M 2025-03-18 14:18:49 -07:00
• e408b902f0 removing depreciation from purchase cost (unneeded, should go elsewhere if wanted) akemidx 2025-03-18 16:38:44 -04:00
• a398c4ab84 reset akemidx 2025-03-18 16:37:27 -04:00
• 27417cdec7 removing depreciation logic (unneeded for purchase cost) akemidx 2025-03-18 16:36:36 -04:00
• bf3837c49d add checkin test for api Godfrey M 2025-03-18 12:54:03 -07:00
• 66fd46fe75 add checkout test for api Godfrey M 2025-03-18 12:46:56 -07:00
• 29cbf43d68 remove duplicate table class div Godfrey M 2025-03-18 11:48:09 -07:00
• 07096c8a31 rename note to notes Godfrey M 2025-03-18 10:37:00 -07:00
• cbc6c2754c add notes as fillable to license seat model Godfrey M 2025-03-18 10:27:56 -07:00
• 711235f49c
  Merge pull request #16519 from marcusmoore/bug/sc-28696 Jermops 2025-03-18 09:15:41 -07:00
• 3d2d7684aa Add console command to disable SAML logins Jeremy Price 2025-03-17 19:58:21 -07:00
• 9aede45918
  Remove unneeded eager loads Marcus Moore 2025-03-17 14:43:23 -07:00
• b26a73e385
  Filter out empty email address in alerts Marcus Moore 2025-03-17 12:30:15 -07:00
• 650839b68a
  Update command name Marcus Moore 2025-03-12 17:05:16 -07:00
• 388dc23241
  Add comments Marcus Moore 2025-03-12 17:02:05 -07:00
• 32b194ddc7
  Update description Marcus Moore 2025-03-12 16:44:37 -07:00
• 9cea6cee26
  Docblock Marcus Moore 2025-03-12 16:42:50 -07:00
• 73f64c53b1
  Skip logs where created_by cannot be set Marcus Moore 2025-03-12 16:42:39 -07:00
• 2091f66f5b
  Reorganize Marcus Moore 2025-03-12 16:30:36 -07:00
• c711278b8b
  Merge pull request #16486 from marcusmoore/bug/sc-28639 snipe 2025-03-12 23:26:08 +00:00
• eb9cfbaed6
  Merge pull request #16498 from snipe/develop snipe 2025-03-12 23:23:44 +00:00
• ff637f1926
  Merge pull request #16497 from marcusmoore/fixes/diff-in snipe 2025-03-12 23:17:48 +00:00
• 4d978e0fc6
  Fix eol rate in upcoming audit notification Marcus Moore 2025-03-12 16:04:16 -07:00