Commit Graph

  • e9a1ac2018 Fixed bug preventing admin leaving organisation bwilliams 2022-02-17 18:35:54 +00:00
  • 2da722f84e Fix member count column wrapping wierdly bwilliams 2022-02-15 17:59:09 +00:00
  • 275dd757b6 Change "pending" organisation registrations to yellow (amber) instead of red bwilliams 2022-02-15 17:58:49 +00:00
  • 0145296493 Fixed showing pending join requests in "My Organisations" menu bwilliams 2022-02-15 17:57:57 +00:00
  • 2ba0257b6e Add a new twig function for checking if a user is an organisation registrant (the only one able to cancel a register request) bwilliams 2022-02-15 17:57:36 +00:00
  • 108a34481e Fixed is_member access right from granting pending members permission bwilliams 2022-02-15 17:56:26 +00:00
  • 5c8cf6778c Fixed permission for org admins to accept/reject join requests bwilliams 2022-02-15 17:55:57 +00:00
  • 2dbd11ef28 Refactored the organisation members controller - includes a permissions fix bwilliams 2022-02-15 17:43:24 +00:00
  • 800ac93ecf Fixed organisation approve authorisations & redirects bwilliams 2022-02-15 17:31:58 +00:00
  • 64971d6262 Change leave redirect to organisations list page if access is granted, dashboard if otherwise bwilliams 2022-02-15 17:31:29 +00:00
  • b042402681 Fixed missing class error bwilliams 2022-02-15 17:10:38 +00:00
  • e63b03fb2b Don't show organisations pending a join request in the navbar bwilliams 2022-02-15 17:01:41 +00:00
  • 77da13e0a0 Fixed button states bwilliams 2022-02-15 16:58:39 +00:00
  • 3735e1e9ce Added functionality to join organisations and the optional approval process bwilliams 2022-02-15 16:53:23 +00:00
  • 130c5ec9bb Added buttons to join/leave organisations (no functionality yet) bwilliams 2022-02-15 16:52:00 +00:00
  • e2180ddff3 Tweaked the organisations fields to change how is_member behaves and added an is_pending bwilliams 2022-02-15 16:40:10 +00:00
  • 7e2a6d1379 Created requested, accepted and rejected email templates for requests bwilliams 2022-02-15 16:37:22 +00:00
  • 8d762c5dca Created a membership approval token repository and required token table & model bwilliams 2022-02-15 16:36:54 +00:00
  • 6039574d79 Add a mapping model which can be used as an owner for approval tokens bwilliams 2022-02-15 16:31:09 +00:00
  • 62cc5713f7 Add an approved flag to the organisation members map table (pending "join organisation" workflow) bwilliams 2022-02-15 16:26:06 +00:00
  • 8dc120ae15 Change actions button depending on site/orgs admin vs organisation administrator bwilliams 2022-02-15 15:50:42 +00:00
  • a02b4b52a0 Added foreign key to registrant_id bwilliams 2022-02-15 15:50:01 +00:00
  • abe208bc50 Fixed nulled organisation name bwilliams 2022-02-15 15:49:47 +00:00
  • d31bdd9970 Fixed backwards logic of cancellation requests bwilliams 2022-02-15 15:47:01 +00:00
  • cd8a16f4a8 Revamped the organisation approvals process & refactored some files bwilliams 2022-02-15 15:26:56 +00:00
  • e029728d69 Allow reverting a completed token to an un-complete state (undo "deny" scenario) bwilliams 2022-02-15 14:56:45 +00:00
  • 6cb5d759b4 Fixed the flag_approved down migration bwilliams 2022-02-15 12:53:50 +00:00
  • 091febf255 Created an implementation of a token repository that isn't restricted to users and can be re-used for other objects. bwilliams 2022-02-15 12:53:31 +00:00
  • 512e13f57e Fix leave organisation uri bwilliams 2022-02-14 14:26:29 +00:00
  • 8b17d63d95 Fixed typo and missing tag in email bwilliams 2022-02-11 13:39:42 +00:00
  • f4fba338c5 When restoring an organisation that was rejected, revert the approval request as well bwilliams 2022-02-11 13:38:24 +00:00
  • 016f7489c4 Change language from Reject to Deny bwilliams 2022-02-11 13:37:55 +00:00
  • da89a688b9 Replaced generic with an even more generic bwilliams 2022-02-11 12:51:45 +00:00
  • cd947ba161 Jiggled the config file a little bit bwilliams 2022-02-11 11:17:59 +00:00
  • 253d77668b Refactored organisation approval class to a base model which will soon be included in a membership approval class bwilliams 2022-02-11 11:17:05 +00:00
  • ea0999b1fa Fixed incorrect table name in migration bwilliams 2022-02-11 10:56:37 +00:00
  • f530c85964 Even more permission lockdowns bwilliams 2022-02-11 09:36:45 +00:00
  • c6c69b773b Fix twig functions (master overrides permission) bwilliams 2022-02-10 18:14:54 +00:00
  • 575aa68bca Tighten some more permissions down bwilliams 2022-02-10 18:11:42 +00:00
  • 909b6a93dc Tighten some edit permissions on organisations bwilliams 2022-02-10 17:54:56 +00:00
  • d00694f9cb Hide slug from non-admin editers bwilliams 2022-02-10 17:54:36 +00:00
  • 95f198487a Fixed cancel registration uri bwilliams 2022-02-10 17:54:25 +00:00
  • 005739e51b Fixed broken member/admin counts on organisation page bwilliams 2022-02-10 17:22:34 +00:00
  • 4d57f6d33e Allow non-admin users to see the organisations list (required for easier "Join" and "Register" requests). Filter the list to approved or memberOf organisations only. bwilliams 2022-02-10 17:19:47 +00:00
  • c3e7c24e6d Add a scope to the organisation model to include if the currentUser is a member or admin of which organisations (null indicates not a member nor an admin) bwilliams 2022-02-10 17:18:06 +00:00
  • f2c6677dc1 Order the user model's organisations alphabetically by default (this may break any other orderBy's) bwilliams 2022-02-10 17:17:04 +00:00
  • 97300ab8a5 Optimised Organisation model to prevent it running 4 extra queries per instance bwilliams 2022-02-10 16:45:10 +00:00
  • 1f0a47b244 Changed iconography on the organisations page bwilliams 2022-02-10 15:53:18 +00:00
  • 57dfed304f Added functionality to permenently delete or restore deleted organisations bwilliams 2022-02-10 15:52:57 +00:00
  • c3cf97ea50 Re-jigged some of the registration routes and modified the buttons/links to use them bwilliams 2022-02-10 14:52:48 +00:00
  • 7c319873b1 Add activity log messages for organisation approval workflow bwilliams 2022-02-10 14:45:07 +00:00
  • 01d4fdfa0b Fixed links in the registration request email bwilliams 2022-02-10 13:53:18 +00:00
  • 59c970ad4f Re-indent translations bwilliams 2022-02-10 13:02:09 +00:00
  • c2717be73b Added missing translation message bwilliams 2022-02-10 13:02:01 +00:00
  • b64b4d72f9 Organisation registration process implemented with configurable approval workflow bwilliams 2022-02-10 13:00:51 +00:00
  • fade1f8441 Created some twig extensions for checking membership using the new authorization manager callbacks bwilliams 2022-02-10 12:56:18 +00:00
  • 99add37bdd Replace the base authorization manager with an extended one with a runCallback method bwilliams 2022-02-10 12:55:23 +00:00
  • 6570f2fb27 Added an approved flag to organisations with a status column as an indicator, pending registration/approval workflow bwilliams 2022-02-10 12:51:29 +00:00
  • a42b04f518 Fixed organisation sprunje name bwilliams 2022-02-10 12:33:49 +00:00
  • a15482b71a Fixed the leave button data-slug parameter missing bwilliams 2022-02-10 12:32:22 +00:00
  • ca4eb434ad Added missing dependencies to the OrgMembers migration bwilliams 2022-02-10 12:31:03 +00:00
  • dbef49ed6e Fixed the route name for the organisation page bwilliams 2022-02-10 12:29:43 +00:00
  • 9d84dcec67 Fixed users being duplicated if they already existed in a target group during a merge bwilliams 2022-02-10 10:30:31 +00:00
  • 711968df08 Allow members to leave organisations bwilliams 2022-02-09 12:34:30 +00:00
  • 00128aff5d Because organisations are soft deleted, remove the "cannot undo" message on delete confirm bwilliams 2022-02-09 11:28:43 +00:00
  • 2b25f390d7 Hard delete merged organisations bwilliams 2022-02-09 11:02:22 +00:00
  • 27eb4ef754 Fix multiple rows per user appearing when using filters/sorts bwilliams 2022-02-08 18:10:37 +00:00
  • 9d62749914 Provide ability for admins to manage user organisation membership & admin rights - Required overwriting a bunch of base code to slot in the handling - Admins are shown with yellow text in their organisation label bwilliams 2022-02-08 18:10:20 +00:00
  • 609454def2 Fixed bug with initial sidebar state unknown bwilliams 2022-02-08 16:32:42 +00:00
  • c9a0368642 Change organisations icon to differ from groups bwilliams 2022-02-08 16:17:21 +00:00
  • b3c51527a0 Allow users to see their own organisation pages bwilliams 2022-02-08 16:13:43 +00:00
  • 2d701760c3 Added permission for organisations admin to see individual organisations pages bwilliams 2022-02-08 09:48:23 +00:00
  • 8b2089fede Updated viewable and editable organisation fields bwilliams 2022-02-08 09:47:43 +00:00
  • 9345bed087 Fixed missing apostrophe in seed condition bwilliams 2022-02-08 09:43:50 +00:00
  • 76442dbd4c Fixed organisation permission seeds & added an organisations admin role bwilliams 2022-02-08 09:36:06 +00:00
  • 4bd115ba4d Fixed merge_organisations permission check bwilliams 2022-02-08 09:34:26 +00:00
  • 19afb760a1 Fix handling of existing organisation name/slug clashes bwilliams 2022-02-08 09:34:09 +00:00
  • 7353801ca9 Organisations are now soft-deleted bwilliams 2022-02-08 09:33:40 +00:00
  • 9e23fdfdae Merge branch 'refs/heads/hotfix' bwilliams 2022-02-07 16:24:32 +00:00
  • 693b560352 Fixed missing reference bwilliams 2022-02-07 16:24:27 +00:00
  • 28255e315a Added capability to merge organisations - Added an interface for organisation - Added beforeDelete and beforeMerge callbacks - Added hard/soft delete to organisations bwilliams 2022-02-07 16:20:30 +00:00
  • b6edcf03e8 Update the member count column to exclude admins rather than include bwilliams 2022-02-07 15:21:50 +00:00
  • ae0c884e44 Split organisation member management out of the organisation controller into a sub-controller bwilliams 2022-02-07 12:04:10 +00:00
  • feaf3d5813 Added organisation information page bwilliams 2022-02-07 11:23:32 +00:00
  • 1edd850170 Added organisation members table & associated table column data bwilliams 2022-02-04 13:58:44 +00:00
  • 830a1b49a8 Update organisation functionality bwilliams 2022-02-04 12:36:47 +00:00
  • 2cf2777494 Delete organisation functionality bwilliams 2022-02-04 11:42:43 +00:00
  • f850e4cace Create organisation functionality bwilliams 2022-02-04 11:23:48 +00:00
  • 584aa1909e List existing organisations bwilliams 2022-01-21 10:56:43 +00:00
  • c26c65fa8c Bootstrapper class bwilliams 2021-12-20 15:51:00 +00:00
  • 01fd21537f Composer file bwilliams 2021-12-20 15:50:13 +00:00
  • cf3d9a2add Renamed license file bwilliams 2021-12-20 15:48:16 +00:00
  • a38e02f596 Initial commit bwilliams 2021-12-20 12:43:53 +00:00