Commit Graph

52 Commits

Author SHA1 Message Date
0dbfbef594 Added capability for organisation administrators to accept/reject join requests, remove members, edit their details and reset their passwords 2022-02-22 18:11:59 +00:00
3490f7c6f1 Removed table specific id string part and replaced it with the provided {{table.id}} 2022-02-22 15:29:11 +00:00
f75bde0ccf Sorting by organisation on the users page is a bit broken because of the way the join is done so don't offer the capability to do it in the first place... 2022-02-22 13:53:26 +00:00
96e861e7fe Hide some administration columns for basic organisation users (Fixes #3) 2022-02-22 13:52:53 +00:00
0d5551f927 Fix the user-manage-organisations modal (column name & search) 2022-02-22 13:48:20 +00:00
be8404c9a5 Split pending organisations into a separate list and default to only returning organisations a user is an accepted member of (Fixes #1) 2022-02-22 13:47:44 +00:00
5f8e922438 Changed the styling of organisation labels (Fixes #5)
- Admins are green
- Members are white
- Pending members are yellow
- Pending organisations are grey background
2022-02-22 11:25:32 +00:00
e92b80fbe1 Prevent users from creating more than 1 or being a member of more than 1 organisation in single organisation configuration (Fixes #7) 2022-02-22 11:02:16 +00:00
16555bfafb Missed a blockier templates extension 2022-02-22 11:01:12 +00:00
e58f514896 Use blockier-templates 2022-02-21 16:13:28 +00:00
77d283f0c1 Add some blocks to make extending easier 2022-02-17 18:43:20 +00:00
23e6608af3 Fixed some text in membership emails 2022-02-17 18:36:48 +00:00
2da722f84e Fix member count column wrapping wierdly 2022-02-15 17:59:09 +00:00
275dd757b6 Change "pending" organisation registrations to yellow (amber) instead of red 2022-02-15 17:58:49 +00:00
0145296493 Fixed showing pending join requests in "My Organisations" menu 2022-02-15 17:57:57 +00:00
e63b03fb2b Don't show organisations pending a join request in the navbar 2022-02-15 17:01:41 +00:00
77da13e0a0 Fixed button states 2022-02-15 16:58:39 +00:00
3735e1e9ce Added functionality to join organisations and the optional approval process 2022-02-15 16:53:23 +00:00
130c5ec9bb Added buttons to join/leave organisations (no functionality yet) 2022-02-15 16:52:00 +00:00
7e2a6d1379 Created requested, accepted and rejected email templates for requests 2022-02-15 16:37:22 +00:00
8dc120ae15 Change actions button depending on site/orgs admin vs organisation administrator 2022-02-15 15:50:42 +00:00
512e13f57e Fix leave organisation uri 2022-02-14 14:26:29 +00:00
8b17d63d95 Fixed typo and missing tag in email 2022-02-11 13:39:42 +00:00
016f7489c4 Change language from Reject to Deny 2022-02-11 13:37:55 +00:00
da89a688b9 Replaced generic with an even more generic 2022-02-11 12:51:45 +00:00
f530c85964 Even more permission lockdowns 2022-02-11 09:36:45 +00:00
c6c69b773b Fix twig functions (master overrides permission) 2022-02-10 18:14:54 +00:00
575aa68bca Tighten some more permissions down 2022-02-10 18:11:42 +00:00
909b6a93dc Tighten some edit permissions on organisations 2022-02-10 17:54:56 +00:00
005739e51b Fixed broken member/admin counts on organisation page 2022-02-10 17:22:34 +00:00
1f0a47b244 Changed iconography on the organisations page 2022-02-10 15:53:18 +00:00
57dfed304f Added functionality to permenently delete or restore deleted organisations 2022-02-10 15:52:57 +00:00
c3cf97ea50 Re-jigged some of the registration routes and modified the buttons/links to use them 2022-02-10 14:52:48 +00:00
01d4fdfa0b Fixed links in the registration request email 2022-02-10 13:53:18 +00:00
b64b4d72f9 Organisation registration process implemented with configurable approval workflow 2022-02-10 13:00:51 +00:00
6570f2fb27 Added an approved flag to organisations with a status column as an indicator, pending registration/approval workflow 2022-02-10 12:51:29 +00:00
a15482b71a Fixed the leave button data-slug parameter missing 2022-02-10 12:32:22 +00:00
711968df08 Allow members to leave organisations 2022-02-09 12:34:30 +00:00
00128aff5d Because organisations are soft deleted, remove the "cannot undo" message on delete confirm 2022-02-09 11:28:43 +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
2022-02-08 18:10:20 +00:00
c9a0368642 Change organisations icon to differ from groups 2022-02-08 16:17:21 +00:00
b3c51527a0 Allow users to see their own organisation pages 2022-02-08 16:13:43 +00:00
9e23fdfdae Merge branch 'refs/heads/hotfix' 2022-02-07 16:24:32 +00:00
693b560352 Fixed missing reference 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
2022-02-07 16:20:30 +00:00
b6edcf03e8 Update the member count column to exclude admins rather than include 2022-02-07 15:21:50 +00:00
feaf3d5813 Added organisation information page 2022-02-07 11:23:32 +00:00
1edd850170 Added organisation members table & associated table column data 2022-02-04 13:58:44 +00:00
830a1b49a8 Update organisation functionality 2022-02-04 12:36:47 +00:00
2cf2777494 Delete organisation functionality 2022-02-04 11:42:43 +00:00