Michael Hackstein
|
5bf4714ce0
|
Fixed merge conflict in karma.conf
|
2013-12-16 16:42:44 +01:00 |
Michael Hackstein
|
490417de31
|
Started with adding a context menu for nodes. Modified karma config. It now does not run JSLint and WebWorkers specific tests, they somhow fail on the jenkins server. Will be fixed again
|
2013-12-16 16:41:24 +01:00 |
Frank Celler
|
85c780fbbe
|
added icon path and more nsis info
|
2013-12-16 12:18:02 +01:00 |
Frank Celler
|
d48b2d1604
|
added firefox
|
2013-12-16 11:16:52 +01:00 |
Frank Celler
|
99c79485e8
|
added firefox
|
2013-12-16 11:14:27 +01:00 |
Michael Hackstein
|
08fc5db114
|
GraphViewer readed pannign buttons, got deleted by accident
|
2013-12-13 23:16:34 +01:00 |
Michael Hackstein
|
b7a34326f9
|
GraphViewer Added a context menu for edges
|
2013-12-13 23:14:28 +01:00 |
Jan Steemann
|
ecd45227e0
|
fixed mrb client
|
2013-12-13 18:01:21 +01:00 |
Jan Steemann
|
7c4944de83
|
added --server.ssl-protocol option for client tools
Conflicts:
arangosh/Benchmark/BenchmarkThread.h
lib/GeneralServer/SslAsyncCommTask.h
|
2013-12-13 17:58:24 +01:00 |
Jan Steemann
|
e7ba403998
|
added --server.ssl-protocol option for client tools
|
2013-12-13 17:53:51 +01:00 |
Jan Steemann
|
ed61b5272e
|
added missing initialiser
|
2013-12-13 17:11:49 +01:00 |
Max Neunhoeffer
|
60eee47336
|
Next draft of ClusterComm API.
ClusterComm internals are unready and subject to change.
ClusterComm thread is not yet started and shut down.
ClusterState does not do anything (yet).
|
2013-12-13 17:07:18 +01:00 |
Heiko Kernbach
|
3f1ffd2d70
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2013-12-13 16:11:23 +01:00 |
Heiko Kernbach
|
040db09706
|
css, icons
|
2013-12-13 16:11:17 +01:00 |
Jan Steemann
|
67f72b26fa
|
split big group of statistics into 2 separate groups
Conflicts:
CHANGELOG
|
2013-12-13 16:08:58 +01:00 |
Jan Steemann
|
21d5abf15d
|
updated CHANGELOG
|
2013-12-13 16:06:14 +01:00 |
Max Neunhoeffer
|
145fa2562e
|
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
Conflicts:
arangod/Makefile.files
|
2013-12-13 16:06:01 +01:00 |
Max Neunhoeffer
|
721681b4ee
|
Move Cluster state information to its own class.
|
2013-12-13 16:04:54 +01:00 |
Heiko Kernbach
|
f4e4e411cf
|
icons
|
2013-12-13 16:01:07 +01:00 |
Jan Steemann
|
1010d515bb
|
added detailed HTTP request statistics
Conflicts:
CHANGELOG
|
2013-12-13 16:00:02 +01:00 |
Jan Steemann
|
0a2e39085f
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2013-12-13 15:59:15 +01:00 |
Jan Steemann
|
ed927d26c8
|
split big group of statistics into 2 separate groups
|
2013-12-13 15:58:59 +01:00 |
Heiko Kernbach
|
72a9d6f14f
|
icons
|
2013-12-13 15:52:20 +01:00 |
Heiko Kernbach
|
fc9038dcfa
|
changed icons to new arango icon set
|
2013-12-13 15:44:09 +01:00 |
Heiko Kernbach
|
05976d1072
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2013-12-13 13:56:24 +01:00 |
Michael Hackstein
|
05a2baff05
|
The right-click context menu is now disabled in context of the SVG
|
2013-12-13 13:06:22 +01:00 |
Jan Steemann
|
b624d42e2e
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2013-12-13 12:38:59 +01:00 |
Heiko Kernbach
|
839112dbad
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2013-12-13 12:36:17 +01:00 |
Jan Steemann
|
865b70862e
|
some minor adjustments for arangodump and arangorestore
|
2013-12-13 11:54:00 +01:00 |
Jan Steemann
|
69a462e785
|
some minor adjustments for arangodump and arangorestore
|
2013-12-13 11:52:52 +01:00 |
Michael Hackstein
|
8624ab3278
|
GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well
|
2013-12-13 11:43:33 +01:00 |
Michael Hackstein
|
07cc648b55
|
Fixed a test in the dispatcher that failed unpredictibly
|
2013-12-13 11:17:03 +01:00 |
Michael Hackstein
|
18d2c3327b
|
GraphVieweri: the abstract Adapter now propagetes a cleanUp call to the general viewer.
|
2013-12-13 11:16:19 +01:00 |
Michael Hackstein
|
bb1abbac72
|
GraphViewer: Implemented passing around the graphviewer object through adapters, required for reseting
|
2013-12-13 10:44:16 +01:00 |
Michael Hackstein
|
e6df75784f
|
GraphViewer Added tests for the graphViewer object ot be passed arround through adapter instances, which is required for reset
|
2013-12-13 10:43:23 +01:00 |
Jan Steemann
|
f0184d2786
|
not sure about the restshardhandler yet
|
2013-12-12 17:51:45 +01:00 |
Michael Hackstein
|
f024bf07a2
|
The Colourlist is now reseted whenever the user picks a different attribute for colouring
|
2013-12-12 17:00:14 +01:00 |
Jan Steemann
|
8eccb0a35f
|
added dispatcher to shardhandler
|
2013-12-12 16:42:25 +01:00 |
Jan Steemann
|
e1fb1f3d14
|
added stub REST API for cluster requests
|
2013-12-12 15:59:16 +01:00 |
Jan Steemann
|
0136a88076
|
Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding
|
2013-12-12 15:26:02 +01:00 |
Jan Steemann
|
897ddca313
|
startup/shutdown modifications
|
2013-12-12 15:25:53 +01:00 |
Max Neunhoeffer
|
857aed7b8f
|
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
|
2013-12-12 13:53:31 +01:00 |
Max Neunhoeffer
|
47a1c315b8
|
First proper draft of ClusterComm library.
|
2013-12-12 13:53:16 +01:00 |
Frank Celler
|
cb300f7964
|
fixed outline-regexp for xemacs and emacs
|
2013-12-12 12:11:11 +01:00 |
Frank Celler
|
d1061d47c8
|
fixed outline-regexp for xemacs, needs to be tests on emacs again
|
2013-12-12 12:10:06 +01:00 |
Jan Steemann
|
5b0713af9c
|
added recursive watches and structured get
|
2013-12-12 11:16:41 +01:00 |
Jan Steemann
|
7409f87a73
|
clang++ vs g++
|
2013-12-12 10:38:05 +01:00 |
Jan Steemann
|
213f6e01fb
|
fixed c11 warning
|
2013-12-12 10:36:38 +01:00 |
Max Neunhoeffer
|
d11a1ac2d3
|
Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding
|
2013-12-12 10:24:50 +01:00 |
Max Neunhoeffer
|
df8b52f08f
|
Fix arangom.
|
2013-12-12 10:24:27 +01:00 |