Commit Graph

24 Commits

Author SHA1 Message Date
Augusto Dwenger 38e2cb23bc Merge branch 'docker' into dev 2020-03-16 10:57:15 +01:00
Augusto Dwenger 4374483377 Delete node_modules directory 2020-03-16 10:56:12 +01:00
Augusto Dwenger 818154c41f Merge branch 'dev' into docker 2019-11-27 12:10:11 +01:00
Blazej 227b86f6f9 Changed Chat Layout 2019-11-27 12:06:05 +01:00
Augusto Dwenger 61324d8602 add docker-compose setup 2019-11-27 12:02:27 +01:00
Blazej 5205ff20ab Outsourced Javascript 2019-11-27 11:41:48 +01:00
Blazej 721e4bd3d7 Added Close Message 2019-11-27 11:38:24 +01:00
Blazej 4a7158be4b Added automatic scroll to bottom 2019-11-27 11:32:12 +01:00
Augusto Dwenger cbd6b6e5c7 Merge branch 'dev' of gitlab.com:berufsschul-ae/blitzchat into dev 2019-11-26 17:23:47 +01:00
Augusto Dwenger 5d2886583d add docker support 2019-11-26 15:08:24 +01:00
Augusto Dwenger ec8cbee379 Merge branch 'master' of https://gitlab.com/berufsschul-ae/blitzchat into dev 2019-11-26 14:21:09 +01:00
Augusto Dwenger dbb87318d7 Merge branch 'dev' into 'master'
First working merge from dev into master

See merge request berufsschul-ae/blitzchat!1
2019-11-26 13:20:36 +00:00
Augusto Dwenger a8e3d7d0ef First working merge from dev into master 2019-11-26 13:20:36 +00:00
Augusto Dwenger 2d2bb7f877 Delete foo.txt 2019-11-26 13:16:50 +00:00
Augusto Dwenger da8ae12237 wip 2019-11-26 13:47:14 +01:00
Augusto Dwenger ad67e4fc49 Merge branch 'dev' of https://gitlab.com/berufsschul-ae/blitzchat into dev 2019-11-26 12:29:59 +01:00
Augusto Dwenger 65110ef281 add json objects and preprocess it on server with escape 2019-11-26 12:29:46 +01:00
Blazej cde3d73484 Added Color Picker 2019-11-26 10:31:59 +01:00
Augusto Dwenger fad9028424 Merge branch 'dev' of https://gitlab.com/berufsschul-ae/blitzchat into dev 2019-11-26 10:19:30 +01:00
Augusto Dwenger 5be3b643ed add support to remove the message if it s send 2019-11-26 10:17:33 +01:00
Blazej 326aee8e3a Added automatic Hostname and removed joinbutton on join 2019-11-26 10:17:29 +01:00
Blazej 4e3fa12cb8 Okay 2019-11-25 14:55:55 +01:00
Augusto Dwenger 7deeed69d5 add express static serve and websocket server 2019-11-25 13:26:16 +01:00
Augusto Dwenger 0737c05d9c initial commit 2019-11-25 12:56:36 +01:00