aleksis/AlekSIS-Core

Fork 0

WIP: Draft: Resolve "Enable async framework (channels)" #2735

Draft

nik wants to merge 11 commits from 194-enable-async-framework-channels into master

nik commented

2022-09-06 18:20:24 +02:00

Owner

Closes #194

nik commented

2022-12-20 22:48:31 +01:00

Author

Owner

added 223 commits

5aea5fe2...2deb9336 - 204 commits from branch master
5923a7fb - Start migrating AlekSIS with Vue and Vuetify to a SPA
2b95ac4c - Redirect all URLs to the SPA
5b3c5b36 - Correctly integrate notifications with new SPA
514879c0 - Reformat
0ef572f5 - Remove extra margin around iframe for legacy pages
2bec3b75 - Optimize GraphQL queries and reformat
21e4a748 - Merge branch 'master' into 759-finalise-vuetify-app-as-spa
e55ca161 - Fix vue index template and GraphQL view
9fcfa3b3 - Fix up recent merge
633d94a5 - Import graphql queries instead of using require
32b09400 - Fix system properties scheme
2aa5a420 - Do not reformat .vite cache
17c80e07 - Use require to import graphql files when using vue apollo components
026034ae - Remove test view for displaying legacy pages in vue
d8ab39c7 - Use self-closing tags where possible in App.vue
f19b9383 - Do not hard code placeholder aleksis banner in Vue code
7e473dac - Reintroduce meta information and Sentry into Vue index
6905358f - Remove backup of old base template
ce0392d4 - Ignore Python files in filesystem watching

Compare with previous version

added 223 commits <ul><li>5aea5fe2...2deb9336 - 204 commits from branch <code>master</code></li><li>5923a7fb - Start migrating AlekSIS with Vue and Vuetify to a SPA</li><li>2b95ac4c - Redirect all URLs to the SPA</li><li>5b3c5b36 - Correctly integrate notifications with new SPA</li><li>514879c0 - Reformat</li><li>0ef572f5 - Remove extra margin around iframe for legacy pages</li><li>2bec3b75 - Optimize GraphQL queries and reformat</li><li>21e4a748 - Merge branch 'master' into 759-finalise-vuetify-app-as-spa</li><li>e55ca161 - Fix vue index template and GraphQL view</li><li>9fcfa3b3 - Fix up recent merge</li><li>633d94a5 - Import graphql queries instead of using require</li><li>32b09400 - Fix system properties scheme</li><li>2aa5a420 - Do not reformat .vite cache</li><li>17c80e07 - Use require to import graphql files when using vue apollo components</li><li>026034ae - Remove test view for displaying legacy pages in vue</li><li>d8ab39c7 - Use self-closing tags where possible in App.vue</li><li>f19b9383 - Do not hard code placeholder aleksis banner in Vue code</li><li>7e473dac - Reintroduce meta information and Sentry into Vue index</li><li>6905358f - Remove backup of old base template</li><li>ce0392d4 - Ignore Python files in filesystem watching</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26328&start_sha=5aea5fe27de4176e49155eb4cc2276b303512c22)

nik commented

2022-12-21 12:03:27 +01:00

Author

Owner

added 22 commits

5923a7fb - Start migrating AlekSIS with Vue and Vuetify to a SPA
2b95ac4c - Redirect all URLs to the SPA
5b3c5b36 - Correctly integrate notifications with new SPA
514879c0 - Reformat
0ef572f5 - Remove extra margin around iframe for legacy pages
2bec3b75 - Optimize GraphQL queries and reformat
21e4a748 - Merge branch 'master' into 759-finalise-vuetify-app-as-spa
e55ca161 - Fix vue index template and GraphQL view
9fcfa3b3 - Fix up recent merge
633d94a5 - Import graphql queries instead of using require
32b09400 - Fix system properties scheme
2aa5a420 - Do not reformat .vite cache
17c80e07 - Use require to import graphql files when using vue apollo components
026034ae - Remove test view for displaying legacy pages in vue
d8ab39c7 - Use self-closing tags where possible in App.vue
f19b9383 - Do not hard code placeholder aleksis banner in Vue code
7e473dac - Reintroduce meta information and Sentry into Vue index
6905358f - Remove backup of old base template
ce0392d4 - Ignore Python files in filesystem watching
e220e6e7 - Move Sentry to Vue code
79d4a052 - Write out vendor licensing information
8986cf73 - Introduce and start async daphne server with runuwsgi

