Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
25,102 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

9737 Commits

Author SHA1 Message Date
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Jan Steemann a15c18572f fixed test, added more tests 2016-01-04 19:33:18 +01:00
Jan Steemann 10f97380be updated documentation 2016-01-04 19:10:41 +01:00
Jan Steemann 7b20e8da84 fixed typo 2016-01-04 16:37:01 +01:00
Jan Steemann c788cf9776 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-04 16:31:29 +01:00
Jan Steemann 555a0286c2 make merging configurable in update-by-example API 2016-01-04 16:31:06 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Jan Steemann 0d4874a2c9 added derived file 2016-01-04 15:07:04 +01:00
Jan Steemann 76577f4332 fix inclusion of .arangosh.rc 2016-01-04 14:51:39 +01:00
jsteemann c20cf66e93 add cacheability info for explain 2016-01-03 00:52:36 +01:00
jsteemann 9b64efbc11 added generated file 2015-12-29 15:58:29 +01:00
Alan Plum bdee7f3309 Fix cluster test 
The implementation of `_.clone` in underscore naively clones all properties including inherited ones.
As lodash does The Right Thing and ignores the prototype, we need to flatten the object first.
 2015-12-29 13:44:00 +01:00
Alan Plum 9ecc710491 Avoid _.clone 
Lodash's clone is subtlely different from underscore's and breaks with ShapedJson.
 2015-12-23 23:30:56 +01:00
Alan Plum de9ae5128a underscore -> lodash 2015-12-23 23:30:55 +01:00
Alan Plum a1b816e4f3 Update copyright headers 2015-12-23 23:30:43 +01:00
Alan Plum 840c432904 org/arangodb -> @arangodb in Foxx generator 2015-12-23 23:25:50 +01:00
hkernbach 31b23283b1 webui dashboard: graph display bugfix 2015-12-23 21:41:09 +01:00
hkernbach e649ea9522 fixed several bugs during the dashboard initialize process 2015-12-23 17:27:28 +01:00
Max Neunhoeffer 394057fbda Merge branch 'devel' into vpack 2015-12-23 15:09:20 +01:00
Jan Steemann 8781c2d05d added tests 2015-12-23 14:38:48 +01:00
Max Neunhoeffer 9796661ede Make entropy test less sensitive. 2015-12-23 14:12:57 +01:00
Jan Steemann 887e93babc index handling fixes 2015-12-23 14:01:14 +01:00
Max Neunhoeffer 3996d2e6a2 Merge branch 'devel' into vpack 2015-12-23 08:35:59 +01:00
jsteemann 3d6582ed52 micro optimizations 2015-12-22 21:58:20 +01:00
jsteemann 3bcc5cd193 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 20:34:55 +01:00
hkernbach 05cdfb43dc web ui wrong usage of arango notification in document view 2015-12-22 18:17:25 +01:00
Jan Steemann 5aebcbd91d Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:05:35 +01:00
Jan Steemann 6e3878ec94 changed behavior of [*] operator, added COLLECTION_COUNT internal function 2015-12-22 18:03:59 +01:00
Jan Steemann c0f720dd42 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-22 18:03:03 +01:00
hkernbach 64eb028ba3 web ui better usability when creating dbs, issue: #1623' 2015-12-22 17:50:45 +01:00
hkernbach 65ed4432cf web ui modal view bugfix 2015-12-22 16:54:30 +01:00
hkernbach f3ac092c9c web ui db view event bugfix 2015-12-22 15:27:12 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
hkernbach 3946ba265d web ui database view tiles event fix 2015-12-22 12:21:55 +01:00
Alan Plum cad8c3841a Replace exportCache with app.main.loaded 2015-12-21 19:30:15 +01:00
Alan Plum ff23c28a44 Invalidate export cache when app is reloaded 2015-12-21 19:27:16 +01:00
hkernbach 7053d0d727 grunt build 2015-12-21 18:03:38 +01:00
Max Neunhoeffer 61fe51072c Merge branch 'devel' into vpack 2015-12-21 15:22:46 +01:00
Max Neunhoeffer 3de9b9c47a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2015-12-21 15:21:24 +01:00
Max Neunhoeffer 8ce0a484e1 Fix graph traversal tests, behaviour and documentation. 2015-12-21 15:20:56 +01:00
hkernbach 185907c859 web ui database view used wrong id for binding events 2015-12-21 13:33:51 +01:00
Michael Hackstein 58f3a55ea0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-12-21 13:25:07 +01:00
Michael Hackstein 60df6b70fc Moved traveral tests into the correct suite. This caused the build to fail 2015-12-21 13:25:02 +01:00
hkernbach 374bdde9e4 web ui user management click event fix 2015-12-21 13:22:29 +01:00
hkernbach 10a736ed2a web ui dashboard broken url fix 2015-12-21 13:03:02 +01:00
hkernbach cd24e847c5 webui dashboard css fix 2015-12-21 13:02:54 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
Jan Steemann 3cfd8214a9 handle id and isSystem when creating collections 2015-12-18 20:16:39 +01:00
Jan Steemann 36eac6ffd0 fixed index selection in some queries 2015-12-18 20:16:09 +01:00
hkernbach e2b3b16bf1 scss 2015-12-18 18:35:35 +01:00