Commit Graph

195 Commits

Author SHA1 Message Date
60746a1b39 Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-10-29 09:55:08 +01:00
d8008847f2 fixed legend, changed some dimensions 2020-10-29 09:54:51 +01:00
7737b67ace Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-10-28 19:02:58 +01:00
60fe17a9f1 added popup image 2020-10-28 19:02:50 +01:00
1f3618874d Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-10-28 18:52:02 +01:00
d7756b753a added map legend 2020-10-28 18:51:58 +01:00
3c2dc1dfad fixed some sizes 2020-10-28 18:51:02 +01:00
07e32a938d tryout no overlpping 2020-10-27 17:55:22 +01:00
8411aa0ef1 style improvements 2020-10-27 17:41:22 +01:00
893949651a resolved conflicts 2020-10-27 16:26:27 +01:00
28ea1b5345 tryouts 2020-10-27 16:25:35 +01:00
90bd8affc9 changed colors, added class, legend, scroll 2020-10-27 16:24:58 +01:00
c48a66303e finished map 2020-10-27 15:33:11 +01:00
f5ef7ef386 tryout to automate stop events on popups 2020-10-27 15:04:38 +01:00
9f8a09f9c9 a-u-t-o-m-a-t-i-o-n 2020-10-27 14:35:15 +01:00
3b5e003b53 fixed json 2020-10-27 14:28:07 +01:00
ffa65066c9 fixed conflict 2020-10-27 14:08:58 +01:00
26901027c0 automated functions 2020-10-27 14:08:08 +01:00
125e980026 added more elemetns to map 2020-10-27 14:08:03 +01:00
4f98414710 test to play and stop bg audio when clicking somewhere else didnt work 2020-10-26 19:10:41 +01:00
85c04a9a33 added youtube popup and audio time 2020-10-26 18:08:10 +01:00
33d44f71ef changes in html 2020-10-19 13:01:17 +02:00
69e0db6028 Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-10-19 12:57:12 +02:00
f052192557 added fonts folder 2020-10-19 12:56:52 +02:00
8df01ccf77 styled the website for presentation 2020-10-19 12:51:29 +02:00
210f9ee54e Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-10-17 17:53:24 +02:00
f77e84aaea added ids to nodes 2020-10-17 17:53:02 +02:00
3f15cbf3d0 change color while scrolling 2020-10-17 17:43:02 +02:00
e13ee35019 edited style website 2020-10-17 16:21:22 +02:00
b69b03a10d resolved conflict 2020-10-15 17:34:45 +02:00
4428457000 color in the node 2020-10-15 17:33:40 +02:00
411db48449 added cluster 2 2020-10-15 17:32:38 +02:00
589828959a fixed cluster 1 2020-10-15 17:17:48 +02:00
b335e39baa added group 1 2020-10-15 16:46:23 +02:00
943c891dd0 fixed conflict 2020-10-14 18:10:07 +02:00
9d30af389b begun map 2020-10-14 18:08:44 +02:00
8ce886bc57 small styling 2020-10-09 16:17:11 +02:00
8c19c96b9f included thesis text and added nore elements in json 2020-10-09 16:04:15 +02:00
039578bc1a added d3 map in hello.html and clisks are working 2020-10-09 14:59:38 +02:00
19c2ba56f0 Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-10-06 13:08:24 +02:00
73a29989a0 made d3 experiments 2020-10-06 13:08:17 +02:00
11972c6486 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-10-06 13:05:58 +02:00
ebf76c356d no progress 2020-10-06 13:05:35 +02:00
9c9acd13b1 no progress 2020-10-06 13:05:16 +02:00
2d92d16c0a fixed conflicts 2020-09-29 15:40:42 +02:00
47e6a4fd37 messed around 2020-09-29 15:40:02 +02:00
b4ee54ba80 three clicks one button 2020-09-29 15:39:41 +02:00
7cfeabd42a three clicks one button 2020-09-29 15:38:32 +02:00
ce69065a36 fixed conflict 2020-09-29 14:58:34 +02:00
d4b44c976a dunno 2020-09-29 14:57:20 +02:00