Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove comments #5

Merged
merged 1 commit into from
Apr 20, 2024
Merged

Remove comments #5

merged 1 commit into from
Apr 20, 2024

Conversation

albin-karlsson
Copy link
Collaborator

No description provided.

@albin-karlsson albin-karlsson merged commit c5c9dca into public Apr 20, 2024
LeoFidjeland added a commit that referenced this pull request Apr 27, 2024
@LeoFidjeland
Squashed commit of the following:
ab5bcc0 
commit c368405
Merge: 8002493 4ad0570
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 26 21:51:15 2024 +0200

    Merge pull request #15 from Nonhuman-Nonsense/albin

    Sending recording to parent component in dedicated function

commit 4ad0570
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 26 21:50:48 2024 +0200

    Sending recording to parent component in dedicated function

commit 8002493
Merge: e778e4c 1496c5b
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 26 21:47:26 2024 +0200

    Merge pull request #14 from Nonhuman-Nonsense/albin

    Prep for recording voice

commit 1496c5b
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 26 21:46:42 2024 +0200

    Prep for recording voice

commit e778e4c
Merge: 10aa2fd 60a598b
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 26 21:36:09 2024 +0200

    Merge pull request #13 from Nonhuman-Nonsense/albin

    Hide conversation controls when last message is playing

commit 60a598b
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 26 21:35:36 2024 +0200

    Hide conversation controls when last message is playing

commit 10aa2fd
Merge: f51c5fb d597423
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 26 21:13:12 2024 +0200

    Merge pull request #12 from Nonhuman-Nonsense/albin

    Add max index limit to messages to avoid replaying interjection replies

commit d597423
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 26 21:11:51 2024 +0200

    Add max index limit to messages to avoid replaying interjection replies

commit f51c5fb
Merge: 56001e3 0c28951
Author: Albin Karlsson <[email protected]>
Date:   Thu Apr 25 22:29:03 2024 +0200

    Merge pull request #11 from Nonhuman-Nonsense/albin

    Albin

commit 0c28951
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 25 22:25:36 2024 +0200

    Add human interjection

commit ce22340
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 25 20:21:11 2024 +0200

    Fix bug with audio playing if adding new input

commit 16a8ef9
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 25 19:39:23 2024 +0200

    Implement raise hand

commit 8e3c97f
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 25 16:59:08 2024 +0200

    Add functionality for raising hand

commit 56001e3
Merge: d538a5a 8d325e0
Author: Albin Karlsson <[email protected]>
Date:   Thu Apr 25 15:38:21 2024 +0200

    Merge pull request #10 from Nonhuman-Nonsense/albin

    Add new images and improve output playback

commit 8d325e0
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 25 15:37:08 2024 +0200

    Add new images and improve output playback

commit d538a5a
Merge: 386ac9d 2ed74fd
Author: Albin Karlsson <[email protected]>
Date:   Wed Apr 24 21:24:14 2024 +0200

    Merge pull request #9 from Nonhuman-Nonsense/albin

    Improve audio playback and audio/text timing

commit 2ed74fd
Author: albin-karlsson <[email protected]>
Date:   Wed Apr 24 21:23:35 2024 +0200

    Improve audio playback and audio/text timing

commit 386ac9d
Merge: d5dd06b b7bf78e
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 20:40:44 2024 +0530

    Merge pull request #8 from Nonhuman-Nonsense/Leo

    Scaling 75%, some refactoring etc

commit b7bf78e
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 20:15:11 2024 +0530

    scaled styles 75%

commit 2249719
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 19:10:00 2024 +0530

    removed build tool npm audits

    see facebook/create-react-app#11174

commit 03e5d9c
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 19:09:39 2024 +0530

    fixed compilation warning about missing package

commit d1690b1
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 18:48:29 2024 +0530

    clicking outside about etc. closes it + some refactor

commit ab2af7c
Author: Leo Fidjeland <[email protected]>
Date:   Wed Apr 24 18:46:55 2024 +0530

    removed visual basic configuration from repo

commit d5dd06b
Merge: 6b297ed 88977a0
Author: Leo Fidjeland <[email protected]>
Date:   Sun Apr 21 16:57:23 2024 +0530

    Merge pull request #7 from Nonhuman-Nonsense/Leo

    hot reloading for server and client via proxy pass

commit 88977a0
Author: Leo Fidjeland <[email protected]>
Date:   Sun Apr 21 16:56:17 2024 +0530

    hot reloading for server and client via proxy pass

