Commit Graph

155 Commits

Author SHA1 Message Date
2c54471003 fixed some stuff 2021-01-15 18:30:30 +01:00
37ceecaa71 fixed conflict 2021-01-15 17:32:18 +01:00
77e83d9d53 audio shorter 2021-01-15 17:31:41 +01:00
792d4b31ad draggable is insode index.html now, no external svript 2021-01-15 17:31:32 +01:00
b39e37ea83 stop videos 2021-01-15 17:00:02 +01:00
59bd03dc17 Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2021-01-15 16:25:34 +01:00
a0ab1253b5 bio and about text + on hover labels 2021-01-15 16:25:12 +01:00
68fb91b465 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2021-01-08 15:23:15 +01:00
53c1e754fe tried to fix close video when click x but didnt work 2021-01-08 15:23:07 +01:00
ad1aee2aeb Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2021-01-08 15:19:54 +01:00
332a5d186f styled bios and audio 2021-01-08 15:19:36 +01:00
c7e84b8ceb Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2021-01-08 14:39:01 +01:00
b391b44ef9 efforts with video close 2021-01-08 14:38:55 +01:00
b975a876ef Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2021-01-08 14:16:02 +01:00
9902019b11 video without url doesnt appear 2021-01-08 14:15:52 +01:00
0ff31ba27d changed fontawesome link 2021-01-08 14:15:51 +01:00
c7fd3786c1 webm audio 2021-01-06 18:38:58 +01:00
bc6f5999d8 fixed time issue 2021-01-06 17:25:12 +01:00
c628f2463b fixed js errors 2021-01-06 17:20:53 +01:00
3d9adbef57 fixed display issue chrome 2021-01-06 16:48:28 +01:00
63d24c5beb added play icon on legend and cganhed its position 2020-12-17 14:18:09 +01:00
4fb232708b deleted old folders 2020-12-16 16:44:38 +01:00
52eec15ec1 made things transparent 2020-12-16 15:38:27 +01:00
c8fa834c51 fixed conflict 2020-12-16 15:12:30 +01:00
efbb680f03 edited position of legend, added bios 2020-12-16 15:11:39 +01:00
e4e4b14642 deleted some parts that remained from conflict 2020-12-16 14:55:53 +01:00
d425b542d9 fixed error with non dragged nodes 2020-12-15 19:31:34 +01:00
107412ed5d Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-12-15 18:52:03 +01:00
08b75688be didnt fix draggable, bg audio and others, some work partly 2020-12-15 18:51:50 +01:00
419b5f819c fixed conflict 2020-12-15 18:49:17 +01:00
288e4a1a70 fixed map json 2020-12-15 18:48:11 +01:00
f589ef5ab8 separated bio from video, fixed x close popup and video stops when clicking x 2020-12-09 16:55:10 +01:00
5d4aba1118 fixed some small errors 2020-12-04 17:06:23 +01:00
2639a7c8e8 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-12-04 16:55:02 +01:00
40a8300e82 styles and failed draggable and scalaeable 2020-12-04 16:54:54 +01:00
2ebd91cfff added youtube links 2020-12-04 15:48:30 +01:00
ce8d627db4 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-12-04 14:53:43 +01:00
ef8d0bc192 styled popups and took out audio bg function for nodes 2020-12-04 14:53:39 +01:00
7caac12dff added some embed links to json 2020-12-04 14:53:25 +01:00
13c1c9d049 changed colors 2020-12-04 14:25:23 +01:00
6d382a6333 gixed issue with about popup not appearing. Noe issue with colophon 2020-12-04 13:29:10 +01:00
d608cdc95c automated video and bio popup depending on properties in the json file 2020-12-04 13:15:54 +01:00
f170a15094 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-12-04 11:59:12 +01:00
54a8b64e5c tests in d3 map 2020-12-04 11:59:05 +01:00
a5611bc472 fixed position of elements 2020-12-04 11:56:43 +01:00
4983a1b710 Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw 2020-12-04 11:43:04 +01:00
e7cafd26a6 Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw 2020-12-04 11:42:53 +01:00
ee42f38078 added about and colophon 2020-12-04 11:42:41 +01:00
ea53d0331f map size 2020-12-04 11:42:40 +01:00
7feea47ddc added about and colophon 2020-12-04 11:42:36 +01:00