Commit Graph

  • 12450a5c39 Remove duplicate method Manny Dinssa 2024-08-14 09:35:14 +0100
  • 8dc9d18353 Merge remote-tracking branch 'origin/CLDC-2100-delete-merge-request' into CLDC-2100-delete-merge-request Manny Dinssa 2024-08-13 20:30:14 +0100
  • b61b378e4c Remove http method Manny Dinssa 2024-08-13 20:29:18 +0100
  • 7c5ee24f45 Change test Manny Dinssa 2024-08-13 12:42:54 +0100
  • 6315f6ab6e Fix lint offences Manny Dinssa 2024-08-13 12:13:23 +0100
  • 01d7ffe192 Fix tests Manny Dinssa 2024-08-13 12:08:40 +0100
  • c7509d72e0 Fix lint offences Manny Dinssa 2024-08-13 12:03:44 +0100
  • f3543a923a Rebase latest changes to feature Manny Dinssa 2024-08-13 11:24:25 +0100
  • 9e1c706ddb Update tests Manny Dinssa 2024-08-13 17:28:55 +0100
  • 037e6a6b8d Update rails admin Manny Dinssa 2024-08-13 16:41:26 +0100
  • 055bba0f99 Merge remote-tracking branch 'origin/CLDC-3241-Explanation-of-variables-on-CSVs' into CLDC-3241-Explanation-of-variables-on-CSVs Manny Dinssa 2024-08-13 16:38:00 +0100
  • 943bd911c6 Update rails admin Manny Dinssa 2024-08-13 16:37:42 +0100
  • 7362439b50
    Restore merge_request in schema Manny Dinssa 2024-08-13 16:29:59 +0100
  • 329d808a96 Remove user_type attribute and update some definitions Manny Dinssa 2024-08-13 16:25:16 +0100
  • a79112752c Update some definitions Manny Dinssa 2024-08-13 15:19:55 +0100
  • 85bbbe6108
    CLDC-3556: Ignore address data in bulk upload for supported housing logs (#2540) Rachael Booth 2024-08-13 15:11:40 +0100
  • 88b0727609 Add tests Manny Dinssa 2024-08-13 15:00:46 +0100
  • c22a10edf5 Fix lint offence Manny Dinssa 2024-08-13 14:49:00 +0100
  • 518d20042d
    Merge branch 'CLDC-3382-Support-user-functionality-merge-organisations' into CLDC-3588-helpdesk-ticket-question Manny Dinssa 2024-08-13 14:45:59 +0100
  • d4adf57b07 Add requester_id when creating the merge request Manny Dinssa 2024-08-13 14:38:41 +0100
  • 65d8284774 Create helpdesk ticket question Manny Dinssa 2024-08-13 13:30:54 +0100
  • b7bb79e7ef
    CLDC-3586 Update merge date merge request question (#2571) kosiakkatrina 2024-08-13 13:58:57 +0100
  • fb726dedf5 lint Kat 2024-08-13 13:47:57 +0100
  • 01e65617ed Remove unused paths and update merge date Kat 2024-08-13 13:43:11 +0100
  • bede43312c
    CLDC-3584 Update merging orgs question (#2567) kosiakkatrina 2024-08-13 13:39:33 +0100
  • 7b301bbb53 Update routing between CYA and questions Kat 2024-08-13 13:27:12 +0100
  • a872c33c17
    Fix spacing again (#2570) kosiakkatrina 2024-08-13 13:04:07 +0100
  • 230911d1ec Fix spacing again Kat 2024-08-13 12:45:44 +0100
  • 94b28f9d58 Change test Manny Dinssa 2024-08-13 12:42:54 +0100
  • 1fbed4353b Fix lint offences Manny Dinssa 2024-08-13 12:13:23 +0100
  • 3b99ec0518
    Update spacing (#2569) kosiakkatrina 2024-08-13 12:12:20 +0100
  • 7c13c29c38 Fix tests Manny Dinssa 2024-08-13 12:08:40 +0100
  • 730e75bed8
    Merge branch 'main' into NoShAddressSearch Rachael Booth 2024-08-13 12:06:08 +0100
  • 5dd72d8621 Fix lint offences Manny Dinssa 2024-08-13 12:03:44 +0100
  • ca1d212a13 Remove line to delete all from rake Manny Dinssa 2024-08-13 12:02:26 +0100
  • 72890e516e
    CLDC-3564 Update filter search (#2535) kosiakkatrina 2024-08-13 12:01:37 +0100
  • d30132cfeb Update spacing Kat 2024-08-13 11:38:50 +0100
  • 72b48cd05f Update which users we can filter by Kat 2024-08-07 12:51:35 +0100
  • b7b3a5077f Update scheme filters and log scopes Kat 2024-08-06 14:47:21 +0100
  • b8cb938226 User path helper Kat 2024-08-02 12:33:27 +0100
  • 1795316813 Clear free text filters for csv dowloads Kat 2024-07-31 11:45:14 +0100
  • a839232e18 Keep csv filters the same Kat 2024-07-31 11:22:01 +0100
  • 8220797968 Update inner text for filter Kat 2024-07-31 10:40:58 +0100
  • feafa03d2e Update more tests Kat 2024-07-31 10:18:24 +0100
  • a205975a76 lint Kat 2024-07-31 09:58:32 +0100
  • 7ce849a77e Delete a random file 👀 Kat 2024-07-31 09:56:59 +0100
  • 0f15a0c657 fix model test Kat 2024-07-31 09:50:41 +0100
  • 045b30808d Some feature test updates Kat 2024-07-31 09:38:58 +0100
  • 170e46e504 Hide text search input when js is enabled Kat 2024-07-31 09:05:13 +0100
  • 620c9f4c55 Update filter helpers Kat 2024-07-31 08:52:49 +0100
  • 6eb7bba5b6 Add filter_type to method calls Kat 2024-07-30 12:55:41 +0100
  • 6a220950d0 Allow filtering by org without js Kat 2024-07-30 12:25:42 +0100
  • 9e55b87e75 Allow filtering by user without js Kat 2024-07-30 12:25:10 +0100
  • cae1656831 Allow searching organisations Kat 2024-07-29 16:42:26 +0100
  • 0e15aff139 Update search controller Kat 2024-07-29 15:08:58 +0100
  • 72ea5d8480 Explicitly define host in the url Kat 2024-07-29 09:42:17 +0100
  • 6b0bf7561d remove assigned to filter options Kat 2024-07-29 08:25:09 +0100
  • e9a941d652 Update search endpoint Kat 2024-07-26 15:56:09 +0100
  • 19b8c2b691 lint Kat 2024-07-26 14:13:03 +0100
  • 0a5ab7336f Update on confirm Kat 2024-07-26 14:03:18 +0100
  • ac479214fd Add search controller Kat 2024-07-26 08:24:44 +0100
  • 11014452a9 Create delete merge request functionality Manny Dinssa 2024-08-13 11:24:25 +0100
  • b697454015 Update rebase tests Kat 2024-08-13 10:39:47 +0100
  • d0b4fd2f03 Update merging organisations question Kat 2024-08-13 09:02:26 +0100
  • b5e2fecb03
    CLDC 2094: View a merge request (#2565) Manny Dinssa 2024-08-13 10:09:11 +0100
  • 3e1c48dd1d Use merge request organisations association instead of field Manny Dinssa 2024-08-13 09:58:47 +0100
  • 9c3b336c4d Remove show method Manny Dinssa 2024-08-13 09:40:24 +0100
  • e5903c1947
    CLDC-3569 Update guidance for shared ownership without mortgage (#2562) kosiakkatrina 2024-08-13 08:07:36 +0100
  • 4e0275c741 Keep naming for requester/requestor consistent Manny Dinssa 2024-08-12 23:08:58 +0100
  • 05e6ccd894 Update test Manny Dinssa 2024-08-12 23:08:39 +0100
  • 9607393629 Make requestor on the merge request model optional Manny Dinssa 2024-08-12 17:46:32 +0100
  • a6f9b84b2d Fix lint offence Manny Dinssa 2024-08-12 17:29:19 +0100
  • d4b5160b14 Fix lint offence Manny Dinssa 2024-08-12 17:22:07 +0100
  • 2ab18066c6 Change styling Manny Dinssa 2024-08-12 17:14:41 +0100
  • 066cfdfa04 Move table spec to helper Manny Dinssa 2024-08-12 16:58:45 +0100
  • 2c1df66737 Use helper method here also Manny Dinssa 2024-08-12 16:43:10 +0100
  • 0c983b0e67 Refactor dpo_user method and use association to get requestor information Manny Dinssa 2024-08-12 16:31:36 +0100
  • 1adf313958 Update shared ownership guidance Kat 2024-08-12 16:23:56 +0100
  • 743d6a6766 Lowercase status Manny Dinssa 2024-08-12 16:09:25 +0100
  • b261bf8a27 Make the details page the merge requests' show view Manny Dinssa 2024-08-12 16:03:23 +0100
  • e3b6428271 Filter for active DPO users only Manny Dinssa 2024-08-12 15:31:27 +0100
  • dc14d31fb8 Add a placeholder to merge request title Manny Dinssa 2024-08-12 15:23:40 +0100
  • 52ab9d12ad Add change links Manny Dinssa 2024-08-12 15:17:14 +0100
  • 70677735cb Merge branch 'refs/heads/CLDC-3382-Support-user-functionality-merge-organisations' into CLDC-2094-view-a-merge-request Manny Dinssa 2024-08-12 15:07:36 +0100
  • 428700a3b5
    CLDC-3585 Update absorbing organisation question (#2564) kosiakkatrina 2024-08-12 14:38:47 +0100
  • 7682e64493 Fix lint offence Manny Dinssa 2024-08-12 14:31:45 +0100
  • 283f0640a4 Restore hash Manny Dinssa 2024-08-12 14:29:20 +0100
  • 107a03e6a7 Fix lint offence Manny Dinssa 2024-08-12 14:16:39 +0100
  • a006e2852f Fix lint offence Manny Dinssa 2024-08-12 13:59:30 +0100
  • 2c577eb6d4 Add missing text Manny Dinssa 2024-08-12 13:50:13 +0100
  • c07c705b7c Move merge request related views Manny Dinssa 2024-08-12 13:31:44 +0100
  • 3d7d759029 Refactor details view and add tests Manny Dinssa 2024-08-12 13:23:05 +0100
  • c16a6ec07e Update absorbing organisation question and routing Kat 2024-08-12 12:30:41 +0100
  • 8e7395acb3 Add header to mortgage used question Kat 2024-08-12 12:04:08 +0100
  • 410d891618 Create merge requests details page Manny Dinssa 2024-08-09 19:33:26 +0100
  • 790d06ce0b Add missing </div> Manny Dinssa 2024-08-09 19:25:31 +0100
  • b79bc8ce1e Update merge request model Manny Dinssa 2024-08-09 19:24:56 +0100
  • 53ae216bae
    Revert "CLDC-3566: Clear duplicate set ids when a log ceases to be a duplicate through normal update flow (#2534)" (#2563) v0.4.66 kosiakkatrina 2024-08-09 15:59:12 +0100
  • ad7b93c532 Revert "CLDC-3566: Clear duplicate set ids when a log ceases to be a duplicate through normal update flow (#2534)" Kat 2024-08-09 15:17:11 +0100
  • 9f6ecd844c Update user permissions and absorbing org question order Kat 2024-08-09 10:17:55 +0100