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

Final merge to master #101

Merged
merged 253 commits into from
Aug 31, 2023
Merged

Final merge to master #101

merged 253 commits into from
Aug 31, 2023
This pull request is big! We’re only showing the most recent 250 commits.

Commits on Mar 20, 2020

  1. Merge pull request #12 from schoenenberg/feature/#4_docker_frontend 

    added dockerfile and docker-compose for frontend
    @aliciaschwabenbauer
    aliciaschwabenbauer authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    a998efd View commit details
    Browse the repository at this point in the history

  2. adjust docker and docker-compose and added .gitignore

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    c114b01 View commit details
    Browse the repository at this point in the history

  3. #7 Created Dockerfile for Backend

    @schoenenberg
    schoenenberg committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    bf0d6c6 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' of github.com:schoenenberg/waecm-group-09 into… 

    … develop
    @schoenenberg
    schoenenberg committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    3731955 View commit details
    Browse the repository at this point in the history

  5. #9 Added CI build

    @schoenenberg
    schoenenberg authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    69547cd View commit details
    Browse the repository at this point in the history

  6. #9 Added develop to the buildable branches

    @schoenenberg
    schoenenberg authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    ba8fc0d View commit details
    Browse the repository at this point in the history

  7. Added pushing images to Github Packages

    @schoenenberg
    schoenenberg authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    8b7716b View commit details
    Browse the repository at this point in the history

  8. #9 Fixing pipeline

    @schoenenberg
    schoenenberg authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    35ea5f0 View commit details
    Browse the repository at this point in the history

  9. #9 Hopefully this works now

    @schoenenberg
    schoenenberg authored Mar 20, 2020
    Configuration menu
    Copy the full SHA
    3df40dc View commit details
    Browse the repository at this point in the history

  10. Adapted tsconfig file

    @s1gr1d
    s1gr1d committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    dd3f23c View commit details
    Browse the repository at this point in the history

  11. Merge branch 'feature/tsSettings' into develop

    @s1gr1d
    s1gr1d committed Mar 20, 2020
    Configuration menu
    Copy the full SHA
    326dbf0 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2020

  1. change frontend structure

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    fd55c6d View commit details
    Browse the repository at this point in the history

  2. adjust docker compose for typescript

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Mar 21, 2020
    Configuration menu
    Copy the full SHA
    7a5e154 View commit details
    Browse the repository at this point in the history

Commits on Mar 22, 2020

  1. Merge pull request #13 from schoenenberg/feature/change_frontend_stru… 

    …cture

