Jan Steemann
48e3a5828c
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
CHANGELOG
2014-01-31 11:31:09 +01:00
Jan Steemann
ac9c701e0a
updated CHANGELOG
2014-01-31 02:10:11 +01:00
Jan Steemann
ea7772295b
issue #755
2014-01-31 02:02:25 +01:00
Jan Steemann
e9c5af7895
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
CHANGELOG
js/apps/system/aardvark/frontend/css/collectionsView.css
js/apps/system/aardvark/frontend/css/layout.css
js/apps/system/aardvark/frontend/js/routers/router.js
2014-01-30 19:40:21 +01:00
Jan Steemann
0a2d61a42a
added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc.
2014-01-28 01:51:27 +01:00
Jan Steemann
7f240a1625
fixed segfault in import API
2014-01-27 16:12:39 +01:00
Jan Steemann
d6fe936189
updated CHANGELOG
2014-01-27 12:36:46 +01:00
Jan Steemann
df1ce45e15
issue #751 : Create database through API should return HTTP status code 201
2014-01-27 08:54:36 +01:00
Frank Celler
b5905a293b
Merge remote-tracking branch 'origin/1.4' into devel
...
Conflicts:
CHANGELOG
Documentation/RefManual/Actions.md
Documentation/UserManual/Foxx.md
Documentation/UserManual/UserManual.md
lib/ProgramOptions/program-options.c
2014-01-25 22:30:04 +01:00
Frank Celler
116873c041
check for null pointer for ROOTDIR
2014-01-25 21:09:16 +01:00
Frank Celler
6679995e76
Merge remote-tracking branch 'origin/1.4' into devel
...
Conflicts:
CHANGELOG
Documentation/man/man1/arangob.1
Documentation/man/man1/arangodump.1
Documentation/man/man1/arangoimp.1
Documentation/man/man1/arangorestore.1
Documentation/man/man1/arangosh.1
Documentation/man/man8/arango-dfdb.8
Documentation/man/man8/arangod.8
Documentation/man/man8/foxx-manager.8
Documentation/man/man8/rcarangod.8
Makefile.in
VERSION
aclocal.m4
build.h
config/config.guess
config/config.sub
config/missing
configure
configure.ac
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/system.json
js/server/bootstrap/module-internal.js
js/server/modules/org/arangodb/actions.js
js/server/modules/org/arangodb/foxx/authentication.js
js/server/modules/org/arangodb/foxx/manager.js
lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 22:24:20 +01:00
Frank Celler
fdee836023
release version 1.4.7
2014-01-23 17:13:52 +01:00
Jan Steemann
0e061e8735
updated CHANGELOG
2014-01-23 16:50:01 +01:00
Jan Steemann
587c2aef64
issue #744
...
Conflicts:
lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 09:58:18 +01:00
Jan Steemann
a9b579f1b1
issue #744
2014-01-23 09:47:22 +01:00
Jan Steemann
b5ba025c38
updated CHANGELOG
2014-01-21 13:40:38 +01:00
Jan Steemann
f6b872e01c
updated CHANGELOG
2014-01-21 13:38:32 +01:00
Frank Celler
251c2fa448
release version 1.4.6
2014-01-20 22:09:44 +01:00
Jan Steemann
eba5f47f61
updated CHANGELOG
2014-01-18 00:16:58 +01:00
Jan Steemann
6e166c63ae
allow direct access from the `db` object to collections whose names start with an underscore (e.g. db._users).
...
Previously, access to such collections via the `db` object was possible from arangosh, but not from arangod (and thus Foxx and actions). The only way to access such collections from these places was via the `db._collection(<name>)` workaround.
2014-01-18 00:16:13 +01:00
Jan Steemann
583878176b
issue #736 : AQL function to parse collection and key from document handle
...
Conflicts:
CHANGELOG
2014-01-17 23:13:06 +01:00
Jan Steemann
9f69aae986
issue #736 : AQL function to parse collection and key from document handle
2014-01-17 22:39:04 +01:00
Jan Steemann
167e0a60d7
updated CHANGELOG
2014-01-17 22:04:39 +01:00
Jan Steemann
0bbbd53d4d
added fm.rescan() method
...
Conflicts:
CHANGELOG
2014-01-17 14:06:27 +01:00
Jan Steemann
c7380398d9
added fm.rescan() method
2014-01-17 14:04:10 +01:00
Frank Celler
d0c05f6628
fixed issue #734 : foxx cookie and route problem
2014-01-16 14:16:47 +01:00
Frank Celler
f56ac27dc9
Merge remote-tracking branch 'origin/1.4' into devel
...
Conflicts:
CHANGELOG
CMakeLists.txt
GNUmakefile
Makefile.in
VERSION
arangod/V8Server/ApplicationV8.cpp
build.h
configure
configure.ac
js/actions/api-foxx.js
js/apps/system/aardvark/api-docs.json
js/apps/system/aardvark/api-docs/batch.json
js/apps/system/aardvark/api-docs/collection.json
js/apps/system/aardvark/api-docs/cursor.json
js/apps/system/aardvark/api-docs/database.json
js/apps/system/aardvark/api-docs/document.json
js/apps/system/aardvark/api-docs/edge.json
js/apps/system/aardvark/api-docs/edges.json
js/apps/system/aardvark/api-docs/endpoint.json
js/apps/system/aardvark/api-docs/graph.json
js/apps/system/aardvark/api-docs/index.json
js/apps/system/aardvark/api-docs/job.json
js/apps/system/aardvark/api-docs/replication.json
js/apps/system/aardvark/api-docs/simple.json
js/apps/system/aardvark/api-docs/system.json
js/apps/system/aardvark/api-docs/traversal.json
lib/BasicsC/locks-win32.c
2014-01-16 08:53:31 +01:00
Jan Steemann
065a780cf2
updated CHANGELOG
...
Conflicts:
CHANGELOG
2014-01-15 18:20:32 +01:00
Jan Steemann
f60da45340
updated CHANGELOG
2014-01-15 18:07:05 +01:00
Frank Celler
39ea33a68e
release version 1.4.5
2014-01-15 14:35:35 +01:00
Frank Celler
8bed67d1ee
fixed issue #716
2014-01-13 18:28:45 +01:00
Jan Steemann
ea9765ed24
updated CHANGELOG
2014-01-13 17:30:35 +01:00
Jan Steemann
193ac28e71
updated CHANGELOG
2014-01-13 17:29:31 +01:00
Frank Celler
9a68feaa98
release version 1.4.5-rc2
2014-01-13 14:34:55 +01:00
Jan Steemann
7d11d1b172
updated documentation
2014-01-10 18:38:34 +01:00
Jan Steemann
e0aea2c04d
updated documentation
2014-01-10 18:37:41 +01:00
Michael Hackstein
3055631c04
Removed duplaced entry
2014-01-10 17:36:49 +01:00
Jan Steemann
c9f91f0da2
updated CHANGELOG
2014-01-10 16:47:26 +01:00
Jan Steemann
f95a0dc6c1
defer evaluation of subqueries
2014-01-10 16:45:36 +01:00
Jan Steemann
a9c2dcc83d
Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4
...
Conflicts:
CHANGELOG
2014-01-10 16:43:18 +01:00
Jan Steemann
dc8fdf8ca0
defer evaluation of subqueries
2014-01-10 16:42:46 +01:00
Michael Hackstein
559da90498
Updated Changelog
2014-01-10 16:02:25 +01:00
Michael Hackstein
9befe8dae1
Updated CHANGELOG
2014-01-10 16:01:18 +01:00
Jan Steemann
4aa6ca903b
updated CHANGELOG
2014-01-06 12:47:13 +01:00
Jan Steemann
04f1f0bacd
updated CHANGELOG
2014-01-06 12:46:26 +01:00
Frank Celler
5455f2eeee
release version 1.4.5-rc1
2014-01-03 15:00:51 +01:00
Jan Steemann
ca41447af3
updated CHANGELOG
2014-01-03 13:47:23 +01:00
Jan Steemann
69bcb359e4
updated CHANGELOG
2014-01-03 13:46:26 +01:00
Jan Steemann
e2fca1bc18
updated CHANGELOG
2014-01-03 12:14:05 +01:00
Frank Celler
8dbdf55165
Merge remote-tracking branch 'origin/1.4' into devel
...
Conflicts:
CHANGELOG
arangosh/ArangoShell/ArangoClient.cpp
2013-12-30 17:27:17 +01:00