Compare with previous version

added 22 commits <ul><li>5923a7fb - Start migrating AlekSIS with Vue and Vuetify to a SPA</li><li>2b95ac4c - Redirect all URLs to the SPA</li><li>5b3c5b36 - Correctly integrate notifications with new SPA</li><li>514879c0 - Reformat</li><li>0ef572f5 - Remove extra margin around iframe for legacy pages</li><li>2bec3b75 - Optimize GraphQL queries and reformat</li><li>21e4a748 - Merge branch 'master' into 759-finalise-vuetify-app-as-spa</li><li>e55ca161 - Fix vue index template and GraphQL view</li><li>9fcfa3b3 - Fix up recent merge</li><li>633d94a5 - Import graphql queries instead of using require</li><li>32b09400 - Fix system properties scheme</li><li>2aa5a420 - Do not reformat .vite cache</li><li>17c80e07 - Use require to import graphql files when using vue apollo components</li><li>026034ae - Remove test view for displaying legacy pages in vue</li><li>d8ab39c7 - Use self-closing tags where possible in App.vue</li><li>f19b9383 - Do not hard code placeholder aleksis banner in Vue code</li><li>7e473dac - Reintroduce meta information and Sentry into Vue index</li><li>6905358f - Remove backup of old base template</li><li>ce0392d4 - Ignore Python files in filesystem watching</li><li>e220e6e7 - Move Sentry to Vue code</li><li>79d4a052 - Write out vendor licensing information</li><li>8986cf73 - Introduce and start async daphne server with runuwsgi</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26345&start_sha=2deb9336598b88e7505b2db781678e1644b27e9a)

nik commented

2022-12-21 12:11:06 +01:00

Author

Owner

added 1 commit

954645c8 - Install daphne in Docker bsae image

Compare with previous version

added 1 commit <ul><li>954645c8 - Install daphne in Docker bsae image</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26346&start_sha=8986cf73506579e28f95491402a64d9efb2bef0e)

nik commented

2022-12-21 12:32:30 +01:00

Author

Owner

added 2 commits

76d7fdd1 - Amend install docs for Daphne
ea61bedd - Add libpcre to development build deps

Compare with previous version

added 2 commits <ul><li>76d7fdd1 - Amend install docs for Daphne</li><li>ea61bedd - Add libpcre to development build deps</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26348&start_sha=954645c836f8160942f86462f122443e96a0659d)

nik commented

2022-12-21 14:40:49 +01:00

Author

Owner

added 1 commit

b83d617d - Enable GraphQL WebSocket endpoint

Compare with previous version

added 1 commit <ul><li>b83d617d - Enable GraphQL WebSocket endpoint</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26352&start_sha=ea61bedd8c585822668ad8ac9de0f069347e569f)

nik commented

2023-01-12 15:41:23 +01:00

Author

Owner

added 125 commits

