Commit Graph

  • 21566560a7 Fixed #17367: Small adjustment to css-padlock snipe 2025-08-18 11:24:05 +01:00
  • 0ecfd02649 Merge remote-tracking branch 'origin/develop' snipe 2025-08-18 11:00:30 +01:00
  • e3ca43bf40 Remove use of formatCurrencyOutput for input display snipe 2025-08-18 11:00:19 +01:00
  • 420aaf4f61 Merge remote-tracking branch 'origin/develop' snipe 2025-08-18 09:45:19 +01:00
  • 61abb8d5cb Fixed hardware.bulkedit redirect snipe 2025-08-18 09:45:02 +01:00
  • 0c35f213e1 Merge remote-tracking branch 'origin/develop' snipe 2025-08-17 14:54:43 +01:00
  • ecad656551 Merge pull request #17626 from grokability/#17606-s3-url-for-models-on-requestable-view snipe 2025-08-17 14:54:13 +01:00
  • 615e6d6e4f Fixes #17606 - use getImageUrl() to determine if local or S3 snipe 2025-08-17 14:51:52 +01:00
  • f68813af13 Merge remote-tracking branch 'origin/develop' snipe 2025-08-17 14:11:41 +01:00
  • 6dceefb96e Merge pull request #17625 from grokability/#17620-delete-method-custom-fields snipe 2025-08-17 14:11:17 +01:00
  • 69eff394fd Removed use statement snipe 2025-08-17 14:06:56 +01:00
  • a9da3aca81 Combine fields and fieldset exception snipe 2025-08-17 14:06:49 +01:00
  • 91f3556375 Added delete test snipe 2025-08-17 13:33:53 +01:00
  • aab7c3a840 Updated custom fields and fieldset pages to use standard delete modal snipe 2025-08-17 13:33:47 +01:00
  • 9c823119e3 Added new factories for user custom field permissions snipe 2025-08-17 13:31:14 +01:00
  • f5128833f6 Updated comments snipe 2025-08-17 13:30:52 +01:00
  • 2bc144354a Use translations and more standard error bag snipe 2025-08-17 13:30:43 +01:00
  • e6fec6ec34 Trim model name for display snipe 2025-08-17 13:30:28 +01:00
  • 37a90d0ce9 Merge remote-tracking branch 'origin/develop' snipe 2025-08-15 15:07:29 +02:00
  • 53389875bf Merge pull request #17611 from grokability/#9965-fallback-to-category-image-for-consumables snipe 2025-08-15 15:07:13 +02:00
  • 3b243b38c8 Fixed #9965 - fallback to category images (f there are any) when no consumable image is present snipe 2025-08-15 15:03:09 +02:00
  • 02f1291e8f Merge remote-tracking branch 'origin/develop' snipe 2025-08-15 14:41:24 +02:00
  • 3d9580808b Merge pull request #17524 from Godmartinz/add-category-and-model-to-checkout-emial snipe 2025-08-15 14:39:58 +02:00
  • 2141ee71d4 Merge pull request #17544 from marcusmoore/fixes/custom-field-filter snipe 2025-08-15 14:39:09 +02:00
  • 01dd07083e Merge pull request #17584 from spencerrlongg/bug/17312-custom-field-checkbox-will-not-clear-if-no-checkboxes-should-be-selected snipe 2025-08-15 14:35:37 +02:00
  • 42a28ea06b Merge pull request #17593 from Godmartinz/add-admin-to-acceptance-emails snipe 2025-08-15 14:33:02 +02:00
  • 92e4f6b5d9 Merge remote-tracking branch 'origin/develop' snipe 2025-08-15 14:31:53 +02:00
  • 180cb6ba8e Merge pull request #17610 from grokability/#17600-add-checkout-date-to-accessory-list snipe 2025-08-15 14:31:38 +02:00
  • a78762e40b Fixed #17600 - adds checkout date to accessories tab in user view snipe 2025-08-15 14:29:55 +02:00
  • 7b7738fbcc Merge remote-tracking branch 'origin/develop' snipe 2025-08-15 14:24:30 +02:00
  • 9797bb19e2 Updated dev assets snipe 2025-08-15 14:23:22 +02:00
  • 3101212c49 Continue to scaffold test Marcus Moore 2025-08-14 17:24:36 -07:00
  • 3f0ac103a1 Scaffold test Marcus Moore 2025-08-14 13:29:18 -07:00
  • 59bd6ca360 Update button text Marcus Moore 2025-08-14 13:21:11 -07:00
  • 22fe9a786e Display number of items being accepted Marcus Moore 2025-08-14 12:36:46 -07:00
  • 08a9554b3c Merge pull request #17607 from Godmartinz/color-corrections-pt9000 snipe 2025-08-14 20:39:26 +02:00
  • d79bd825ee fix popover text color Godfrey M 2025-08-14 10:51:31 -07:00
  • fe3d225cfa fix tests Godfrey M 2025-08-14 09:15:19 -07:00
  • 31197604a3 Merge pull request #17602 from grokability/develop snipe 2025-08-13 21:19:39 +02:00
  • d2ee8de9ac Attach qty to CheckoutAcceptance Marcus Moore 2025-08-13 12:14:10 -07:00
  • 03d3fb6a5f Add qty to checkout_acceptances table Marcus Moore 2025-08-13 12:09:56 -07:00
  • 376e0db66e Merge pull request #17601 from ubc-cpsc/bugfix/CVE-2025-55166 snipe 2025-08-13 20:49:41 +02:00
  • 5fdabc1a62 Fixes CVE-2025-55166 Joël Pittet 2025-08-13 11:42:14 -07:00
  • dfe2a75d72 adds user that checked out item to acceptance emails Godfrey M 2025-08-12 15:34:46 -07:00
  • ba85af11aa adds serial to expiring assets report email Godfrey M 2025-08-12 14:59:20 -07:00
  • db58b80d27 Merge branch 'develop' into add-category-and-model-to-checkout-emial Godfrey M 2025-08-12 14:20:08 -07:00
  • 5cb8aae383 add ternaries Godfrey M 2025-08-12 14:16:46 -07:00
  • 817530429b added condition to make sure the request has checkbox spencerrlongg 2025-08-12 14:52:52 -05:00
  • e33b1b6c90 fixed maintenances spencerrlongg 2025-08-12 13:34:40 -05:00
  • 30520297e8 Merge branch 'develop' into feature/8709-bulk-deletion-of-asset-categories-suppliers-manufacturers Spencer Long 2025-08-12 11:58:11 -06:00
  • 78ca1d1335 some cleanup spencerrlongg 2025-08-11 21:07:08 -05:00
  • 6159ee8c2c category done! spencerrlongg 2025-08-11 20:16:43 -05:00
  • 5cd5392958 manufacturer completed, just categories left spencerrlongg 2025-08-11 19:42:09 -05:00
  • 0dcdfc5d14 fix tests after routing change spencerrlongg 2025-08-11 19:11:40 -05:00
  • d0e068f1c0 suppliers completely done, rinse and repeat for the other two spencerrlongg 2025-08-11 19:04:36 -05:00
  • 4a7b7183d2 Add custom_fields. prefix so custom fields can be filtered against Marcus Moore 2025-08-11 14:58:41 -07:00
  • f42a2d7457 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 20:45:38 +01:00
  • 94bd39cf23 Merge pull request #17570 from grokability/#10038-add-active-flag-filter snipe 2025-08-11 20:45:22 +01:00
  • 4038a22093 Added sidenav to filter on activated vs inactive users snipe 2025-08-11 20:41:55 +01:00
  • d29619b67c Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 18:50:17 +01:00
  • 682baec0c9 Merge pull request #17569 from grokability/#10284-add-mobile-number snipe 2025-08-11 18:49:49 +01:00
  • ff91be491d Added mobile to tests snipe 2025-08-11 18:43:37 +01:00
  • ef35a0f2f1 Fixed #10284: Added mobile phone to users snipe 2025-08-11 18:38:22 +01:00
  • f5235cb835 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 18:12:51 +01:00
  • f12a3bb08b Fixed #10306 - cast purchase cost to a float snipe 2025-08-11 18:12:37 +01:00
  • ee830e0cb4 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 14:58:57 +01:00
  • c8a5065ffa Merge pull request #17567 from grokability/#11754-nicer-menu-alignment snipe 2025-08-11 14:57:59 +01:00
  • 23da5573f3 Fixed #11754 - nicer top menu dropdown alignment snipe 2025-08-11 14:56:43 +01:00
  • b08f985776 Merge pull request #17566 from grokability/partial-fix-for-#17565-standard-layout snipe 2025-08-11 14:17:59 +01:00
  • 9b968baaa7 Show all icons, even if no results snipe 2025-08-11 14:14:15 +01:00
  • 07edbe6f1c Add @mckaygerhard as a contributor snipe 2025-08-11 13:08:54 +01:00
  • 0cd3be003d Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 13:07:00 +01:00
  • 1f55a8b6e3 Added icon and tooltip snipe 2025-08-11 13:06:34 +01:00
  • f6b9e11810 Merge pull request #17538 from mckaygerhard/mail-log-improvements snipe 2025-08-11 13:05:56 +01:00
  • c93e35ec77 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 11:18:31 +01:00
  • c18a3e4266 Fixed #17562 - bootstrap table formater undefined snipe 2025-08-11 11:18:20 +01:00
  • 9538a76232 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 06:26:29 +01:00
  • 5840ef1c6f Fixed #17560 snipe 2025-08-11 06:26:15 +01:00
  • 7974baddf5 Merge pull request #17551 from grokability/move-file-uploads-paths-to-base-controller snipe 2025-08-11 05:44:39 +01:00
  • 05876bb124 Merge remote-tracking branch 'origin/develop' snipe 2025-08-11 05:05:13 +01:00
  • 4bf569758f Cleans up a few rmore outes snipe 2025-08-11 05:05:00 +01:00
  • 8bcd5a6d2a Merge remote-tracking branch 'origin/develop' snipe 2025-08-10 21:04:55 +01:00
  • f56fd9bb0b Bumped hash snipe 2025-08-10 21:04:33 +01:00
  • a36afbcb25 Merge remote-tracking branch 'origin/develop' snipe 2025-08-10 21:02:48 +01:00
  • 357ee5fc45 Copy over the old dirs just in case snipe 2025-08-10 21:02:37 +01:00
  • ebd8d085cf Merge remote-tracking branch 'origin/develop' snipe 2025-08-10 21:01:34 +01:00
  • c6dea085b2 Missed a few snipe 2025-08-10 21:01:23 +01:00
  • 505148b024 Merge remote-tracking branch 'origin/develop' snipe 2025-08-10 20:51:27 +01:00
  • 8782c3ecec Merge pull request #17554 from grokability/#13997-add-ldap-sync-via-api snipe 2025-08-10 20:30:44 +01:00
  • b636cf2ef0 Merge pull request #17555 from grokability/#17490-use-numeric-for-purchase-cost snipe 2025-08-10 20:30:15 +01:00
  • 6dee2b8601 Fixed 17490 - currency symbol breaks purchase_cost snipe 2025-08-10 19:04:52 +01:00
  • bcf301ac17 Adds #13997 - API endpoint to sync users via LDAP snipe 2025-08-10 18:48:01 +01:00
  • bf2120fb31 Use newer file path snipe 2025-08-10 18:26:41 +01:00
  • de56b74f3e Merge branch 'develop' into move-file-uploads-paths-to-base-controller snipe 2025-08-10 18:25:47 +01:00
  • 2f146abe91 Let people upload images on the demo snipe 2025-08-10 18:20:35 +01:00
  • 543d41b6ff Merge pull request #17553 from grokability/#17547-asset-model-images-not-loading snipe 2025-08-10 18:15:57 +01:00
  • 8da0dd7563 Use strtolower snipe 2025-08-10 18:11:39 +01:00
  • a2217d7dbc Specify the public disk for creating directories snipe 2025-08-10 18:08:15 +01:00
  • ea84728a3f Rename models uploads dir snipe 2025-08-10 17:58:11 +01:00
  • b2d10f7ccf Rename directory snipe 2025-08-10 17:56:59 +01:00