commit 6b297ed
Merge: c5c9dca 7467f56
Author: Albin Karlsson <[email protected]>
Date:   Sun Apr 21 10:33:53 2024 +0200

    Merge pull request #6 from Nonhuman-Nonsense/albin

    Add message before meeting is ready

commit 7467f56
Author: albin-karlsson <[email protected]>
Date:   Sun Apr 21 10:16:42 2024 +0200

    Add message before meeting is ready

commit c5c9dca
Merge: c80afc5 bdd5627
Author: Albin Karlsson <[email protected]>
Date:   Sat Apr 20 12:43:00 2024 +0200

    Merge pull request #5 from Nonhuman-Nonsense/albin

    Remove comments

commit bdd5627
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 12:42:23 2024 +0200

    Remove comments

commit c80afc5
Merge: cfb1c9e a3e019e
Author: Albin Karlsson <[email protected]>
Date:   Sat Apr 20 12:35:17 2024 +0200

    Merge pull request #4 from Nonhuman-Nonsense/albin

    Albin

commit a3e019e
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 12:34:29 2024 +0200

    Link audio playback with current message

commit 63ef0d7
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 12:07:38 2024 +0200

    Add audio

commit 86ec6b9
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 11:12:42 2024 +0200

    Add skip, pause and resume functionality

commit cfb1c9e
Merge: 5b058ac 9a4bfae
Author: Albin Karlsson <[email protected]>
Date:   Sat Apr 20 10:51:51 2024 +0200

    Merge pull request #3 from Nonhuman-Nonsense/albin

    Albin

commit 9a4bfae
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 10:50:28 2024 +0200

    Remove duplicate .gitignore file

commit 2449f9e
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 20 10:29:26 2024 +0200

    Refactor Output and TextOutput

commit 5b058ac
Merge: 21518fe 5ea5b85
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 19 16:57:31 2024 +0200

    Merge pull request #2 from Nonhuman-Nonsense/albin

    Remove potato from germany

commit 5ea5b85
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 19 16:56:32 2024 +0200

    Remove potato from germany

commit 21518fe
Merge: 32dd360 9452e23
Author: Albin Karlsson <[email protected]>
Date:   Fri Apr 19 16:48:45 2024 +0200

    Merge pull request #1 from Nonhuman-Nonsense/albin

    Add origin to potato

commit 9452e23
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 19 16:46:32 2024 +0200

    Add origin to potato

commit 32dd360
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 19 16:43:59 2024 +0200

    Server updates

commit 6960792
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 19 16:43:12 2024 +0200

    Update from meeting

commit 0a2b979
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 18 13:16:12 2024 +0200

    Always include water in selected foods

commit 048e5fa
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 18 12:57:20 2024 +0200

    Fix initialization issues in TextOutput

commit dc23729
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 18 12:27:42 2024 +0200

    Listen for updated conversations in TextOutput

commit 39ce335
Author: albin-karlsson <[email protected]>
Date:   Thu Apr 18 12:16:23 2024 +0200

    Emit only one message from server and not the whole server

commit 616f42b
Author: albin-karlsson <[email protected]>
Date:   Mon Apr 8 11:52:46 2024 +0200

    Prep prompts and options for sending it to the server

commit 81a2d48
Author: albin-karlsson <[email protected]>
Date:   Mon Apr 8 11:02:50 2024 +0200

    Add options json

commit 5d68e91
Author: Leo Fidjeland <[email protected]>
Date:   Sun Apr 7 14:19:04 2024 +0530

    Made the docker buildable

commit 6e7e1af
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 6 00:19:12 2024 +0200

    Fix passing food object to Council

commit cac43e9
Author: albin-karlsson <[email protected]>
Date:   Sat Apr 6 00:06:39 2024 +0200

    Add foods json

commit 508d5c3
Merge: 0b25dcc 40ccf70
Author: albin-karlsson <[email protected]>
Date:   Fri Apr 5 22:25:07 2024 +0200

    Add files

commit 40ccf70
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 17:46:49 2024 +0100

    Finished for today

commit 49b7b8c
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 17:12:16 2024 +0100

    Add reset from clicking at navbar title

commit 8f50d5c
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 16:08:37 2024 +0100

    Solve bug where topic did not update on settings change

commit 3dda98a
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 16:03:18 2024 +0100

    Add functionality to change settings

commit d7f74a0
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 14:41:44 2024 +0100

    Work with navbar overlay flow

commit b6c4b51
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 28 12:49:23 2024 +0100

    Add overlay pages

