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

10226 Commits

Author SHA1 Message Date
jsteemann 6902c7e53c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-12 11:47:39 +01:00
jsteemann bc1563650b added missing function 2016-03-12 11:47:08 +01:00
Jan Steemann 6d6d2e9e9c do not set useless bind parameters 2016-03-11 19:42:14 +01:00
Jan Steemann 273deddaee Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-11 19:11:58 +01:00
Andreas Streichardt b29c437b7f Add more error info 2016-03-11 18:22:12 +01:00
Max Neunhoeffer 8f6cd501aa Change behaviour of remove(), return data, allow returnOld. 2016-03-11 16:35:55 +01:00
Jan Steemann 11d9451c8c Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-10 19:26:05 +01:00
Max Neunhoeffer a25df3aece Fix jslint problems. 2016-03-10 16:44:44 +01:00
Max Neunhoeffer 6e4a4d1f7b Add babies tests for document API. 2016-03-10 16:28:10 +01:00
Max Neunhoeffer a8ff672ba7 Fix arangosh w.r.t. withdrawn /_api/edge 2016-03-10 13:11:07 +01:00
Max Neunhoeffer df487862a8 Fix some more edge tests. 2016-03-10 13:08:02 +01:00
Frank Celler dd36dd55e6 fixes for windows 2016-03-10 09:25:54 +00:00
Jan Steemann 878865c53a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 17:57:07 +01:00
Alan Plum 075ca6a3a5 Request shouldn't set content-type header to "undefined" 
Fixes #1776.
 2016-03-09 13:10:41 +01:00
Frank Celler 72ff21f526 fixed jshint and shallowCopy 2016-03-09 10:16:34 +01:00
Jan Steemann 329b3d623f Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:24 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Max Neunhoeffer 6ca5132b89 Fix test for edge save. 2016-03-09 09:16:33 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
hkernbach d7070bb090 issue: #1774, grunt 2016-03-08 19:55:22 +01:00
Max Neunhoeffer 7c4d4ab36c Adjust test to (new) behaviour. 2016-03-08 18:46:15 +01:00
Max Neunhoeffer 4452578f5f Fix a test. 2016-03-08 17:46:08 +01:00
Jan Steemann 14a3d02ce7 simple query cleanup 2016-03-07 20:29:04 +01:00
Jan Steemann 4d4ee7e237 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 16:25:15 +01:00
Jan Steemann ba637faea0 do not compare execution times 2016-03-07 11:33:20 +01:00
Jan Steemann def9d86868 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-07 10:51:24 +01:00
Jan Steemann 06c0b3aed8 added derived files 2016-03-07 10:49:39 +01:00
Jan Steemann c6fa638b67 fixed issue #1765, issue #1770 2016-03-07 10:49:18 +01:00
Jan Steemann 92493f2807 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-02 11:04:58 +01:00
hkernbach 22da5c3b13 grunt 2016-03-01 20:07:49 +01:00
hkernbach b048c7b6c8 catch return in bindvars input field 2016-03-01 20:04:13 +01:00
hkernbach c60cfb684d added missing cache call 2016-03-01 19:02:01 +01:00
hkernbach d14108e063 scss lint 2016-03-01 18:43:40 +01:00
hkernbach d26aab4290 grunt 2016-03-01 18:41:30 +01:00
hkernbach 5b601f108a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-03-01 18:39:05 +01:00
hkernbach 6a8988d3f1 scss, added copy to editor function 2016-03-01 18:38:46 +01:00
Frank Celler 261e98bc3a fixed test dir 2016-03-01 17:49:57 +01:00
Frank Celler c88a68358d CMAKE changes for Windows and Solaris 2016-03-01 17:31:30 +01:00
Jan Steemann be80898e97 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 13:17:27 +01:00
hkernbach 0ebf8a2f53 frontend system collection, multiple queries aql editor, styling, grunt 2016-03-01 13:10:37 +01:00
Jan Steemann e0e84b7ea1 Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-01 11:50:48 +01:00
hkernbach f31cee26bd aardvark, grunt 2016-03-01 11:34:56 +01:00
Frank Celler 0d13d6609a renamed to _frontend 2016-03-01 11:25:07 +01:00
hkernbach 87b9e0d7db fixed download query with bind params, scss, included query stats in aql editor 2016-03-01 11:07:57 +01:00
Jan Steemann d122ace96a Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 17:44:37 +01:00
hkernbach 937478137b scss 2016-02-29 17:00:14 +01:00
hkernbach 66574afe15 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-02-29 16:45:57 +01:00
hkernbach 46456b9db5 new query view 2016-02-29 16:45:48 +01:00
Jan Steemann 768d06444f Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-02-29 14:31:27 +01:00
Max Neunhoeffer c2d3352b94 Add first few tests. 2016-02-29 11:41:47 +01:00