512b69f1 - Remove unused file for unused PersonPreferences query
a7a194d0 - Add more fields to graphene user type
4ce1ef84 - Add BSD-3-Clause to allowed licenses for third party js modules
3df24afc - Make footer custom menu work in vue SPA
215d7508 - Rename vue routes with duplicate names
456f47ce - Redirect to SPA pages (instead of legacy ones) when using sidenav search
cfcc6562 - Add vue route for haystack search page
c6edd979 - Allow for passing of query parameters to legacy iframe (for search page)
2f52d387 - Let sidenav search redirect to new SPA search page
0608304e - Implement basic error 404 handling
2484bec3 - Fix query string handling to work with special characters
9a08f9e4 - Fix lstripping of /django prefix in legacy translation
4d71ad68 - Register app routes
fb2d4cda - Fix building of query string
a908c881 - Carry over page titles from iframe to SPA
88d76a14 - Redesign language select and move it to sidenav
2195dcf9 - Add check for whoAmI
ee26a995 - Set current menu point to active
a39d1327 - Add trailing slash to all suitable legacy URLs
b456cc06 - Remove some items from sidenav menu
ffbd113d - Replace height measures relative to page height due to rendering issues in iframe
63832932 - Poll user and person details regularily to detect changes when login/logout happens
22b5ae14 - WIP permission checking with routes
e35bfab1 - Drop Vuetify plugin file to prevent existence of two Vue instances
1b0442d9 - Reformat
f81d961c - Merge branch '759-finalise-vuetify-app-as-spa' of...
da7f743e - Fix permission checking in schemas (performance/rule names)
8f1496d6 - Fix import of external dependencies in frontend bundle
94dc118e - Reformat and fix the language form
a7dc1d93 - Allow serving of external apps assets in vite config
0b381eb0 - Add routes when instantiating router object and fix incorporation of external app routes
b3075594 - Merge branch '759-finalise-vuetify-app-as-spa' of...
a49d7e30 - Use rules for all menu entries
0c56be37 - Include messages from apps
62d6d95c - Merge branch '759-finalise-vuetify-app-as-spa' of...
5cf529b4 - Drop legacy vue files and views
bfaf1bba - Merge branch '759-finalise-vuetify-app-as-spa' of...
90dd557e - Reformat
3fdc40a0 - Remove some FIXMEs/TODOs
6c61797d - Merge branch '759-finalise-vuetify-app-as-spa' of...
acf475b9 - Generate menus and route list as soon as routes are ready
90ba5f83 - Only display menu entries that the user is allowed to view
fcabc866 - Basic permission checking when accessing routes
4cedd613 - Highlight menu entries only when exact match is present
cfb1941b - Require less queries to be finished for app to be displayed
3288ae14 - Fix permission checking when displaying menus and router-view
bb2ee10e - Adapt trailing slash status of iframe and SPA url when checking for new iFrame location
f4082ab8 - Remove unused parts of legacy main.js
16c68e69 - Introduce basic error handling with apollo local states
6a78f561 - Introduce basic error handling with apollo local states
dd61626c - Replace hrefs in App.vue with programmatic vue router navigation
9c023e33 - WIP Service Worker: Do not serve offline fallback page when site cannot be fetched but show warning
85b58317 - Re-Add vue alias in vite config
4b00c83a - Fix displaying of photo/avatar in header
d8548a71 - Merge remote-tracking branch 'origin/759-finalise-vuetify-app-as-spa' into...
ed73939a - Redesign 404 component
4539ba70 - Create PersonOverview component
1536adc2 - Build contact details table on person overview
af032f5e - Display "–" if data points are missing
3aa5d8b5 - Show children and parents in person overview
87fcbeec - Show group member- and ownerships in person overview
bf93040f - Fix breakpoints and spacing of children/parents
cd60350f - Display person description on person overview
3ad62870 - Display correct avatar content in person list
2b21e91e - Display person avatar and make it clickable
ca5f0216 - Fix issues in AvatarContent.vue
a896f112 - Fix design of image popup
6bbb3a3a - Display additional images of a person in the overview
e6c8ddbb - Fix vite warning
d6f82e15 - Default icon for preferences
98d1e4ec - Create component and schemas for person actions
a2feb51e - Redesign positions of person action buttons and avatar
1a3ccd8d - Create impersonation routes
c21bd256 - Fix impersonation bug
3507e319 - Add 'stop impersonation button' to navbar
b1c0ae69 - Only replace '/django/' in url path
29f74768 - Add splash loader to show an animation before vue has loaded
bc5b9408 - Display loading animation on every request in the iframe
ea07e331 - Create global loader
d18ef51b - Use global loader in LegacyBasetemplate (and use correct event)
60bc37e5 - Fix celery progess error messages for anonymous users
771d00da - Don't show user_not_linked_to_person message box for anonymous users
4436a97b - Fix login route
12cc0c02 - Link to correct login view on signup page
7cc1915c - Load also on component change
5fb28d00 - Re-implement PWA via vite-pwa/workbox
5d83f5b3 - Basic implementation of persisting of apollo cache
21c86b90 - Merge branch '759-finalise-vuetify-app-as-spa' of...
bf0d9abc - Merge message loading into aleksisAppImporter
d4a8a5d6 - Merge branch '759-finalise-vuetify-app-as-spa' of...
c7a38b9c - Update copyright years
8b6bd8fe - Merge message loading into aleksisAppImporter
6781a772 - Load messages from separate language files
3700581a - Merge branch '759-finalise-vuetify-app-as-spa' of...
29be87f9 - Use more general and translated error messages for GraphQL and Network error snackbars
5638b59a - Merge branch '759-finalise-vuetify-app-as-spa' of...
72ad2fad - Fix import of messages from core
6b444987 - Merge branch '759-finalise-vuetify-app-as-spa' of...
7fbb34e0 - Use :to instead of router.push
ab6b649c - Reformat person-page related code
26e9feb5 - Translated using Weblate (German)
9c44b6d8 - Translated using Weblate (German)
a652ac05 - Merge branch 'weblate-frontend' into '759-finalise-vuetify-app-as-spa'
bcf7e763 - Remove inline style & adjust iframe width
c1119c38 - Merge branch '759-finalise-vuetify-app-as-spa' of...
f5034217 - Remove inline styles
292afdae - Fix origin of Vite to properly include font files
bea8a5a0 - Fix handling of whoAmI query
c3a40d2c - Fix handling of whoAmI query
6c19752b - Refetch permissions when whoAmI query changes
86bbe6ba - Add mission messages for GraphQL and natwork errors
dbd57df3 - Merge branch '759-finalise-vuetify-app-as-spa' of...
d749e968 - Fix integration of celery progress and PDF generation with SPA
c227040c - Reformat and fix lint
043ec38b - Add management command for converting Django URLs to vue-router routes
2fc23bc9 - Check for permissions in person api
b45b716e - Display action menu only when it has contents
5875faa6 - Replace spinning loader with splashscreen
3a77c298 - Reformat
580daccf - Introduce generic detailview component
c344c607 - Move styles from personactions to detailview
7ce41d31 - Create generic ListView component
f02f4087 - Merge branch '759-finalise-vuetify-app-as-spa' into 194-enable-async-framework-channels
a81a8f37 - Use cached-database sessions
78923f44 - Enable the Redis channels layer

