160 Commits

Author SHA1 Message Date
ce740b61ec Suche nach Links 2019-07-23 18:39:31 +02:00
499f0764da fixed subscribe-btn 2019-07-23 17:44:03 +02:00
bac8786ab4 Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
#	public/routes/home.js
#	public/style/style.css
#	public/style/style.less
2019-07-23 17:38:11 +02:00
6529b1d937 verschiedenes 2019-07-23 17:34:57 +02:00
2d4850520d Vue Rerender function 2019-07-23 17:22:01 +02:00
b1d0a0f095 bookmark without color change 2019-07-23 16:07:14 +02:00
ae5360386a Session object deletion on logout; 2019-07-23 13:31:39 +02:00
85bca37a8c User creation on login (server-seitig) 2019-07-23 10:34:20 +02:00
a6dd34cf81 adding/ loading of bookmarks implemented (only for fixed User) 2019-07-22 23:01:01 +02:00
Edwina Barbalan
9eaf71ec3d Desktopansicht Profil und Home angepasst 2019-07-22 18:51:02 +02:00
6eb741760f Button und Link für die Suche 2019-07-22 18:40:51 +02:00
3550f1558b Merge remote-tracking branch 'origin/developer' into developer 2019-07-22 16:56:33 +02:00
Edwina Barbalan
b62927c28d Merge remote-tracking branch 'origin/developer' into developer
# Conflicts:
#	public/routes/createMessage.js
#	public/routes/files.js
2019-07-22 16:51:34 +02:00
Edwina Barbalan
0f06d8fcd7 Kleiner Fehler in buefy.css ausgebessert 2019-07-22 16:36:56 +02:00
Edwina Barbalan
613041d5cb Desktopansicht bei Suche/CreateMsg "verbessert" (Ohne doppelte Komponente" 2019-07-22 16:22:27 +02:00
783938821c Outsource global variables into 'initGlobals.js' 2019-07-22 14:15:20 +02:00
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