Max Neunhoeffer
f7e57a5b47
Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
js/apps/system/aardvark/frontend/scss/generated.css
js/apps/system/aardvark/manifest.json
lib/Rest/EndpointIp.cpp
lib/Rest/EndpointUnixDomain.cpp
lib/V8/v8-utils.cpp
2014-02-21 15:28:21 +01:00
Jan Steemann
211b0da24b
moved options --server.reuse-address and --server.no-reuse-address into ApplicationEndpointServer
2014-02-21 14:44:18 +01:00
Frank Celler
b01d9d77e7
Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding
...
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangod/V8Server/ApplicationV8.cpp
arangod/V8Server/ApplicationV8.h
arangod/V8Server/v8-actions.cpp
js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
js/apps/system/aardvark/frontend/scss/generated.css
js/server/version-check.js
lib/Dispatcher/Job.h
lib/GeneralServer/GeneralServerJob.h
2014-02-20 21:02:07 +01:00
Jan Steemann
68707cabad
better error message if keyfile cannot be found
2014-02-20 18:06:25 +01:00
Jan Steemann
c38c038492
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
...
Conflicts:
CHANGELOG
js/apps/system/aardvark/frontend/css/collectionsItemView.css
js/apps/system/aardvark/frontend/css/graphlayout.css
2014-02-06 13:18:52 +01:00
Jan Steemann
0087a5a877
issue #756 : white-listed `server` header
2014-02-05 09:12:03 +01:00
Jan Steemann
79190570ba
issue #756 : set access-control-expose-headers on CORS response
...
the following HTTP headers are now whitelisted by ArangoDB in CORS responses:
- etag
- content-encoding
- content-length
- location
- x-arango-errors
- x-arango-async-id
2014-02-04 18:09:58 +01:00
Max Neunhoeffer
6c36c268f0
Improve debugging output of ClusterComm asynchronous requests.
2014-01-03 09:36:37 +01:00
Max Neunhoeffer
5d51d7b3ba
Get rid of many debugging messages.
2013-12-30 14:49:14 +01:00
Max Neunhoeffer
fec0c20012
Sort out one more allocation/deallocation issue.
2013-12-27 14:29:25 +01:00
Max Neunhoeffer
62976629f0
Various memory leaks and callback improvements.
2013-12-27 13:15:52 +01:00
Max Neunhoeffer
c9b2884def
Full round trip implemented but not yet working.
2013-12-23 16:19:59 +01:00
Jan Steemann
16e16f705c
some bugfixes for asyncRequest etc
2013-12-20 18:03:55 +01:00
Jan Steemann
8fa172f03c
added callbacks for async requests
2013-12-17 13:51:07 +01:00
Jan Steemann
f0184d2786
not sure about the restshardhandler yet
2013-12-12 17:51:45 +01:00
Jan Steemann
e1382dd255
added detailed HTTP request statistics
2013-10-31 16:39:59 +01:00
Jan Steemann
4f50b98c45
removed second logger implementation
2013-10-30 00:38:25 +01:00
Jan Steemann
43b4f78b62
issue #620
2013-10-28 19:38:19 +01:00
Jan Steemann
d89a1de20a
fetch time outside of lock
2013-10-20 23:08:47 +02:00
Jan Steemann
b8318609e2
updated arangorestore
2013-10-10 16:58:21 +02:00
Jan Steemann
857c69d5a6
added `--server.allow-method-override` startup option
2013-10-08 17:06:42 +02:00
Jan Steemann
46a295ba43
fixed some Windows warnings
2013-10-08 12:39:47 +02:00
Jan Steemann
709198c340
updated docs for /_api/jobs
2013-09-28 00:44:03 +02:00
Jan Steemann
18663e7124
async job management
2013-09-26 18:45:20 +02:00
Jan Steemann
e3d9d95f3f
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
Conflicts:
arangod/RestServer/ArangoServer.cpp
lib/Admin/ApplicationAdminServer.cpp
lib/GeneralServer/GeneralServerDispatcher.h
2013-09-26 17:46:05 +02:00
Jan Steemann
5a422becd8
async job management
2013-09-26 17:30:03 +02:00
Jan Steemann
106fedd615
several errors fixed
2013-09-26 09:44:50 +02:00
Jan Steemann
97afd329ff
updated documentation
2013-09-24 18:22:38 +02:00
Jan Steemann
7f9f5ef000
added documentation
2013-09-23 17:06:51 +02:00
Jan Steemann
1bf82999b9
endpoints handling
2013-09-23 14:26:09 +02:00
Jan Steemann
2e75c872f4
persist list of endpoints
2013-09-23 13:14:54 +02:00
Jan Steemann
6902ae5670
added support for async requests
2013-09-20 12:32:46 +02:00
Jan Steemann
0bdae05b96
changed reference counting for cursors
2013-09-16 13:51:33 +02:00
Jan Steemann
8b5f4e2e65
changed mutex into rw-lock
2013-09-13 11:16:44 +02:00
Jan Steemann
2eb0871813
updated TODOs
2013-09-12 18:46:19 +02:00
Jan Steemann
6ff314de0e
runtime addition and removal of endpoints
2013-09-12 18:07:39 +02:00
Jan Steemann
3a6cabfe44
creating/dropping
2013-09-11 17:16:43 +02:00
Jan Steemann
1c4581c525
fixed batch handler
2013-09-11 13:58:39 +02:00
Jan Steemann
5bc1e5ecea
dropping databases, unfinished
2013-09-11 12:47:27 +02:00
Jan Steemann
05a88d3477
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
2013-09-02 15:58:22 +02:00
Jan Steemann
356482831c
fix ambiguity bug
2013-09-02 15:56:12 +02:00
Jan Steemann
42b8dfca49
added --server.database option for client tools
2013-09-02 13:02:53 +02:00
Jan Steemann
a53c1e493b
multiple database, becoming standard
2013-09-02 09:52:52 +02:00
Jan Steemann
2556b0714f
fixed issues reported by VS 2012
2013-08-29 16:43:56 +02:00
Jan Steemann
4e496b9dc5
migration from /_admin/html to /_admin/aardvark
2013-08-29 13:19:50 +02:00
Jan Steemann
edc71e5424
support for deflate compression
2013-08-28 11:44:49 +02:00
Jan Steemann
0689d5cc5f
removed dead files
2013-08-27 12:47:23 +02:00
Jan Steemann
156f3b0d9e
added upgrade notes
2013-08-22 15:21:21 +02:00
Jan Steemann
9b8b030a8a
added several tests for authentication
2013-08-22 11:18:11 +02:00
Jan Steemann
bfc6648588
added server startup options `--server.disable-replication-logger` and `--server.disable-replication-applier`
2013-08-02 16:17:51 +02:00
Frank Celler
e6acd403ac
updated documentation
2013-07-27 19:59:28 +02:00
Jan Steemann
42fecbdf1a
changed log format
2013-07-05 13:30:12 +02:00
Jan Steemann
d7561e70e1
added logging options
2013-07-02 12:16:13 +02:00
Jan Steemann
659520875b
preparation for better request logging
2013-07-01 15:31:56 +02:00
Jan Steemann
b318c9cec6
updated list of HTTP status codes
2013-07-01 14:32:14 +02:00
Jan Steemann
dcc3de5d81
fixed type declaration (fixes compiler warning)
2013-06-28 15:47:40 +02:00
Jan Steemann
14422986e0
added option --server.authenticate-system-only
2013-06-26 23:23:37 +02:00
Jan Steemann
f6f31667a5
issue #551
2013-06-20 14:57:43 +02:00
Jan Steemann
ca9187854a
added (unconditional) caching for PathHandler
2013-06-20 14:36:39 +02:00
a-brandt
1c0578c2b5
Merge branch 'devel' into multiple_databases
...
Conflicts:
arangod/RestServer/ArangoServer.cpp
arangod/VocBase/vocbase.c
lib/HttpServer/ApplicationEndpointServer.cpp
lib/HttpServer/ApplicationEndpointServer.h
lib/HttpServer/HttpCommTask.h
lib/HttpServer/HttpHandlerFactory.cpp
lib/HttpServer/HttpHandlerFactory.h
lib/Rest/HttpRequest.cpp
lib/Rest/HttpRequest.h
2013-06-03 17:05:01 +02:00
Jan Steemann
af413c3cf0
unified case
2013-05-22 19:14:35 +02:00
Frank Celler
49b5507b73
fixed issue #489 : Bug in aal.install
...
Conflicts:
Makefile.in
2013-05-05 21:10:14 +02:00
Jan Steemann
2c381d5d6a
issue #498
2013-05-02 12:27:06 +02:00
a-brandt
8f52b8916b
vocbase handling
2013-04-22 14:52:46 +02:00
a-brandt
fcae2b2961
added RequestContext
2013-04-17 16:56:48 +02:00
Frank Celler
f810711a79
FreeBSD port
2013-04-02 18:43:10 +02:00
Jan Steemann
909c316e22
added mimetype generation file
2013-03-27 10:11:56 +01:00
Jan Steemann
a0460b5991
issue #120 : added examples for endpoint syntax in `arangod --help`
...
Now showing: `--server.endpoint <string> endpoint for client requests (e.g. "tcp://127.0.0.1:8529", or "ssl://192.168.1.1:8529")`
2013-03-25 15:52:02 +01:00
Frank Celler
1aa5109fa3
updated disclaimer
2013-03-13 17:03:18 +01:00
Jan Steemann
b66a7492b9
addendum for issue #443
2013-03-08 22:30:35 +01:00
Jan Steemann
0a883f4076
merged some changes from trx branch into devel
2013-03-08 14:22:25 +01:00
Jan Steemann
0fb397eabd
adjusted startup output to be more compact, less verbose
2013-03-06 19:05:17 +01:00
Oreste Panaia
fc5e1ba623
merge conflicts with devel
2013-02-28 19:42:58 +08:00
Oreste Panaia
a48696ec28
network modifications required for windows
2013-02-28 17:43:39 +08:00
Jan Steemann
845fada5fe
downgraded log message about unknown suffices
2013-02-23 01:59:28 +01:00
Frank Celler
fe9f10af8d
Merge branch 'devel' of github.com:triAGENS/ArangoDB into 1.2
...
Conflicts:
CHANGELOG
Documentation/Manual/arangodb_1.2_shell_reference_card.pdf
Makefile.in
aclocal.m4
config/compile
config/config.guess
config/config.sub
config/depcomp
config/missing
configure
lib/JsonParser/json-parser.c
2013-02-21 14:21:59 +01:00
Frank Celler
2553b572ab
fixed mode
2013-02-21 14:14:20 +01:00
Oreste Panaia
2c12f63d7f
libev interface
2013-02-19 20:58:21 +08:00
Jan Steemann
86a64db15d
suppress warnings for unknown content-types
2013-02-18 13:37:57 +01:00
Frank Celler
ced7b05cca
added fix for TRI_ENABLE_LOGGING from Jan
2013-02-16 14:03:35 +01:00
Frank Celler
069dcdfc94
changed logging of fatal errors
2013-02-14 16:47:35 +01:00
Jan Steemann
e9e7f96cf6
do not authenticate HTTP OPTIONS requests
2013-01-29 15:43:39 +01:00
Jan Steemann
ae9aa990f3
issue #358 : fixed credentialing in CORS-non-preflight requests, fixed CORS keep-alive issue
2013-01-29 14:32:10 +01:00
Jan Steemann
18dfd61d57
issue #358
2013-01-29 10:32:35 +01:00
Jan Steemann
57403527a9
issue #374
2013-01-28 11:26:58 +01:00
Jan Steemann
085c03609f
issue #358
2013-01-28 09:49:35 +01:00
Jan Steemann
b30f5bde68
issue #358 : added support for CORS
2013-01-26 03:50:28 +01:00
Jan Steemann
17098dd4ef
added support for HTTP OPTIONS method, pt 1
2013-01-25 19:11:33 +01:00
Jan Steemann
876cda6ce1
cppcheck
2013-01-07 22:37:52 +01:00
Frank Celler
503e0ff8fe
fixed merge conflicts
2013-01-02 18:07:57 +01:00
Oreste Panaia
83ded3fc1f
windows fixes
2012-12-20 17:17:30 +08:00
Oreste Panaia
857b66c490
windows version
2012-12-06 20:44:01 +08:00
Jan Steemann
21fa3ed616
small stuff, oom handling etc.
2012-12-04 21:21:26 +01:00
Frank Celler
249492a89c
Merge remote-tracking branch 'origin/1.1' into devel
...
Conflicts:
CHANGELOG
Documentation/Manual/GlossaryCollectionName.md
Documentation/Manual/NewFeatures11.md
Documentation/UserManual/FirstStepsArangoDB.md
VERSION
arangod/Documentation/api-blueprints.dox
arangod/HashIndex/hasharray.c
arangod/RestHandler/RestVocbaseBaseHandler.cpp
arangod/RestServer/ArangoServer.cpp
arangod/V8Server/v8-actions.cpp
arangod/V8Server/v8-vocbase.cpp
arangod/VocBase/compactor.c
arangod/VocBase/document-collection.c
configure.ac
html/admin/js/master.js
js/server/ahuacatl.js
js/server/arango-upgrade.js
lib/BasicsC/voc-errors.h
lib/V8/V8LineEditor.cpp
lib/V8/v8-utils.cpp
2012-11-27 12:34:58 +01:00
Frank Celler
cccb3511c5
fixed documentation again
2012-11-21 17:42:13 +01:00
Frank Celler
18bfd048ef
fixed documentation
2012-11-21 10:58:29 +01:00
Jan Steemann
fa525a309b
fixed invalid usage of content-length
2012-11-20 15:44:02 +01:00
a-brandt
e66daf3f43
bugfix unit tests
2012-10-24 12:36:11 +02:00
Oreste Panaia
4d8d78e880
Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
...
Conflicts:
VisualStudio/Arango Front End Library/Arango Front End Library.vcxproj
arangod/Actions/RestActionHandler.cpp
arangod/RestServer/ArangoServer.cpp
lib/ApplicationServer/ApplicationServer.cpp
2012-10-22 21:04:12 +08:00
Oreste Panaia
aad73db128
various changes for windows
2012-10-22 20:51:31 +08:00