Compare with previous version

added 125 commits <ul><li>512b69f1 - Remove unused file for unused PersonPreferences query</li><li>a7a194d0 - Add more fields to graphene user type</li><li>4ce1ef84 - Add BSD-3-Clause to allowed licenses for third party js modules</li><li>3df24afc - Make footer custom menu work in vue SPA</li><li>215d7508 - Rename vue routes with duplicate names</li><li>456f47ce - Redirect to SPA pages (instead of legacy ones) when using sidenav search</li><li>cfcc6562 - Add vue route for haystack search page</li><li>c6edd979 - Allow for passing of query parameters to legacy iframe (for search page)</li><li>2f52d387 - Let sidenav search redirect to new SPA search page</li><li>0608304e - Implement basic error 404 handling</li><li>2484bec3 - Fix query string handling to work with special characters</li><li>9a08f9e4 - Fix lstripping of /django prefix in legacy translation</li><li>4d71ad68 - Register app routes</li><li>fb2d4cda - Fix building of query string</li><li>a908c881 - Carry over page titles from iframe to SPA</li><li>88d76a14 - Redesign language select and move it to sidenav</li><li>2195dcf9 - Add check for whoAmI</li><li>ee26a995 - Set current menu point to active</li><li>a39d1327 - Add trailing slash to all suitable legacy URLs</li><li>b456cc06 - Remove some items from sidenav menu</li><li>ffbd113d - Replace height measures relative to page height due to rendering issues in iframe</li><li>63832932 - Poll user and person details regularily to detect changes when login/logout happens</li><li>22b5ae14 - WIP permission checking with routes</li><li>e35bfab1 - Drop Vuetify plugin file to prevent existence of two Vue instances</li><li>1b0442d9 - Reformat</li><li>f81d961c - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>da7f743e - Fix permission checking in schemas (performance/rule names)</li><li>8f1496d6 - Fix import of external dependencies in frontend bundle</li><li>94dc118e - Reformat and fix the language form</li><li>a7dc1d93 - Allow serving of external apps assets in vite config</li><li>0b381eb0 - Add routes when instantiating router object and fix incorporation of external app routes</li><li>b3075594 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>a49d7e30 - Use rules for all menu entries</li><li>0c56be37 - Include messages from apps</li><li>62d6d95c - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>5cf529b4 - Drop legacy vue files and views</li><li>bfaf1bba - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>90dd557e - Reformat</li><li>3fdc40a0 - Remove some FIXMEs/TODOs</li><li>6c61797d - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>acf475b9 - Generate menus and route list as soon as routes are ready</li><li>90ba5f83 - Only display menu entries that the user is allowed to view</li><li>fcabc866 - Basic permission checking when accessing routes</li><li>4cedd613 - Highlight menu entries only when exact match is present</li><li>cfb1941b - Require less queries to be finished for app to be displayed</li><li>3288ae14 - Fix permission checking when displaying menus and router-view</li><li>bb2ee10e - Adapt trailing slash status of iframe and SPA url when checking for new iFrame location</li><li>f4082ab8 - Remove unused parts of legacy main.js</li><li>16c68e69 - Introduce basic error handling with apollo local states</li><li>6a78f561 - Introduce basic error handling with apollo local states</li><li>dd61626c - Replace hrefs in App.vue with programmatic vue router navigation</li><li>9c023e33 - WIP Service Worker: Do not serve offline fallback page when site cannot be fetched but show warning</li><li>85b58317 - Re-Add vue alias in vite config</li><li>4b00c83a - Fix displaying of photo/avatar in header</li><li>d8548a71 - Merge remote-tracking branch 'origin/759-finalise-vuetify-app-as-spa' into...</li><li>ed73939a - Redesign 404 component</li><li>4539ba70 - Create PersonOverview component</li><li>1536adc2 - Build contact details table on person overview</li><li>af032f5e - Display "–" if data points are missing</li><li>3aa5d8b5 - Show children and parents in person overview</li><li>87fcbeec - Show group member- and ownerships in person overview</li><li>bf93040f - Fix breakpoints and spacing of children/parents</li><li>cd60350f - Display person description on person overview</li><li>3ad62870 - Display correct avatar content in person list</li><li>2b21e91e - Display person avatar and make it clickable</li><li>ca5f0216 - Fix issues in AvatarContent.vue</li><li>a896f112 - Fix design of image popup</li><li>6bbb3a3a - Display additional images of a person in the overview</li><li>e6c8ddbb - Fix vite warning</li><li>d6f82e15 - Default icon for preferences</li><li>98d1e4ec - Create component and schemas for person actions</li><li>a2feb51e - Redesign positions of person action buttons and avatar</li><li>1a3ccd8d - Create impersonation routes</li><li>c21bd256 - Fix impersonation bug</li><li>3507e319 - Add 'stop impersonation button' to navbar</li><li>b1c0ae69 - Only replace '/django/' in url path</li><li>29f74768 - Add splash loader to show an animation before vue has loaded</li><li>bc5b9408 - Display loading animation on every request in the iframe</li><li>ea07e331 - Create global loader</li><li>d18ef51b - Use global loader in LegacyBasetemplate (and use correct event)</li><li>60bc37e5 - Fix celery progess error messages for anonymous users</li><li>771d00da - Don't show user_not_linked_to_person message box for anonymous users</li><li>4436a97b - Fix login route</li><li>12cc0c02 - Link to correct login view on signup page</li><li>7cc1915c - Load also on component change</li><li>5fb28d00 - Re-implement PWA via vite-pwa/workbox</li><li>5d83f5b3 - Basic implementation of persisting of apollo cache</li><li>21c86b90 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>bf0d9abc - Merge message loading into aleksisAppImporter</li><li>d4a8a5d6 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>c7a38b9c - Update copyright years</li><li>8b6bd8fe - Merge message loading into aleksisAppImporter</li><li>6781a772 - Load messages from separate language files</li><li>3700581a - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>29be87f9 - Use more general and translated error messages for GraphQL and Network error snackbars</li><li>5638b59a - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>72ad2fad - Fix import of messages from core</li><li>6b444987 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>7fbb34e0 - Use :to instead of router.push</li><li>ab6b649c - Reformat person-page related code</li><li>26e9feb5 - Translated using Weblate (German)</li><li>9c44b6d8 - Translated using Weblate (German)</li><li>a652ac05 - Merge branch 'weblate-frontend' into '759-finalise-vuetify-app-as-spa'</li><li>bcf7e763 - Remove inline style & adjust iframe width</li><li>c1119c38 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>f5034217 - Remove inline styles</li><li>292afdae - Fix origin of Vite to properly include font files</li><li>bea8a5a0 - Fix handling of whoAmI query</li><li>c3a40d2c - Fix handling of whoAmI query</li><li>6c19752b - Refetch permissions when whoAmI query changes</li><li>86bbe6ba - Add mission messages for GraphQL and natwork errors</li><li>dbd57df3 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>d749e968 - Fix integration of celery progress and PDF generation with SPA</li><li>c227040c - Reformat and fix lint</li><li>043ec38b - Add management command for converting Django URLs to vue-router routes</li><li>2fc23bc9 - Check for permissions in person api</li><li>b45b716e - Display action menu only when it has contents</li><li>5875faa6 - Replace spinning loader with splashscreen</li><li>3a77c298 - Reformat</li><li>580daccf - Introduce generic detailview component</li><li>c344c607 - Move styles from personactions to detailview</li><li>7ce41d31 - Create generic ListView component</li><li>f02f4087 - Merge branch '759-finalise-vuetify-app-as-spa' into 194-enable-async-framework-channels</li><li>a81a8f37 - Use cached-database sessions</li><li>78923f44 - Enable the Redis channels layer</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26680&start_sha=b83d617d511ddafacf14b67932112f7c1bcd03e1)

