1
0
Fork 0
Commit Graph

1791 Commits

Author SHA1 Message Date
Jan Steemann c16ddedc83 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/modules/org/arangodb/aql-helper.js
	js/server/tests/shell-skiplist-index.js
2014-09-09 22:18:52 +02:00
Alan Plum b0995dfdb7 Replaced PBKDF2_HMAC with PBKDF2_HMAC_SHA1 for OSX compat. 2014-09-08 14:32:40 +02:00
Jan Steemann cf4deda835 fixed jsunity 2014-09-08 11:44:20 +02:00
Alan Plum 469af580e5 Added PBKDF2-HMAC. 2014-09-05 16:23:37 +02:00
Willi Goesgens 4b41b449f5 JSUnity: add stacktraces to failing assertions; this way you can get the line in your test better. 2014-09-05 11:49:05 +02:00
Frank Celler 4ffec6e914 tried to silence rpmlint: remove empty files, remove unused scripts, fixed initgroups, fixed identical files, remove __DATE__
Conflicts:
	CHANGELOG
	Makefile.in
2014-09-05 09:28:21 +02:00
Alan Plum 4c5f448aae Added tests for JWT HS384/HS512. 2014-09-04 23:23:25 +02:00
Alan Plum 4e3659c01a Added support for sha384, sha512. 2014-09-04 23:17:58 +02:00
Alan Plum 39ba358cd8 Added JWT support for session headers. 2014-09-04 18:51:06 +02:00
Alan Plum 37888a98ea Pass on null queries. 2014-09-03 11:39:02 +02:00
Alan Plum 33db483e7f Support AQB instances as query strings. 2014-09-03 11:36:55 +02:00
Alan Plum 46747e9ac4 Fixed console.log for non-objects. 2014-09-03 11:25:20 +02:00
Frank Celler 070326f4e2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-03 10:32:30 +02:00
Frank Celler e764896cba fixed loading of modules and usage of strict 2014-09-03 10:32:21 +02:00
Alan Plum b384563d97 Linting: tutorial, changes. 2014-09-02 22:21:45 +02:00
Alan Plum e86c98dfe2 Enabled unused: true, ported aardvark jslint to jshint. 2014-09-02 22:18:18 +02:00
Alan Plum 7b24bdba8d Enabled strict: true. 2014-09-02 22:16:07 +02:00
Alan Plum 606da1e3e8 Removed jslint headers from server/client/common modules. 2014-09-02 22:14:56 +02:00
Alan Plum 3156a245f6 Stricter jshintrc. 2014-09-02 22:12:46 +02:00
Alan Plum 6a3386e55a Fixed jshint headers. 2014-09-02 22:12:45 +02:00
Alan Plum b665e038be Switched jslint to jshint. Broke everything. 2014-09-02 22:10:24 +02:00
Jan Steemann cd1d0c45f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-query.cpp
2014-08-27 19:25:37 +02:00
Jan Steemann cda10393f5 some traversal speedups 2014-08-27 18:56:51 +02:00
Alan Plum 601c99c6e5 Linting. 2014-08-25 20:01:18 +02:00
Alan Plum 898fad4980 Added support for JWT alg: 'none'. 2014-08-25 18:35:23 +02:00
Alan Plum d37b13ee0f Implemented crypto.jwtEncode/jwtDecode (HS256 only). 2014-08-25 18:25:48 +02:00
Jan Steemann a70a9613f6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	lib/BasicsC/voc-errors.h
2014-08-22 21:51:38 +02:00
Alan Plum 501735c78b Keep legacy users API backwards-compatible. 2014-08-20 14:19:08 +02:00
Alan Plum 9da4255c16 Fixed shell-users tests. 2014-08-20 11:27:27 +02:00
Alan Plum fefe0d0e6d Replaced org/arangodb/users internals with users app compatible format. 2014-08-20 11:10:50 +02:00
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Jan Steemann f8cf5dc26d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-15 18:47:18 +02:00
Jan Steemann 2a2c76770c need to ALWAYS create a new environment. Otherwise results are somewhat non-deterministic 2014-08-15 17:35:46 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
2014-08-13 16:29:57 +02:00
Frank Celler 3111d7cc4c relaxed % and escaping 2014-08-12 15:49:33 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Jan Steemann c7e2ccee51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-05 10:13:03 +02:00
Jan Steemann 0e8949f8b3 unify function behavior in shell and server 2014-08-05 09:07:28 +02:00
Alan Plum 069644a2e4 Added flatten method. 2014-08-01 20:02:54 +02:00
Alan Plum d9b80d5ae1 Added exponential back-off helper. 2014-08-01 20:02:53 +02:00
Michael Hackstein 83d49c0d9d Fixed a minor bug where it was not allowed to remove a vertex from a graph by its key 2014-07-30 09:41:57 +02:00
Michael Hackstein 516fdaa3dc Added a cleanup before empty graph test 2014-07-25 16:04:59 +02:00
Michael Hackstein 28f2ca58ac Added a regression test for restricted edges on non existing edges. Yes 2014-07-25 16:04:29 +02:00
Frank Celler 026121dadd fixed sandbox 2014-07-24 16:06:06 +02:00
Frank Celler 55e1ee43bd added createLocations 2014-07-24 16:06:06 +02:00
Alan Plum 05ce0037da Fixed printRecursive for null. 2014-07-24 15:56:27 +02:00
Alan Plum e7e9ec33c5 Handle Object.create(null). 2014-07-23 16:29:48 +02:00
Alan Plum 80070b9e83 Allow printing any object recursively that doesn't override toString. 2014-07-23 16:15:04 +02:00
gschwab 0df37812e2 initial check in 2014-07-23 13:39:16 +02:00
Jan Steemann e7c18b40a6 fixed statistics interval 2014-07-23 11:39:15 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Jan Steemann b36ad17cc6 finished --wal.suppress-shape-information 2014-07-22 15:16:49 +02:00
Michael Hackstein 3ecae27acd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-15 16:57:33 +01:00
Michael Hackstein db33dd22d2 Fixed a minor bug in gharial where there was no correct error code was thrown when trying to store a vertex in a non existing graph. Also allowed the _create method of graph module to take options like waitForSync 2014-07-15 16:57:24 +01:00
Thomas Schmidts f4e60b7315 Fixed too long line 2014-07-11 09:29:31 +02:00
Thomas Schmidts de75804367 Chapters are color-coded in the documentation. Also bug fixed for Safari 2014-07-10 16:33:47 +02:00
Michael Hackstein 608dd475f6 Fixed an error in a general graph example 2014-07-10 13:38:16 +02:00
Michael Hackstein 8cf3a41a0c Used documentation generation commands in general graph documentation 2014-07-09 09:58:04 +02:00
Michael Hackstein b0722d9981 FIxed a bug in an example 2014-07-08 17:36:16 +02:00
Michael Hackstein c3a9335621 General graph module now allows to drop the collection alongside the definition of a graph 2014-07-08 17:30:14 +02:00
Michael Hackstein 1f795fec66 Improved gharial and general graph documentation. Gharial now documents waitForSync, keepNull and if-match 2014-07-08 17:18:15 +02:00
Michael Hackstein c9b14f9413 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 16:02:06 +02:00
Michael Hackstein 47d092cc3c Removed commented debug output 2014-07-08 16:02:01 +02:00
Thomas Schmidts c9ece0af5c @startDocuBlock removed from non used code block 2014-07-08 15:40:30 +02:00
Michael Hackstein bbda062747 Fixed a minor bug when updating the edge definitions. The currently referenced graph object was not updated properly, the stored one was. 2014-07-08 15:23:59 +02:00
Michael Hackstein 4cf8df05dc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 13:53:43 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Frank Celler e436ecfa40 if a cancelation has occured, flush the module cache 2014-07-08 11:54:53 +02:00
Michael Hackstein 9c452b826c Fixed a bug where collections where dropped although they were used as orphans in other graphs 2014-07-08 09:50:30 +02:00
Frank Celler 0703809e00 added isIP 2014-07-07 18:46:02 +02:00
Thomas Schmidts 19e750b35f Fixed some small errors in @startDocuBlock 2014-07-07 16:58:26 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
scottashton 866604f93d jslinted 2014-07-07 14:47:14 +02:00
scottashton 64a72ed12b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-07 14:22:41 +02:00
scottashton c5bfe5a33c changed gharial to match php api 2014-07-07 14:21:58 +02:00
Jan Steemann c12df38eb2 fixed broken examples 2014-07-06 02:25:19 +02:00
Jan Steemann 158cdd1c7a improved printing of cursors 2014-07-06 00:44:37 +02:00
Jan Steemann 27c106e1f2 removed debug output 2014-07-03 18:51:50 +02:00
Jan Steemann cbf7e27f68 added derived files 2014-07-03 17:12:56 +02:00
Jan Steemann 7554ead5d4 fixed recovery 2014-07-03 16:58:10 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann eae94f97a8 removed dead code 2014-07-02 00:21:58 +02:00
Jan Steemann 0d6ecea63f removed debug output 2014-07-01 15:58:51 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Alan Plum edf850ce87 Formatting, whitespace. 2014-06-30 17:43:59 +02:00
gschwab 76d6188a34 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 14:37:39 +02:00
Thomas Schmidts 6a12940da0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-30 14:07:29 +02:00
gschwab 9bd7d0bb87 fixed orphan prob 2014-06-30 13:39:02 +02:00
Jan Steemann 6d5da6d834 fixed test 2014-06-30 13:28:26 +02:00
Jan Steemann d6a93a5535 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-30 13:07:56 +02:00
Jan Steemann bda2db16da recovery and replication 2014-06-30 13:07:48 +02:00
Max Neunhoeffer 48762f3cc2 Add disabled tests.
Disable shell-readonly test on server.
2014-06-30 12:45:10 +02:00
Thomas Schmidts 7d0ab74085 Fixes make examples error 2014-06-30 11:47:42 +02:00
Thomas Schmidts 52ad8fc702 Some changes in the documentation code for gitbook 2014-06-30 09:29:02 +02:00
Jan Steemann 0860012140 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-27 19:11:50 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00