 Edgardo Palza
|
45639b42f1
Bad Merge one more time
|
8 years ago |
|
Edgardo Palza
|
437f7380d9
Merge branches 'Ohne_Drag_and_Drop' and 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
b8e3fb5427
Small changes in the design of the GUI
|
8 years ago |
 Jessey Widhalm
|
0f43b0360a
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Jessey Widhalm
|
aad42c3e8b
images will now be saved in extra folder at the same plache the .jar file is
|
8 years ago |
|
Edgardo Palza
|
5958fcee56
Correct Merge
|
8 years ago |
|
Edgardo Palza
|
424f8fb216
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
 Kevin Trometer
|
e4dd523048
sofortiges akutalisieren von HolonElement nach löschen/Adden
|
8 years ago |
|
Kevin Trometer
|
e4846251d1
Schönerer Slider
|
8 years ago |
|
Edgardo Palza
|
31ec4c200f
fix the addElement (now with correct ID)
|
8 years ago |
|
Edgardo Palza
|
b10797c027
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
635dd298c2
graph changes
|
8 years ago |
|
Teh-Hai Julian Zheng
|
33adf61835
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Teh-Hai Julian Zheng
|
a3284aa4fd
id
|
8 years ago |
|
Kevin Trometer
|
584d6ffe4a
ein paar äußerliche änderungen
|
8 years ago |
|
Edgardo Palza
|
14567a69f1
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
a9ac089715
Small changes im Graph
|
8 years ago |
|
Jessey Widhalm
|
10b0af72aa
gradle integration
|
8 years ago |
|
Edgardo Palza
|
5322e747d8
Fix the bad merge
|
8 years ago |
|
Edgardo Palza
|
3137227cef
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
a763193152
Graph
|
8 years ago |
|
Teh-Hai Julian Zheng
|
5f1735a4d3
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Teh-Hai Julian Zheng
|
414309584d
Store
|
8 years ago |
|
Kevin Trometer
|
556f1ceefc
Node delete wenn nirgends connected
|
8 years ago |
|
Edgardo Palza
|
b0e4a7bd64
no message
|
8 years ago |
|
Teh-Hai Julian Zheng
|
ab7a6e0f41
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Teh-Hai Julian Zheng
|
f9b23a89d3
Json Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
f2f0ccaba3
Merge branch 'Ohne_Drag_and_Drop' of https://git.tk.informatik.tu-darmstadt.de/carlos.garcia/praktikum-holons into Ohne_Drag_and_Drop
|
8 years ago |
|
Edgardo Palza
|
105bbd649c
Fix a small error with addElement
|
8 years ago |
|
Kevin Trometer
|
19e1f9f74f
Buttons oben
|
8 years ago |