commit f84233e
Author: Albin Karlsson <[email protected]>
Date:   Wed Mar 27 17:58:19 2024 +0100

    Update navbar

commit f7933e7
Author: Albin Karlsson <[email protected]>
Date:   Wed Mar 27 12:01:46 2024 +0100

    Prep for navbar overlay pages

commit 207c5b2
Author: Albin Karlsson <[email protected]>
Date:   Wed Mar 27 11:41:25 2024 +0100

    Refactor Council component

commit 3277ce0
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 18:35:47 2024 +0100

    Add responsive food image style

commit bd16ea7
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 18:14:44 2024 +0100

    Rework parabola function

commit d17c067
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 16:35:13 2024 +0100

    Change backgrounds

commit 82e3875
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 16:18:45 2024 +0100

    Change from name to humanName

commit 27d81cb
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 15:13:37 2024 +0100

    Change from name to human name where applicable

commit 0450c61
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 14:42:01 2024 +0100

    Style Foods page

commit 09935d2
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 13:38:59 2024 +0100

    Manage topics component

commit 5702f01
Author: Albin Karlsson <[email protected]>
Date:   Tue Mar 26 10:16:40 2024 +0100

    Add page flow

commit 5e38be1
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 19:17:41 2024 +0100

    Edit arc

commit 7f73ed5
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 19:14:53 2024 +0100

    Rotate drop shadow

commit bb0e8aa
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 18:46:31 2024 +0100

    Remove old comment

commit 48db961
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 18:46:14 2024 +0100

    Fix drop shadow for even and uneven amount of foods

commit 8650a96
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 16:36:03 2024 +0100

    Capitalize and trim topic

commit 5ea0272
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 16:19:37 2024 +0100

    Autofocus input fields

commit e331084
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 15:48:24 2024 +0100

    Style Council page

commit 32c6778
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 15:23:48 2024 +0100

    Add navbar

commit 17a6ee4
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 14:50:01 2024 +0100

    Add council food images

commit ae65526
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 14:29:16 2024 +0100

    Remove unneeded comments

commit e472154
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 14:27:29 2024 +0100

    Simplify drop shadow direction

commit 4e39335
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 14:19:16 2024 +0100

    Style foods placement

commit c0b6425
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 12:56:35 2024 +0100

    Change background image for council

commit 58508fe
Author: albin-karlsson <[email protected]>
Date:   Sat Mar 23 12:49:07 2024 +0100

    Add enter council flow

commit 5e826fc
Author: albin-karlsson <[email protected]>
Date:   Fri Mar 22 23:37:38 2024 +0100

    Done for today

commit 4db7f87
Author: albin-karlsson <[email protected]>
Date:   Fri Mar 22 23:24:27 2024 +0100

    Fix line break

commit c32b512
Author: albin-karlsson <[email protected]>
Date:   Fri Mar 22 23:23:40 2024 +0100

    Remove unneeded comments

commit a53bf41
Author: albin-karlsson <[email protected]>
Date:   Fri Mar 22 23:22:34 2024 +0100

    Fix topic and select foods validation

commit 06e3a84
Author: albin-karlsson <[email protected]>
Date:   Fri Mar 22 23:00:51 2024 +0100

    Prepare data

commit 66ab3b5
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 22:56:29 2024 +0100

    Listen for key down on Setup

commit 696f1be
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 22:52:45 2024 +0100

    Add linebreak Setup text

commit 328ca69
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 22:49:09 2024 +0100

    Style Enter button

commit dfed07f
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 22:42:29 2024 +0100

    Style FoodButtons for Setup

commit 95fd5d4
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 22:28:54 2024 +0100

    Move images

commit 7a5ed65
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 21:57:02 2024 +0100

    Transition from Welcome to Setup

commit 3315404
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 21:46:37 2024 +0100

    Name input component

commit a02396f
Author: albin-karlsson <[email protected]>
Date:   Thu Mar 21 21:23:19 2024 +0100

    Add FontAwesome

commit 18486ae
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 21 18:17:55 2024 +0100

    Update README

commit 4de8af5
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 21 18:16:54 2024 +0100

    Add overlay

commit 9467a82
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 21 16:34:28 2024 +0100

    Update favicon

commit 91df163
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 21 16:12:25 2024 +0100

    Update Dockerfile to use client and server

commit 68b4a89
Author: Albin Karlsson <[email protected]>
Date:   Thu Mar 21 15:38:34 2024 +0100

    Create react app
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@albin-karlsson