nglk
|
e4e4b14642
|
deleted some parts that remained from conflict
|
4 years ago |
nglk
|
d425b542d9
|
fixed error with non dragged nodes
|
4 years ago |
nglk
|
107412ed5d
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
08b75688be
|
didnt fix draggable, bg audio and others, some work partly
|
4 years ago |
alicestrt
|
419b5f819c
|
fixed conflict
|
4 years ago |
alicestrt
|
288e4a1a70
|
fixed map json
|
4 years ago |
nglk
|
f589ef5ab8
|
separated bio from video, fixed x close popup and video stops when clicking x
|
4 years ago |
nglk
|
5d4aba1118
|
fixed some small errors
|
4 years ago |
nglk
|
2639a7c8e8
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
40a8300e82
|
styles and failed draggable and scalaeable
|
4 years ago |
alicestrt
|
2ebd91cfff
|
added youtube links
|
4 years ago |
nglk
|
ce8d627db4
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
ef8d0bc192
|
styled popups and took out audio bg function for nodes
|
4 years ago |
alicestrt
|
7caac12dff
|
added some embed links to json
|
4 years ago |
alicestrt
|
13c1c9d049
|
changed colors
|
4 years ago |
nglk
|
6d382a6333
|
gixed issue with about popup not appearing. Noe issue with colophon
|
4 years ago |
nglk
|
d608cdc95c
|
automated video and bio popup depending on properties in the json file
|
4 years ago |
nglk
|
f170a15094
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
54a8b64e5c
|
tests in d3 map
|
4 years ago |
alicestrt
|
a5611bc472
|
fixed position of elements
|
4 years ago |
alicestrt
|
4983a1b710
|
Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw
|
4 years ago |
nglk
|
e7cafd26a6
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
ee42f38078
|
added about and colophon
|
4 years ago |
alicestrt
|
ea53d0331f
|
map size
|
4 years ago |
nglk
|
7feea47ddc
|
added about and colophon
|
4 years ago |
alicestrt
|
5899630867
|
played with current time
|
4 years ago |
nglk
|
1699cddad6
|
style changes for presentation
|
4 years ago |
alicestrt
|
f3c4b6ebbe
|
fixed conflict
|
4 years ago |
nglk
|
2f24356118
|
highlightnodes and stop video
|
4 years ago |
alicestrt
|
d578832b74
|
arranged elements and made iframes small
|
4 years ago |
nglk
|
ecb1c528d6
|
styled a bit more the draggable objects
|
4 years ago |
nglk
|
ef43b8b658
|
flexible and draggable objects. Complete example of diagram in full page
|
4 years ago |
nglk
|
bbd1c8bcbd
|
everything in one html works now
|
4 years ago |
nglk
|
ff82e41f71
|
fixed partially errors with CORS
|
4 years ago |
alicestrt
|
64a65ca6d0
|
added newindex
|
4 years ago |
alicestrt
|
60746a1b39
|
Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw
|
4 years ago |
alicestrt
|
d8008847f2
|
fixed legend, changed some dimensions
|
4 years ago |
nglk
|
7737b67ace
|
Merge branch 'master' of ssh://vvvvvvaria.org:12345/alicestrt/vvvw
|
4 years ago |
nglk
|
60fe17a9f1
|
added popup image
|
4 years ago |
alicestrt
|
1f3618874d
|
Merge branch 'master' of https://git.vvvvvvaria.org/alicestrt/vvvw
|
4 years ago |
alicestrt
|
d7756b753a
|
added map legend
|
4 years ago |
nglk
|
3c2dc1dfad
|
fixed some sizes
|
4 years ago |
nglk
|
07e32a938d
|
tryout no overlpping
|
4 years ago |
nglk
|
8411aa0ef1
|
style improvements
|
4 years ago |
nglk
|
893949651a
|
resolved conflicts
|
4 years ago |
nglk
|
28ea1b5345
|
tryouts
|
4 years ago |
alicestrt
|
90bd8affc9
|
changed colors, added class, legend, scroll
|
4 years ago |
alicestrt
|
c48a66303e
|
finished map
|
4 years ago |
nglk
|
f5ef7ef386
|
tryout to automate stop events on popups
|
4 years ago |
nglk
|
9f8a09f9c9
|
a-u-t-o-m-a-t-i-o-n
|
4 years ago |