Heiko Kernbach
|
812b93d9d0
|
merge
|
2014-06-10 15:21:47 +02:00 |
Heiko Kernbach
|
eb08541171
|
foxx apps install now via github
|
2014-06-10 15:21:27 +02:00 |
Thomas Schmidts
|
055618408b
|
Changes in the Http Interface in Gitbook
|
2014-06-10 14:18:04 +02:00 |
gschwab
|
866709a434
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-06-10 13:30:13 +02:00 |
gschwab
|
4bcca3408a
|
- added function to remove a single edge definition from a graph\n- some docu
|
2014-06-10 13:30:07 +02:00 |
Frank Celler
|
ca5a3ba908
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-10 13:16:20 +02:00 |
Frank Celler
|
4354d3e77c
|
added example-users
|
2014-06-10 13:16:05 +02:00 |
Frank Celler
|
4c09448d28
|
result is no longer used
|
2014-06-10 13:15:27 +02:00 |
scottashton
|
6649fc5819
|
fixed test
|
2014-06-10 13:06:43 +02:00 |
scottashton
|
d70688c61f
|
stabilized tests
|
2014-06-10 11:55:43 +02:00 |
Frank Celler
|
801cc84ce2
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-06 17:48:31 +02:00 |
Frank Celler
|
b0b7be5c28
|
added ~ and | markers
|
2014-06-06 17:48:04 +02:00 |
Thomas Schmidts
|
cfb9d4c18d
|
added folding for gitbook
|
2014-06-06 17:31:56 +02:00 |
Michael Hackstein
|
b1ccec61b2
|
Improved new documentation generator. It now injects code from examples correctly
|
2014-06-06 16:38:11 +02:00 |
Michael Hackstein
|
af735550fb
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-06 16:32:35 +02:00 |
Michael Hackstein
|
e13164e247
|
Fixed duplicated names for examples
|
2014-06-06 16:32:32 +02:00 |
Thomas Schmidts
|
7674e5eabf
|
Even more syntax changes in gitbook
|
2014-06-06 16:28:17 +02:00 |
gschwab
|
dda28bc102
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-06-06 15:41:50 +02:00 |
gschwab
|
ee46c3bdaa
|
fixed jslint
|
2014-06-06 15:41:46 +02:00 |
gschwab
|
682d85a948
|
renaming of getIn/OutVertex to getFrom/ToVertex, documentation
|
2014-06-06 15:40:51 +02:00 |
Michael Hackstein
|
0fc0d74e6b
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-06 15:40:49 +02:00 |
Michael Hackstein
|
fdb79e26d1
|
The foxx manager now throws a more useful error if the fetched file is already on the server
|
2014-06-06 15:40:19 +02:00 |
Heiko Kernbach
|
90c89754fa
|
userManagementViewSpec added
|
2014-06-06 15:34:31 +02:00 |
Heiko Kernbach
|
abe2481363
|
merge
|
2014-06-06 15:32:26 +02:00 |
Heiko Kernbach
|
0f21f69082
|
userManagementViewSpec added
|
2014-06-06 15:32:07 +02:00 |
Frank Celler
|
b6aee8fce1
|
added define for random vs rand
Conflicts:
CHANGELOG
VERSION
build.h
configure
configure.ac
|
2014-06-06 15:13:15 +02:00 |
Frank Celler
|
b395ecc15b
|
changed eol
|
2014-06-06 15:11:49 +02:00 |
Frank Celler
|
c2dbce8290
|
fixed null
|
2014-06-06 15:10:45 +02:00 |
Frank Celler
|
315232f2c8
|
fixed order of checks
|
2014-06-06 15:10:27 +02:00 |
Michael Hackstein
|
55efd34aab
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-06 15:00:32 +02:00 |
Michael Hackstein
|
920cf4b7c3
|
Added fetchFromGithub to server-side foxx manager. Makes it a lot easier to update an already installed foxx from aardvark
|
2014-06-06 15:00:26 +02:00 |
Esteban Lombeyda
|
86bf6ad529
|
Bug Fix update-by-example in Coordinator
|
2014-06-06 14:18:15 +02:00 |
Esteban Lombeyda
|
b848ff00b5
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-06 10:55:11 +02:00 |
Thomas Schmidts
|
27ef5033a9
|
Some syntax fixes
|
2014-06-06 01:23:18 +02:00 |
Thomas Schmidts
|
605faf621e
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-05 23:23:15 +02:00 |
Thomas Schmidts
|
85c72b485e
|
Some changes in the Summary and new chronological order
|
2014-06-05 23:20:23 +02:00 |
Jan Steemann
|
797ef2e2ca
|
slightly changed return values in TRI_ExtractShapedJsonVocShaper
|
2014-06-05 22:28:27 +02:00 |
Jan Steemann
|
6344bb5a1e
|
merge
|
2014-06-05 22:28:19 +02:00 |
Jan Steemann
|
17981a92c2
|
more barriers
Conflicts:
arangod/V8Server/v8-vocbase.cpp
|
2014-06-05 22:23:48 +02:00 |
Jan Steemann
|
fd7f288a59
|
added test case for shape movements
|
2014-06-05 22:23:02 +02:00 |
Michael Hackstein
|
87b4124dfc
|
Updated fluent AQL query interface documentation
|
2014-06-05 17:36:12 +02:00 |
scottashton
|
e6b4fff2f4
|
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
|
2014-06-05 16:59:53 +02:00 |
scottashton
|
fe621c1723
|
finished measurements
|
2014-06-05 16:59:43 +02:00 |
Esteban Lombeyda
|
7171c91c03
|
renaming tests
|
2014-06-05 16:29:24 +02:00 |
Frank Celler
|
c8fc7f00c3
|
splitted arangod into prog and lib
|
2014-06-05 16:11:38 +02:00 |
Esteban Lombeyda
|
78e8b56117
|
cleaning
|
2014-06-05 16:01:58 +02:00 |
Frank Celler
|
2cfb2e0577
|
fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview
Conflicts:
CHANGELOG
lib/ShapedJson/shape-accessor.cpp
lib/ShapedJson/shape-accessor.h
|
2014-06-05 15:58:19 +02:00 |
Thomas Schmidts
|
d9ac4e1164
|
small spelling error
|
2014-06-05 15:47:09 +02:00 |
Michael Hackstein
|
8b7b485f74
|
Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
|
2014-06-05 14:58:10 +02:00 |
Michael Hackstein
|
30a1ebd3b7
|
Improved FluentAQL documentation for general graph module
|
2014-06-05 14:57:45 +02:00 |