|
|
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 |
|
Edwina Barbalan
|
1fe9f22109
|
Extra Logo für Desktop / Anpassung des Contents
|
2019-07-19 17:01:07 +02:00 |
|
|
|
b7e3737a70
|
-
|
2019-07-19 16:27:37 +02:00 |
|
Edwina Barbalan
|
4f2316481e
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-19 16:13:09 +02:00 |
|
|
|
a49b0ee6a5
|
searchbar
|
2019-07-19 16:13:00 +02:00 |
|
Edwina Barbalan
|
6318b358d2
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-19 16:03:59 +02:00 |
|
Edwina Barbalan
|
35bdcd9684
|
Navigation Desktopansicht angepasst
|
2019-07-19 16:03:49 +02:00 |
|
|
|
c1db18b323
|
fixid searchbar
|
2019-07-19 15:58:13 +02:00 |
|
|
|
c8aee0c979
|
x bei suche geändert
|
2019-07-19 15:36:38 +02:00 |
|
|
|
d8091ecafd
|
x bei suche formatiert
|
2019-07-19 15:35:11 +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 |
|
|
|
2f07441fb7
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-19 12:10:26 +02:00 |
|
|
|
2b73aaabb2
|
Frontend - erweiterte Suche
|
2019-07-19 12:10:22 +02:00 |
|
Edwina Barbalan
|
7eed075963
|
Index-Datei "aufgeräumt" (auskommentierte/alte sachen weg)
|
2019-07-19 11:59:03 +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 |
|
|
|
0c8b9da3f6
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-09 12:38:56 +02:00 |
|
|
|
d1a5a0b4cf
|
the x in search is working
|
2019-07-09 12:38:46 +02:00 |
|
|
|
8ddf59666b
|
link zu button geändert -> Tagsuche durch "link"
|
2019-07-09 12:37:21 +02:00 |
|
|
|
10f349b948
|
Merge remote-tracking branch 'origin/developer' into developer
|
2019-07-09 11:37:07 +02:00 |
|
|
|
f4ab8813f3
|
Clear-Funktion bei der Suche
|
2019-07-09 11:36:54 +02:00 |
|
|
|
45315d7c47
|
search not in mounted
|
2019-07-09 11:24:12 +02:00 |
|
Edwina Barbalan
|
6c9cb12480
|
Navbar is-active colorchange
|
2019-07-09 10:43:05 +02:00 |
|
Edwina Barbalan
|
95a0ff3913
|
Auskommentiertes Array wieder hinzugefügt
|
2019-07-02 15:06:46 +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 |
|
|
|
79475fe48d
|
autocomplete bei der suche
|
2019-07-02 12:21:11 +02:00 |
|
|
|
e15cf25745
|
Tag-Darstellung in der Msg-Card
|
2019-07-02 11:49:35 +02:00 |
|
|
|
3478901450
|
search repaired
|
2019-07-02 11:37:59 +02:00 |
|
|
|
d48a3bf5ed
|
search for tags / normal text search not working
|
2019-06-27 12:08:08 +02:00 |
|
|
|
ab358abe98
|
Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
# public/routes/createMessage.js
|
2019-06-27 11:15:42 +02:00 |
|
|
|
5280c47477
|
first Try to autocomplete the search
|
2019-06-27 11:14:37 +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 |
|
|
|
156ec36d1e
|
easy search implemented
|
2019-06-27 10:28:48 +02:00 |
|