nik commented

2023-01-13 23:26:53 +01:00

Author

Owner

added 12 commits

03a79765 - Introduce method for permission checking
8d20bd50 - Merge branch '759-finalise-vuetify-app-as-spa' of...
61e66423 - Fix check if messages exist when writing django vite values
cd4f2ff1 - Fix translations and string format
de48aeb8 - Merge branch '759-finalise-vuetify-app-as-spa' of...
5c857efc - Ignore more files in vite watcher
e9ee272e - Open external links within iframe in _blank target
5df853ce - Implement title handling in SPA
6ffb85c7 - Merge branch '759-finalise-vuetify-app-as-spa' of...
debb7e87 - Merge branch '759-finalise-vuetify-app-as-spa' into 194-enable-async-framework-channels
1546f65b - Revert "Enable the Redis channels layer"
af8fb8d6 - IMplement PubSub between regular requests and subscriptions

Compare with previous version

added 12 commits <ul><li>03a79765 - Introduce method for permission checking</li><li>8d20bd50 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>61e66423 - Fix check if messages exist when writing django vite values</li><li>cd4f2ff1 - Fix translations and string format</li><li>de48aeb8 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>5c857efc - Ignore more files in vite watcher</li><li>e9ee272e - Open external links within iframe in _blank target</li><li>5df853ce - Implement title handling in SPA</li><li>6ffb85c7 - Merge branch '759-finalise-vuetify-app-as-spa' of...</li><li>debb7e87 - Merge branch '759-finalise-vuetify-app-as-spa' into 194-enable-async-framework-channels</li><li>1546f65b - Revert "Enable the Redis channels layer"</li><li>af8fb8d6 - IMplement PubSub between regular requests and subscriptions</li></ul> [Compare with previous version](/AlekSIS/official/AlekSIS-Core/-/merge_requests/1090/diffs?diff_id=26713&start_sha=78923f4402dc2b79a1abd79791cb1ac2018f94a9)