Feature/change frontend structure
    @ElenaNuiding
    ElenaNuiding authored Mar 22, 2020
    Configuration menu
    Copy the full SHA
    c60313a View commit details
    Browse the repository at this point in the history

  2. Removed node_modules

    @schoenenberg
    schoenenberg committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    3848a5a View commit details
    Browse the repository at this point in the history

  3. Update README.md

    @schoenenberg
    schoenenberg authored Mar 22, 2020
    Configuration menu
    Copy the full SHA
    dd17d94 View commit details
    Browse the repository at this point in the history

  4. #6 Added Authentication Guard

    @s1gr1d
    s1gr1d committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    7de020c View commit details
    Browse the repository at this point in the history

  5. #6 Added User Query

    @s1gr1d
    s1gr1d committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    7d90db7 View commit details
    Browse the repository at this point in the history

  6. Refactored and Prettier-ed all the things

    @s1gr1d
    s1gr1d committed Mar 22, 2020
    Configuration menu
    Copy the full SHA
    69756ad View commit details
    Browse the repository at this point in the history

  7. Merge pull request #15 from schoenenberg/feature/backendValidation 

    Feature/backend validation
    @s1gr1d
    s1gr1d authored Mar 22, 2020
    Configuration menu
    Copy the full SHA
    40b6988 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2020

  1. Improved the frontend build workflow (#14) 

    * Removed volumes section from frontend in docker-compose

* Simplified Dockerfile

* Changed the Docker build, to use an nginx as serving image

* changed docker-compose to find modules and typescript

* added ngnix config

Co-authored-by: Alicia Schwabenbauer <aliciaschwabenbauer@Alicias-MBP.fritz.box>
Co-authored-by: Alicia Schwabenbauer <aliciaschwabenbauer@Alicias-MacBook-Pro.local>
    @schoenenberg
    3 people authored Mar 23, 2020
    Configuration menu
    Copy the full SHA
    0eac166 View commit details
    Browse the repository at this point in the history

  2. Renamed files according to Node.js doc

    @s1gr1d
    s1gr1d committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    23df929 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'feature/smallImprovements' into develop

    @s1gr1d
    s1gr1d committed Mar 23, 2020
    Configuration menu
    Copy the full SHA
    ca549d6 View commit details
    Browse the repository at this point in the history

Commits on Mar 24, 2020

  1. Update README.md

    @ElenaNuiding
    ElenaNuiding authored Mar 24, 2020
    Configuration menu
    Copy the full SHA
    8b06642 View commit details
    Browse the repository at this point in the history

  2. update README.md

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    31b141e View commit details
    Browse the repository at this point in the history

  3. current status frontend

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    c151e7f View commit details
    Browse the repository at this point in the history

  4. resolved client reload bug

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    8cf6cee View commit details
    Browse the repository at this point in the history

  5. #5 functionality fully implemented - ready for code refactoring

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    62f9b0e View commit details
    Browse the repository at this point in the history

  6. #5 small refactorings frontend

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    e176568 View commit details
    Browse the repository at this point in the history

  7. Code Formatting with Prettier

    @s1gr1d
    s1gr1d committed Mar 24, 2020
    Configuration menu
    Copy the full SHA
    1972977 View commit details
    Browse the repository at this point in the history

Commits on Mar 25, 2020

  1. Update README.md

    @ElenaNuiding
    ElenaNuiding authored Mar 25, 2020
    Configuration menu
    Copy the full SHA
    0004b1a View commit details
    Browse the repository at this point in the history

  2. Refactored into Components

    @s1gr1d
    s1gr1d committed Mar 25, 2020
    Configuration menu
    Copy the full SHA
    5bbacdd View commit details
    Browse the repository at this point in the history

Commits on Mar 26, 2020

  1. Update README.md

    @ElenaNuiding
    ElenaNuiding authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    6716b57 View commit details
    Browse the repository at this point in the history

  2. Better Button Usability with fitting Text and Disabled state

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    c5924ad View commit details
    Browse the repository at this point in the history

  3. Types for GQL useQuery function

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    c5e5fd8 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/frontend_login_component' into develop

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    22916e4 View commit details
    Browse the repository at this point in the history

  5. Fix Login Issue

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    3676cb2 View commit details
    Browse the repository at this point in the history

  6. Added eslint settings

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    c004e0c View commit details
    Browse the repository at this point in the history

  7. Merge branch 'feature/LinterSettings' into develop

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    cca6e89 View commit details
    Browse the repository at this point in the history

  8. #16 Updated Readme and prepared the docker-compose File for "Abgabe 1".

    Maximilian Schoenenberg authored and Maximilian Schoenenberg committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    dac32f0 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'develop' of github.com:schoenenberg/waecm-group-09 into… 

    … develop
    Maximilian Schoenenberg authored and Maximilian Schoenenberg committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    5e6b4d0 View commit details
    Browse the repository at this point in the history

  10. Update readme.md

    @s1gr1d
    s1gr1d authored Mar 26, 2020
    Configuration menu
    Copy the full SHA
    6931e31 View commit details
    Browse the repository at this point in the history

  11. Delete Unused: backendGo, authService

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    1b52d87 View commit details
    Browse the repository at this point in the history

  12. change fonts

    @s1gr1d
    Alicia Schwabenbauer authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    a5e2fab View commit details
    Browse the repository at this point in the history

  13. fixed beginning image white line

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    5f54184 View commit details
    Browse the repository at this point in the history

  14. make button and username viewable

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    8aa21b2 View commit details
    Browse the repository at this point in the history

  15. correct background image

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    cd48b2f View commit details
    Browse the repository at this point in the history

  16. changed fonts and alignment

    @s1gr1d
    Alicia Schwabenbauer authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    166d2f7 View commit details
    Browse the repository at this point in the history

  17. solve more merge conflicts

    @s1gr1d
    Alicia Schwabenbauer authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    55bac29 View commit details
    Browse the repository at this point in the history

  18. ...

    @s1gr1d
    e11925876@student.tuwien.ac.at authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    2088118 View commit details
    Browse the repository at this point in the history

  19. changed button

    @s1gr1d
    Alicia Schwabenbauer authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    9e38780 View commit details
    Browse the repository at this point in the history

  20. solved conflicts for merge

    @s1gr1d
    Alicia Schwabenbauer authored and s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    4c0fdba View commit details
    Browse the repository at this point in the history

  21. Extract Styles to Login

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    25a4a95 View commit details
    Browse the repository at this point in the history

  22. Make Avatar Picture bigger

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    dded719 View commit details
    Browse the repository at this point in the history

  23. Merged all Styling Changes

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    88e3902 View commit details
    Browse the repository at this point in the history

  24. Merge branch 'feature/profilePicture' into develop

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    b1fcae7 View commit details
    Browse the repository at this point in the history

  25. Delete HelloWorld Module

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    18f4d08 View commit details
    Browse the repository at this point in the history

  26. Fix Centering

    @s1gr1d
    s1gr1d committed Mar 26, 2020
    Configuration menu
    Copy the full SHA
    472f71e View commit details
    Browse the repository at this point in the history

Commits on Apr 7, 2020

  1. add test data for subreddit dashboard queries

    @s1gr1d
    s1gr1d committed Apr 7, 2020
    Configuration menu
    Copy the full SHA
    718f32c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #33 from schoenenberg/feature/testQueries 

    add test data for subreddit dashboard queries
    @s1gr1d
    s1gr1d authored Apr 7, 2020
    Configuration menu
    Copy the full SHA
    25552a2 View commit details
    Browse the repository at this point in the history

Commits on Apr 9, 2020

  1. #20 added navigation bar

    e11925876@student.tuwien.ac.at committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    158fac9 View commit details
    Browse the repository at this point in the history

  2. #20 added alert dialog if user wants to log out

    e11925876@student.tuwien.ac.at committed Apr 9, 2020
    Configuration menu
    Copy the full SHA
    f8788d2 View commit details
    Browse the repository at this point in the history

Commits on Apr 10, 2020

  1. #20 made AlertDialog component generally usable

    e11925876@student.tuwien.ac.at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    da05958 View commit details
    Browse the repository at this point in the history

  2. Delete package-lock.json

    @ElenaNuiding
    ElenaNuiding authored Apr 10, 2020
    Configuration menu
    Copy the full SHA
    d29bf35 View commit details
    Browse the repository at this point in the history

  3. #20 improvements and deleted node_modules

    e11925876@student.tuwien.ac.at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    c064709 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'feature/navigation' of https://github.com/schoenenberg/… 

    …waecm-group-09 into feature/navigation
    e11925876@student.tuwien.ac.at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    c80c7fb View commit details
    Browse the repository at this point in the history

  5. #20 restore pack-lock.json

    e11925876@student.tuwien.ac.at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    b8d475a View commit details
    Browse the repository at this point in the history

  6. Merge pull request #34 from schoenenberg/feature/navigation 

    Feature/navigation
    @ElenaNuiding
    ElenaNuiding authored Apr 10, 2020
    Configuration menu
    Copy the full SHA
    6a76e0e View commit details
    Browse the repository at this point in the history

  7. #22 added Dashboard Elements with mock data

    e11925876@student.tuwien.ac.at committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    19c00bc View commit details
    Browse the repository at this point in the history

  8. Finished #28

    @schoenenberg
    schoenenberg committed Apr 10, 2020
    Configuration menu
    Copy the full SHA
    378b984 View commit details
    Browse the repository at this point in the history

Commits on Apr 11, 2020

  1. #22 improved Dashboard element design

    e11925876@student.tuwien.ac.at committed Apr 11, 2020
    Configuration menu
    Copy the full SHA
    a8418a0 View commit details
    Browse the repository at this point in the history

Commits on Apr 15, 2020

  1. added AddComponent and reddits list with basic functionality and loca… 

    …lStorage
    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    10ddc57 View commit details
    Browse the repository at this point in the history

  2. #19 adapted login functionality to new requirements

    e11925876@student.tuwien.ac.at committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    9e0db4c View commit details
    Browse the repository at this point in the history

  3. added DB schema and CRUD manipulation

    @s1gr1d
    s1gr1d committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    6f98fb2 View commit details
    Browse the repository at this point in the history

  4. rename file

    @s1gr1d
    s1gr1d committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    d59bdc0 View commit details
    Browse the repository at this point in the history

  5. added getSubreddit

    @s1gr1d
    s1gr1d committed Apr 15, 2020
    Configuration menu
    Copy the full SHA
    626fd91 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #35 from schoenenberg/feature/saveSubreddit 

    added DB schema and CRUD manipulation
    @s1gr1d
    s1gr1d authored Apr 15, 2020
    Configuration menu
    Copy the full SHA
    813976f View commit details
    Browse the repository at this point in the history

Commits on Apr 16, 2020

  1. Merge pull request #36 from schoenenberg/feature/dashboard 

    Feature/dashboard
    @ElenaNuiding
    ElenaNuiding authored Apr 16, 2020
    Configuration menu
    Copy the full SHA
    a895792 View commit details
    Browse the repository at this point in the history

Commits on Apr 17, 2020

  1. added Alert Dialog

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 17, 2020
    Configuration menu
    Copy the full SHA
    638e17c View commit details
    Browse the repository at this point in the history

  2. Merge pull request #37 from schoenenberg/feature/#22_added_addReddit_… 

    …component

Feature/#22 added add reddit component(without GQL)
    @aliciaschwabenbauer
    aliciaschwabenbauer authored Apr 17, 2020
    Configuration menu
    Copy the full SHA
    548f32e View commit details
    Browse the repository at this point in the history

Commits on Apr 18, 2020

  1. current status

    e11925876@student.tuwien.ac.at committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    21b2ad4 View commit details
    Browse the repository at this point in the history

  2. current status

    e11925876@student.tuwien.ac.at committed Apr 18, 2020
    Configuration menu
    Copy the full SHA
    1d069ba View commit details
    Browse the repository at this point in the history

Commits on Apr 19, 2020

  1. #29 Added connection from backend to mongo with docker-compose.

    @schoenenberg
    schoenenberg committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    cd9d9e4 View commit details
    Browse the repository at this point in the history

  2. #29 Fix url

    @schoenenberg
    schoenenberg committed Apr 19, 2020
    Configuration menu
    Copy the full SHA
    d3018cd View commit details
    Browse the repository at this point in the history

Commits on Apr 21, 2020

  1. Merge branch 'feature/dashboard3' into feature/dashboard2

    @ElenaNuiding
    ElenaNuiding authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    b1b2673 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #38 from schoenenberg/feature/dashboard2 

    Feature/dashboard2
    @ElenaNuiding
    ElenaNuiding authored Apr 21, 2020
    Configuration menu
    Copy the full SHA
    ef5d235 View commit details
    Browse the repository at this point in the history

  3. #26 Added subreddit description and icon retrieval

    @schoenenberg
    schoenenberg committed Apr 21, 2020
    Configuration menu
    Copy the full SHA
    76e6f68 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2020

  1. #26 Refactored Reddit module by pulling out the Reddit-connector

    @schoenenberg
    schoenenberg committed Apr 22, 2020
    Configuration menu
    Copy the full SHA
    e9b7cf7 View commit details
    Browse the repository at this point in the history

Commits on Apr 24, 2020

  1. added subreddit mutation

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6415b79 View commit details
    Browse the repository at this point in the history

  2. #24 get data from backend for dashboard

    e11925876@student.tuwien.ac.at committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    6292c2c View commit details
    Browse the repository at this point in the history

  3. refactor: split up reddit stuff to data, bot and connector

    @s1gr1d
    s1gr1d committed Apr 24, 2020
    Configuration menu
    Copy the full SHA
    954550f View commit details
    Browse the repository at this point in the history

Commits on Apr 25, 2020

  1. fetch image and title description from reddit API

    @s1gr1d
    s1gr1d committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    5c3c93c View commit details
    Browse the repository at this point in the history

  2. update package lock

    @s1gr1d
    s1gr1d committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    240397c View commit details
    Browse the repository at this point in the history

  3. #24 added display icon

    e11925876@student.tuwien.ac.at committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    287fdee View commit details
    Browse the repository at this point in the history

  4. Merge pull request #41 from schoenenberg/feature/dashboard3 

    Feature/dashboard3
    @ElenaNuiding
    ElenaNuiding authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    a12a0fb View commit details
    Browse the repository at this point in the history

  5. #27 get new comments from active subreddit

    @s1gr1d
    s1gr1d committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    5473653 View commit details
    Browse the repository at this point in the history

  6. fix: get all active subreddits from database without limit

    @s1gr1d
    s1gr1d committed Apr 25, 2020
    Configuration menu
    Copy the full SHA
    313864d View commit details
    Browse the repository at this point in the history

  7. Merge pull request #42 from schoenenberg/feature/bot-get-comments 

    #27 get new comments from active subreddit
    @s1gr1d
    s1gr1d authored Apr 25, 2020
    Configuration menu
    Copy the full SHA
    d945114 View commit details
    Browse the repository at this point in the history

Commits on Apr 26, 2020

  1. fixed dashboardElement layout problem

    e11925876@student.tuwien.ac.at committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    eed97c3 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #43 from schoenenberg/fix/dashboard 

    fixed dashboardElement layout problem
    @ElenaNuiding
    ElenaNuiding authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    eb04906 View commit details
    Browse the repository at this point in the history

  3. #19 finished login

    e11925876@student.tuwien.ac.at committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    f20e4df View commit details
    Browse the repository at this point in the history

  4. Merge branch 'develop' into feature/login

    @ElenaNuiding
    ElenaNuiding authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    2079f69 View commit details
    Browse the repository at this point in the history

  5. Update Navigation.tsx

    @ElenaNuiding
    ElenaNuiding authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    27c3ada View commit details
    Browse the repository at this point in the history

  6. Merge pull request #45 from schoenenberg/feature/login 

    Feature/login
    @ElenaNuiding
    ElenaNuiding authored Apr 26, 2020
    Configuration menu
    Copy the full SHA
    50249f0 View commit details
    Browse the repository at this point in the history

  7. #27 add comment reply functionality to bot

    @s1gr1d
    s1gr1d committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    393c40d View commit details
    Browse the repository at this point in the history

  8. fixed alert dialog

    e11925876@student.tuwien.ac.at committed Apr 26, 2020
    Configuration menu
    Copy the full SHA
    c129b18 View commit details
    Browse the repository at this point in the history

Commits on Apr 27, 2020

  1. Merge pull request #39 from schoenenberg/feature/reddit 

    Feature/reddit
    @s1gr1d
    s1gr1d authored Apr 27, 2020
    Configuration menu
    Copy the full SHA
    22677e7 View commit details
    Browse the repository at this point in the history

  2. Worked on #47 and #48. 

    - Update works, but returns an error (#48)
- Not tested yet (#47)
    @schoenenberg
    schoenenberg committed Apr 27, 2020
    Configuration menu
    Copy the full SHA
    4e3c3bf View commit details
    Browse the repository at this point in the history

Commits on Apr 28, 2020

  1. Some bot improvements 

    - Made the bot configurable with defaults.
- Bot logging.
- Reduced linter warnings in service
    @schoenenberg
    schoenenberg committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    9ccfed9 View commit details
    Browse the repository at this point in the history

  2. #50 Added 'createdOn' field for subreddit

    @schoenenberg
    schoenenberg committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    cf8b88f View commit details
    Browse the repository at this point in the history

  3. fix update in reddit resolver and refactor update in reddit service

    @s1gr1d
    s1gr1d committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    40e077f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #51 from schoenenberg/fix/graphql-error 

    fix update in reddit resolver and refactor update in reddit service
    @s1gr1d
    s1gr1d authored Apr 28, 2020
    Configuration menu
    Copy the full SHA
    e92bb7d View commit details
    Browse the repository at this point in the history

  5. delete all occurences of answerCount

    @s1gr1d
    s1gr1d committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    a72028a View commit details
    Browse the repository at this point in the history

  6. added gql

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 28, 2020
    Configuration menu
    Copy the full SHA
    af6ae84 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'develop' into feature/#21_22_23_subreddits

    @aliciaschwabenbauer
    aliciaschwabenbauer authored Apr 28, 2020
    Configuration menu
    Copy the full SHA
    6710890 View commit details
    Browse the repository at this point in the history

Commits on Apr 29, 2020

  1. added show reddit list on settings click

    e11925876@student.tuwien.ac.at committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    6b7fd2a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #53 from schoenenberg/feature/#21_22_23_subreddits 

    Feature/#21 22 23 subreddits
    @ElenaNuiding
    ElenaNuiding authored Apr 29, 2020
    Configuration menu
    Copy the full SHA
    f982c00 View commit details
    Browse the repository at this point in the history

  3. added style changes

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    8b0cff7 View commit details
    Browse the repository at this point in the history

  4. changes for branch switch

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    7a6c654 View commit details
    Browse the repository at this point in the history

  5. newest update

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed Apr 29, 2020
    Configuration menu
    Copy the full SHA
    8a93b94 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #52 from schoenenberg/feature/check-comments 

    Feature/check comments
    @s1gr1d
    s1gr1d authored Apr 29, 2020
    Configuration menu
    Copy the full SHA
    2aedc02 View commit details
    Browse the repository at this point in the history

Commits on May 2, 2020

  1. print error

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 2, 2020
    Configuration menu
    Copy the full SHA
    d195f97 View commit details
    Browse the repository at this point in the history

Commits on May 4, 2020

  1. added error handling

    e11925876@student.tuwien.ac.at committed May 4, 2020
    Configuration menu
    Copy the full SHA
    8739a35 View commit details
    Browse the repository at this point in the history

  2. improve validty checks

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 4, 2020
    Configuration menu
    Copy the full SHA
    4451d12 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #54 from schoenenberg/validity_checks 

    Integrate validity checks
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 4, 2020
    Configuration menu
    Copy the full SHA
    4aa49eb View commit details
    Browse the repository at this point in the history

  4. run prettier through all files on frontend

    Sigrid committed May 4, 2020
    Configuration menu
    Copy the full SHA
    d3adc44 View commit details
    Browse the repository at this point in the history

  5. add no docker script to run frontend without docker

    Sigrid committed May 4, 2020
    Configuration menu
    Copy the full SHA
    1ad33b0 View commit details
    Browse the repository at this point in the history

  6. fix frontend (adding, error messages, types)

    Sigrid committed May 4, 2020
    Configuration menu
    Copy the full SHA
    838cffe View commit details
    Browse the repository at this point in the history

  7. Merge pull request #55 from schoenenberg/refactor/frontend 

    Refactor/frontend
    @s1gr1d
    s1gr1d authored May 4, 2020
    Configuration menu
    Copy the full SHA
    932f7ad View commit details
    Browse the repository at this point in the history

Commits on May 5, 2020

  1. fix update subreddit Promise handling

    Sigrid committed May 5, 2020
    Configuration menu
    Copy the full SHA
    79f0e57 View commit details
    Browse the repository at this point in the history

  2. Improve build time of frontend

    Maximilian Schoenenberg authored and Maximilian Schoenenberg committed May 5, 2020
    Configuration menu
    Copy the full SHA
    f4bc856 View commit details
    Browse the repository at this point in the history

  3. Improve build times in backend

    Maximilian Schoenenberg authored and Maximilian Schoenenberg committed May 5, 2020
    Configuration menu
    Copy the full SHA
    637f8d1 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2020

  1. fixed addRedditLink and url

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    0a84d93 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #59 from schoenenberg/fix/frontend_elli 

    fixed addRedditLink and url
    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    ecb49c1 View commit details
    Browse the repository at this point in the history

  3. added show edit component only when editing

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    27fcce6 View commit details
    Browse the repository at this point in the history

  4. ran prettier

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    e1cd2d3 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #60 from schoenenberg/fix/frontend_subreddit_edit 

    Fix/frontend subreddit edit
    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    d6c2316 View commit details
    Browse the repository at this point in the history

  6. Update docker-compose.yml

    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    134aa0b View commit details
    Browse the repository at this point in the history

  7. fixed add url

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    67fa319 View commit details
    Browse the repository at this point in the history

  8. improved validation of update Subreddit

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 6, 2020
    Configuration menu
    Copy the full SHA
    3c8cb05 View commit details
    Browse the repository at this point in the history

  9. improved link

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    4de3da6 View commit details
    Browse the repository at this point in the history

  10. Merge branch 'develop' into fix/frontend_2

    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    03029ac View commit details
    Browse the repository at this point in the history

  11. Merge pull request #62 from schoenenberg/fix/frontend_2 

    Fix/frontend 2
    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    a2fa736 View commit details
    Browse the repository at this point in the history

  12. resolved merge conflict

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    df8644f View commit details
    Browse the repository at this point in the history

  13. added responsive design

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 6, 2020
    Configuration menu
    Copy the full SHA
    3d1301f View commit details
    Browse the repository at this point in the history

  14. Merge branch 'develop' into feature/update_frontend

    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 6, 2020
    Configuration menu
    Copy the full SHA
    a24177c View commit details
    Browse the repository at this point in the history

  15. Merge pull request #65 from schoenenberg/feature/update_frontend 

    fixed frontend issues
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 6, 2020
    Configuration menu
    Copy the full SHA
    00ac400 View commit details
    Browse the repository at this point in the history

  16. fixed merge conflict

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 6, 2020
    Configuration menu
    Copy the full SHA
    d0a21d1 View commit details
    Browse the repository at this point in the history

  17. added only show error while not changing in add component

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    07b6322 View commit details
    Browse the repository at this point in the history

  18. Merge pull request #66 from schoenenberg/fix/frontend_3 

    added only show error while not changing in add component
    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    1b3c070 View commit details
    Browse the repository at this point in the history

  19. fixed Dashboard Top Bar Margin

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 6, 2020
    Configuration menu
    Copy the full SHA
    0c18599 View commit details
    Browse the repository at this point in the history

  20. validation WIP

    @s1gr1d
    s1gr1d authored and Sigrid committed May 6, 2020
    Configuration menu
    Copy the full SHA
    23537b6 View commit details
    Browse the repository at this point in the history

  21. solved edit issue

    e11925876@student.tuwien.ac.at committed May 6, 2020
    Configuration menu
    Copy the full SHA
    caf7bb5 View commit details
    Browse the repository at this point in the history

  22. Merge pull request #67 from schoenenberg/fix/edit_component 

    solved edit issue
    @ElenaNuiding
    ElenaNuiding authored May 6, 2020
    Configuration menu
    Copy the full SHA
    87204a0 View commit details
    Browse the repository at this point in the history

  23. add validation

    Sigrid committed May 6, 2020
    Configuration menu
    Copy the full SHA
    e5c331c View commit details
    Browse the repository at this point in the history

  24. Merge pull request #68 from schoenenberg/feature/backendValidation 

    Feature/backend validation
    @s1gr1d
    s1gr1d authored May 6, 2020
    Configuration menu
    Copy the full SHA
    8335e70 View commit details
    Browse the repository at this point in the history

  25. fixed edit and margin problem

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 6, 2020
    Configuration menu
    Copy the full SHA
    394dee7 View commit details
    Browse the repository at this point in the history

  26. Merge branch 'develop' into fix/edit_validation

    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 6, 2020
    Configuration menu
    Copy the full SHA
    7428918 View commit details
    Browse the repository at this point in the history

  27. Merge pull request #69 from schoenenberg/fix/edit_validation 

    Fix/edit validation
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 6, 2020
    Configuration menu
    Copy the full SHA
    0ae2205 View commit details
    Browse the repository at this point in the history

  28. #49 include extra bot security

    Sigrid committed May 6, 2020
    Configuration menu
    Copy the full SHA
    0ce7ea4 View commit details
    Browse the repository at this point in the history

  29. include volumes to docker to have persistent DB

    Sigrid committed May 6, 2020
    Configuration menu
    Copy the full SHA
    021557a View commit details
    Browse the repository at this point in the history

  30. Merge pull request #70 from schoenenberg/feature/botAdditions 

    Feature/bot additions
    @s1gr1d
    s1gr1d authored May 6, 2020
    Configuration menu
    Copy the full SHA
    8bb7f8b View commit details
    Browse the repository at this point in the history

Commits on May 7, 2020

  1. added comments

    e11925876@student.tuwien.ac.at committed May 7, 2020
    Configuration menu
    Copy the full SHA
    3046084 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #71 from schoenenberg/frontend_improvement 

    added comments
    @ElenaNuiding
    ElenaNuiding authored May 7, 2020
    Configuration menu
    Copy the full SHA
    c6f87ca View commit details
    Browse the repository at this point in the history

  3. changes for new backend

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    2ae05cd View commit details
    Browse the repository at this point in the history

  4. Merge pull request #72 from schoenenberg/fix/last_changes 

    changes for new backend
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 7, 2020
    Configuration menu
    Copy the full SHA
    ffea54a View commit details
    Browse the repository at this point in the history

  5. adjust responsive design

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    fb5b385 View commit details
    Browse the repository at this point in the history

  6. deleted subredditQuery

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    fdab547 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #73 from schoenenberg/fix/improvments 

    deleted subredditQuery
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 7, 2020
    Configuration menu
    Copy the full SHA
    48f2f3f View commit details
    Browse the repository at this point in the history

  8. add graphQL docs

    Sigrid committed May 7, 2020
    Configuration menu
    Copy the full SHA
    0e4b6c6 View commit details
    Browse the repository at this point in the history

  9. delete unused query

    Sigrid committed May 7, 2020
    Configuration menu
    Copy the full SHA
    8a23693 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #74 from schoenenberg/feature/docs 

    Feature/ graph ql docs
    @s1gr1d
    s1gr1d authored May 7, 2020
    Configuration menu
    Copy the full SHA
    d1834ec View commit details
    Browse the repository at this point in the history

  11. Feature/save username (#75) 

    * #26 Added subreddit description and icon retrieval

* #26 Refactored Reddit module by pulling out the Reddit-connector

* refactor: split up reddit stuff to data, bot and connector

* fetch image and title description from reddit API

* update package lock

* #27 get new comments from active subreddit

* fix: get all active subreddits from database without limit

* #27 add comment reply functionality to bot

* Worked on #47 and #48.
- Update works, but returns an error (#48)
- Not tested yet (#47)

* Some bot improvements
- Made the bot configurable with defaults.
- Bot logging.
- Reduced linter warnings in service

* #50 Added 'createdOn' field for subreddit

* fix update in reddit resolver and refactor update in reddit service

* delete all occurences of answerCount

* get short title description instead of long description

* add username to graphQL (new and update)

* Add user

* Nickname is null. Change everything to preferred_username

Co-authored-by: s1gr1d <sigrid.huemer@gmx.net>
    @schoenenberg @s1gr1d
    schoenenberg and s1gr1d authored May 7, 2020
    Configuration menu
    Copy the full SHA
    50c90e6 View commit details
    Browse the repository at this point in the history

  12. Missing commit: Removed username fields

    @schoenenberg
    schoenenberg committed May 7, 2020
    Configuration menu
    Copy the full SHA
    48d8e74 View commit details
    Browse the repository at this point in the history

  13. delete unused query

    Sigrid committed May 7, 2020
    Configuration menu
    Copy the full SHA
    e07eb21 View commit details
    Browse the repository at this point in the history

  14. delete todo comment

    Sigrid committed May 7, 2020
    Configuration menu
    Copy the full SHA
    5c862b6 View commit details
    Browse the repository at this point in the history

  15. get correct icon and short description from reddit

    Sigrid committed May 7, 2020
    Configuration menu
    Copy the full SHA
    cc4895e View commit details
    Browse the repository at this point in the history

  16. adjust add component

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    e271b60 View commit details
    Browse the repository at this point in the history

  17. Merge pull request #76 from schoenenberg/fix/Ipone5_syling 

    layout fixing
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 7, 2020
    Configuration menu
    Copy the full SHA
    b4761f0 View commit details
    Browse the repository at this point in the history

  18. fixed lost changes

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    63da549 View commit details
    Browse the repository at this point in the history

  19. Merge branch 'develop' of https://github.com/schoenenberg/waecm-group-09 

     into develop
    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    8cfa493 View commit details
    Browse the repository at this point in the history

  20. fixed merge chanes

    Alicia Schwabenbauer authored and Alicia Schwabenbauer committed May 7, 2020
    Configuration menu
    Copy the full SHA
    3f15064 View commit details
    Browse the repository at this point in the history

  21. ran prettier frontend

    e11925876@student.tuwien.ac.at committed May 7, 2020
    Configuration menu
    Copy the full SHA
    82613d3 View commit details
    Browse the repository at this point in the history

  22. removed es lint problems with hooks

    e11925876@student.tuwien.ac.at committed May 7, 2020
    Configuration menu
    Copy the full SHA
    cef94c6 View commit details
    Browse the repository at this point in the history

  23. Added Database and containerization to README.md

    @schoenenberg
    schoenenberg committed May 7, 2020
    Configuration menu
    Copy the full SHA
    e8b9d5b View commit details
    Browse the repository at this point in the history

  24. Merge branch 'develop' of github.com:schoenenberg/waecm-group-09 into… 

    … develop
    @schoenenberg
    schoenenberg committed May 7, 2020
    Configuration menu
    Copy the full SHA
    835e181 View commit details
    Browse the repository at this point in the history

  25. Added Docker-Compose Files and Env to Readme.md

    @schoenenberg
    schoenenberg committed May 7, 2020
    Configuration menu
    Copy the full SHA
    e10d1e8 View commit details
    Browse the repository at this point in the history

  26. Update docker-compose-a2.yaml

    @schoenenberg
    schoenenberg authored May 7, 2020
    Configuration menu
    Copy the full SHA
    1326592 View commit details
    Browse the repository at this point in the history

Commits on May 12, 2020

  1. deleted not used test for App

    Sigrid committed May 12, 2020
    Configuration menu
    Copy the full SHA
    680cdb7 View commit details
    Browse the repository at this point in the history

  2. installed jest-dom and react-testing library

    Sigrid committed May 12, 2020
    Configuration menu
    Copy the full SHA
    36984fb View commit details
    Browse the repository at this point in the history

  3. included tests for alert (still WIP)

    Sigrid committed May 12, 2020
    Configuration menu
    Copy the full SHA
    59d502a View commit details
    Browse the repository at this point in the history

  4. Merge pull request #85 from schoenenberg/feature/testAlert 

    include 3 tests for alert
    @s1gr1d
    s1gr1d authored May 12, 2020
    Configuration menu
    Copy the full SHA
    11abda7 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. refactor AlertWithTitle to be able to write more tests

    Sigrid committed May 14, 2020
    Configuration menu
    Copy the full SHA
    db82836 View commit details
    Browse the repository at this point in the history

  2. #78 write component tests for AlertWithTitle

    Sigrid committed May 14, 2020
    Configuration menu
    Copy the full SHA
    5ba44eb View commit details
    Browse the repository at this point in the history

  3. Merge pull request #86 from schoenenberg/freature/finishAlertTest 

    Freature/finish alert test
    @s1gr1d
    s1gr1d authored May 14, 2020
    Configuration menu
    Copy the full SHA
    8e7752c View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into develop

    Sigrid committed May 14, 2020
    Configuration menu
    Copy the full SHA
    0f4a3d9 View commit details
    Browse the repository at this point in the history

  5. delete unused files from old master branch

    Sigrid committed May 14, 2020
    Configuration menu
    Copy the full SHA
    b0d28db View commit details
    Browse the repository at this point in the history

Commits on May 15, 2020

  1. #77 added tests for primary button

    e11925876@student.tuwien.ac.at committed May 15, 2020
    Configuration menu
    Copy the full SHA
    3a8fce6 View commit details
    Browse the repository at this point in the history

  2. #77 corrected click test

    e11925876@student.tuwien.ac.at committed May 15, 2020
    Configuration menu
    Copy the full SHA
    87a84e2 View commit details
    Browse the repository at this point in the history

  3. Merge pull request #88 from schoenenberg/feature/test_button 

    Feature/test button
    @ElenaNuiding
    ElenaNuiding authored May 15, 2020
    Configuration menu
    Copy the full SHA
    7356bf3 View commit details
    Browse the repository at this point in the history

Commits on May 17, 2020

  1. add custom banner

    Sigrid committed May 17, 2020
    Configuration menu
    Copy the full SHA
    3371130 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #89 from schoenenberg/feature/custombanner 

    add custom banner
    @s1gr1d
    s1gr1d authored May 17, 2020
    Configuration menu
    Copy the full SHA
    6d27b15 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. added attributes to web component

    Alicia Schwabenbauer committed May 18, 2020
    Configuration menu
    Copy the full SHA
    1ff347c View commit details
    Browse the repository at this point in the history

  2. added observed attributes

    Alicia Schwabenbauer committed May 18, 2020
    Configuration menu
    Copy the full SHA
    f5a5b29 View commit details
    Browse the repository at this point in the history

  3. page not editable while not accepted banner

    e11925876@student.tuwien.ac.at committed May 18, 2020
    Configuration menu
    Copy the full SHA
    360307f View commit details
    Browse the repository at this point in the history

  4. added not editable while not accepted banner

    e11925876@student.tuwien.ac.at committed May 18, 2020
    Configuration menu
    Copy the full SHA
    d7cfa11 View commit details
    Browse the repository at this point in the history

  5. Revert "page not editable while not accepted banner" 

    This reverts commit 360307f.
    e11925876@student.tuwien.ac.at authored and Sigrid committed May 18, 2020
    Configuration menu
    Copy the full SHA
    43dbd20 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. add dependency

    Alicia Schwabenbauer committed May 20, 2020
    Configuration menu
    Copy the full SHA
    985b1b4 View commit details
    Browse the repository at this point in the history

  2. integrate custom banner from repo

    Alicia Schwabenbauer committed May 20, 2020
    Configuration menu
    Copy the full SHA
    ad23790 View commit details
    Browse the repository at this point in the history

  3. update banner version

    Alicia Schwabenbauer committed May 20, 2020
    Configuration menu
    Copy the full SHA
    8cde8b1 View commit details
    Browse the repository at this point in the history

  4. added event for custom element

    Alicia Schwabenbauer committed May 20, 2020
    Configuration menu
    Copy the full SHA
    8fb47b9 View commit details
    Browse the repository at this point in the history

  5. added overlay

    Alicia Schwabenbauer committed May 20, 2020
    Configuration menu
    Copy the full SHA
    49c289d View commit details
    Browse the repository at this point in the history

  6. Beschreibung der Lösungen (tests, custom element)

    Sigrid committed May 20, 2020
    Configuration menu
    Copy the full SHA
    ef55319 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #90 from schoenenberg/feature/describeSolution 

    Beschreibung der Lösungen (tests, custom element)
    @s1gr1d
    s1gr1d authored May 20, 2020
    Configuration menu
    Copy the full SHA
    9cac9d6 View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. close banner after akzeptance

    Alicia Schwabenbauer committed May 21, 2020
    Configuration menu
    Copy the full SHA
    3dfae36 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #91 from schoenenberg/feature/banner_functionality 

    Feature/banner functionality
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 21, 2020
    Configuration menu
    Copy the full SHA
    30bcf1a View commit details
    Browse the repository at this point in the history

  3. update readme and custom banner style

    Alicia Schwabenbauer committed May 21, 2020
    Configuration menu
    Copy the full SHA
    048f45f View commit details
    Browse the repository at this point in the history

  4. Merge pull request #92 from schoenenberg/feature/banner_extensions 

    update readme and custom banner style
    @aliciaschwabenbauer
    aliciaschwabenbauer authored May 21, 2020
    Configuration menu
    Copy the full SHA
    e367953 View commit details
    Browse the repository at this point in the history

  5. added policy accepted message

    e11925876@student.tuwien.ac.at committed May 21, 2020
    Configuration menu
    Copy the full SHA
    42bd4d2 View commit details
    Browse the repository at this point in the history

  6. Merge pull request #93 from schoenenberg/feature/data_policy_accepted 

    added policy accepted message
    @ElenaNuiding
    ElenaNuiding authored May 21, 2020
    Configuration menu
    Copy the full SHA
    9f2a218 View commit details
    Browse the repository at this point in the history

  7. #84 information for tests

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    5970c59 View commit details
    Browse the repository at this point in the history

  8. Merge pull request #94 from schoenenberg/feature/descriptionTests 

    #84 information for tests
    @s1gr1d
    s1gr1d authored May 21, 2020
    Configuration menu
    Copy the full SHA
    632751e View commit details
    Browse the repository at this point in the history

  9. #79 Add test to frontend build

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    81145de View commit details
    Browse the repository at this point in the history

  10. #79 Fix build

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    836053e View commit details
    Browse the repository at this point in the history

  11. Reduced file size of background image

    @schoenenberg
    schoenenberg committed May 21, 2020
    Configuration menu
    Copy the full SHA
    042ca05 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'develop' of github.com:schoenenberg/waecm-group-09 into… 

    … develop
    @schoenenberg
    schoenenberg committed May 21, 2020
    Configuration menu
    Copy the full SHA
    a7e30a9 View commit details
    Browse the repository at this point in the history

  13. Create docker-compose-a3.yaml

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    b1335a0 View commit details
    Browse the repository at this point in the history

  14. WIP: Update README.md (#96) 

    * Update README.md

* Add files via upload

* Update README.md

* Update README.md

* Updated README
    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    0735093 View commit details
    Browse the repository at this point in the history

  15. Update README.md

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    cd6f3fc View commit details
    Browse the repository at this point in the history

  16. Update README.md

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    7fadd71 View commit details
    Browse the repository at this point in the history

  17. Update README.md

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    67b02db View commit details
    Browse the repository at this point in the history

  18. #82 Added component and itegrated it into the Navigation

    @schoenenberg
    schoenenberg authored and Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    8c7c12a View commit details
    Browse the repository at this point in the history

  19. Added state handler of banner state to navigation and guideline

    @schoenenberg
    schoenenberg authored and Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    3f08a36 View commit details
    Browse the repository at this point in the history

  20. #86 One issue missing, but it works

    @schoenenberg
    schoenenberg authored and Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    81435d1 View commit details
    Browse the repository at this point in the history

  21. #82 Fixed

    @schoenenberg
    schoenenberg authored and Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    53b1e32 View commit details
    Browse the repository at this point in the history

  22. #82 add react router and policy page

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    0dff5cf View commit details
    Browse the repository at this point in the history

  23. update package-lock

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    421777a View commit details
    Browse the repository at this point in the history

  24. fix: add alert again

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    5b7d8e6 View commit details
    Browse the repository at this point in the history

  25. Merge pull request #98 from schoenenberg/feature/guidelines-component 

    Feature/guidelines component
    @s1gr1d
    s1gr1d authored May 21, 2020
    Configuration menu
    Copy the full SHA
    2f104cd View commit details
    Browse the repository at this point in the history

  26. delete banner js

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    099ec34 View commit details
    Browse the repository at this point in the history

  27. create page for policy

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    a3da0ae View commit details
    Browse the repository at this point in the history

  28. Merge pull request #99 from schoenenberg/feature/refactor 

    refactor policy component as extra page
    @s1gr1d
    s1gr1d authored May 21, 2020
    Configuration menu
    Copy the full SHA
    e5369a0 View commit details
    Browse the repository at this point in the history

  29. refactor: make dashboard page

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    5b174db View commit details
    Browse the repository at this point in the history

  30. Merge pull request #100 from schoenenberg/refactor/dashboard 

    refactor: make dashboard page
    @s1gr1d
    s1gr1d authored May 21, 2020
    Configuration menu
    Copy the full SHA
    1bef6d8 View commit details
    Browse the repository at this point in the history

  31. Update README.md

    @schoenenberg
    schoenenberg authored May 21, 2020
    Configuration menu
    Copy the full SHA
    5b7c7c3 View commit details
    Browse the repository at this point in the history

  32. redirect to dashboard when logged in

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    d581e65 View commit details
    Browse the repository at this point in the history

  33. fix error

    Sigrid committed May 21, 2020
    Configuration menu
    Copy the full SHA
    f7164bb View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. WAECM Grading: Test the pipeline - expected to fail

    @waecm
    waecm authored May 25, 2020
    Configuration menu
    Copy the full SHA
    69e3a90 View commit details
    Browse the repository at this point in the history

  2. WAECM Grading: Revert bad changes

    @waecm
    waecm authored May 25, 2020
    Configuration menu
    Copy the full SHA
    fa5d0be View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

  1. Merge branch 'master' into develop

    @schoenenberg
    schoenenberg authored Aug 31, 2023
    Configuration menu
    Copy the full SHA
    660d8a4 View commit details
    Browse the repository at this point in the history