|
1f6261dba0
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/routes/files.js
|
2019-07-21 15:27:04 +02:00 |
|
|
4aa5856fbc
|
fixed createMessage/ files Tag autocomplete
|
2019-07-21 15:24:40 +02:00 |
|
Edwina Barbalan
|
57901853a9
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-21 15:20:42 +02:00 |
|
Edwina Barbalan
|
3eb0a99813
|
Desktopansicht auf allen Seiten angepasst
|
2019-07-21 15:20:32 +02:00 |
|
|
74232689fb
|
Farbe der Tags geändert
|
2019-07-21 14:39:33 +02:00 |
|
|
d003166e33
|
merge conflict
|
2019-07-21 14:22:37 +02:00 |
|
|
0097de5122
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/index.html
# public/routes/createMessage.js
|
2019-07-21 14:22:16 +02:00 |
|
|
5a4faca86f
|
extended search
|
2019-07-21 14:12:16 +02:00 |
|
|
92220fc11c
|
Update 'userField' from createMsg after Login; Add API for user get, post, put; Refactor API /tag/id
|
2019-07-20 23:16:42 +02:00 |
|
|
633dbc90f0
|
Refactored mong.js; Implemented majorList for ProfilCard;
|
2019-07-20 18:24:14 +02:00 |
|
|
5f0c8c1d2f
|
Login + Logout implemented; ProfilCard v1 implemented;
|
2019-07-19 23:12:38 +02:00 |
|
|
a56ab9cadd
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/index.html
# public/routes/navRoutes.js
|
2019-07-19 15:34:10 +02:00 |
|
|
a4da6243f5
|
few style changes
|
2019-07-19 15:28:26 +02:00 |
|
Edwina Barbalan
|
35b5748af9
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/index.html
|
2019-07-19 15:24:46 +02:00 |
|
|
70befa7c4d
|
extended search
|
2019-07-19 12:52:43 +02:00 |
|
Edwina Barbalan
|
3770d747ba
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-19 12:29:25 +02:00 |
|
|
2b73aaabb2
|
Frontend - erweiterte Suche
|
2019-07-19 12:10:22 +02:00 |
|
Edwina Barbalan
|
d66be879cd
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-19 11:54:26 +02:00 |
|
Edwina Barbalan
|
373d644134
|
Desktopansicht angepasst
|
2019-07-19 11:54:13 +02:00 |
|
|
8ddf59666b
|
link zu button geändert -> Tagsuche durch "link"
|
2019-07-09 12:37:21 +02:00 |
|
Edwina Barbalan
|
6c9cb12480
|
Navbar is-active colorchange
|
2019-07-09 10:43:05 +02:00 |
|
Edwina Barbalan
|
83d1d4dea8
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-02 14:59:17 +02:00 |
|
Edwina Barbalan
|
9375316956
|
Router Componente erstellt / Navbar bearbeitet
|
2019-07-02 14:59:11 +02:00 |
|
|
a4dbafe3ef
|
autocomplete fro tags working
|
2019-07-02 13:08:11 +02:00 |
|
|
e15cf25745
|
Tag-Darstellung in der Msg-Card
|
2019-07-02 11:49:35 +02:00 |
|
|
ab358abe98
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/routes/createMessage.js
|
2019-06-27 11:15:42 +02:00 |
|
|
8c0d3dc669
|
# in front of tags and changed index of messages
|
2019-06-27 11:13:40 +02:00 |
|
|
d45ab87a8b
|
# bei der Tag-Ausgabe hinzugefügt
|
2019-06-27 10:56:34 +02:00 |
|
|
e93526c639
|
tags from database implemented
|
2019-06-25 14:43:33 +02:00 |
|
|
cad0230c47
|
Fix: tags were not visible on "home" page -> solved
|
2019-06-20 23:30:51 +02:00 |
|
|
82f8e4bbde
|
outsource db routes, schemata and logic into dbs.js
|
2019-06-20 17:17:45 +02:00 |
|
Edwina Barbalan
|
d61def25b9
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-06-18 14:47:38 +02:00 |
|
|
e108be1fb8
|
Erweiterung zum Log in
|
2019-06-18 14:25:09 +02:00 |
|
|
773408dc12
|
Log-in Modal überarbeitet
|
2019-06-18 14:18:20 +02:00 |
|
Edwina Barbalan
|
d71c50ef22
|
Profil änderungen
|
2019-06-18 09:37:48 +02:00 |
|
Edwina Barbalan
|
c3073101b1
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-06-04 16:42:52 +02:00 |
|
Edwina Barbalan
|
d77c8d69e3
|
Speicherfunktion / Buefy auf Profil angewendet
|
2019-06-04 16:42:45 +02:00 |
|
|
ae4203ccf9
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-06-04 16:37:35 +02:00 |
|
|
d9b249c828
|
#buefy-changes
|
2019-06-04 16:32:37 +02:00 |
|
|
8341ed24d0
|
user model added; message model changed; tag model added
|
2019-06-04 15:26:38 +02:00 |
|
|
56f4a3f940
|
vuetify eingebunden + erster Versuch Combobox
|
2019-04-17 15:58:15 +02:00 |
|
|
24642ca1a8
|
Log-in/Log-out prototyp
|
2019-04-16 21:21:35 +02:00 |
|
Edwina Barbalan
|
bee7427176
|
Modal bugfix + Änderungen in CSS/LESS
|
2019-04-09 14:25:29 +02:00 |
|
Edwina Barbalan
|
e921e6a9e6
|
Profil Edit-Funktion
|
2019-04-09 14:03:55 +02:00 |
|
|
e471a76377
|
Erster Code für die Login UI
|
2019-04-07 23:15:09 +02:00 |
|
|
f67e5184b3
|
Changed file-folder structure
|
2019-02-09 19:35:01 +01:00 |
|