This pull request has changes conflicting with the target branch.

Dockerfile
aleksis/core/apps.py
aleksis/core/schema/__init__.py
aleksis/core/settings.py
aleksis/core/urls.py
aleksis/core/util/core_helpers.py
aleksis/core/util/frontend_helpers.py
aleksis/core/vite.config.js
docker-startup.sh
docs/admin/10_install.rst
docs/dev/01_setup.rst
pyproject.toml

View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Merge commit title

Merge pull request 'WIP: Draft: Resolve "Enable async framework (channels)"' (#2735) from 194-enable-async-framework-channels into master

Merge commit body

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/2735

Merge pull request 'WIP: Draft: Resolve "Enable async framework (channels)"' (#2735) from 194-enable-async-framework-channels into master

Reviewed-on: https://code.teckids.org/aleksis/AlekSIS-Core/pulls/2735

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin 194-enable-async-framework-channels:194-enable-async-framework-channels

git switch 194-enable-async-framework-channels

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch master

git merge --no-ff 194-enable-async-framework-channels

git switch 194-enable-async-framework-channels

git rebase master

git switch master

git merge --ff-only 194-enable-async-framework-channels

git switch 194-enable-async-framework-channels

git rebase master

git switch master

git merge --no-ff 194-enable-async-framework-channels

git switch master

git merge --squash 194-enable-async-framework-channels