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

12948 Commits

Author SHA1 Message Date
Max Kerp 0623f6f4cd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 19:02:55 +02:00
Max Kerp de5bd18056 implemented override of custom queries functionality 2014-05-09 19:02:48 +02:00
Heiko Kernbach 91ee14605c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-09 18:49:33 +02:00
Heiko Kernbach f3665a1943 query view, table css fix, added delete button for custom query 2014-05-09 18:46:41 +02:00
Jan Steemann 3becebf488 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 17:36:42 +02:00
Jan Steemann 82595ee169 improved periodic task management 2014-05-09 17:36:24 +02:00
Frank Celler dbbde35340 Merge branch'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:30:59 +02:00
Frank Celler 13e0d01f6a added application context section 2014-05-09 17:30:35 +02:00
Max Kerp 02842fb19e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:24:16 +02:00
Max Kerp 16600971b2 Working on the custom query manager 2014-05-09 17:23:57 +02:00
Frank Celler 65ad94d9cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:15:11 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Frank Celler 327d669741 fixed safeJoin (missing join) 2014-05-09 17:10:30 +02:00
Max Neunhoeffer 809625a1ad Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-05-09 16:35:26 +02:00
Max Neunhoeffer 19289b6d37 First working version of arangorestore for clusters. 2014-05-09 16:33:54 +02:00
scottashton dfbe827525 more tests 2014-05-09 16:23:17 +02:00
Jan Steemann dfec7b7f3c pass v8 handles by value, not by reference (as recommended in their manual) 2014-05-09 15:23:21 +02:00
Jan Steemann eb73bfb127 make some collections smaller 2014-05-09 15:22:11 +02:00
Jan Steemann 80aea14a00 fixed memory error 2014-05-09 15:05:32 +02:00
scottashton 7433d6bf35 disabled useSSLonCoordinators, currently not supported 2014-05-09 14:15:44 +02:00
Jan Steemann d51c730138 make some system collections smaller 2014-05-09 13:51:14 +02:00
Jan Steemann 92f3f277f1 make some of the system collections smaller 2014-05-09 13:50:08 +02:00
Jan Steemann 91327e1497 fixed jslint warning 2014-05-09 13:31:52 +02:00
Jan Steemann c9d6886dc6 updated CHANGELOG 2014-05-09 12:58:42 +02:00
Jan Steemann d9bdb53b97 updated CHANGELOG 2014-05-09 12:36:27 +02:00
Jan Steemann 7e08e92882 fixed etcd crashes on 32 bit 2014-05-09 12:20:52 +02:00
Jan Steemann 931269245d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 12:18:17 +02:00
Jan Steemann 2eca70e606 fixed timeout overflows on 32 bit 2014-05-09 12:17:57 +02:00
Max Neunhoeffer fb7f28f488 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-09 11:48:21 +02:00
Max Neunhoeffer 21b0264e01 Sort out SSL in PortFinder. 2014-05-09 11:48:06 +02:00
Frank Celler 20479ef320 added missing namespace 2014-05-09 11:00:18 +02:00
Jan Steemann d990652eb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 09:03:57 +02:00
Jan Steemann 3efb22ef4c fixed warning 2014-05-09 09:03:42 +02:00
scottashton 4c376a991d finished tests showClusterView and gained 100% coverage, fixe modal bug in showClusterView 2014-05-09 09:01:32 +02:00
Jan Steemann 20f1940458 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 00:42:32 +02:00
Jan Steemann c843a12149 jshund 2014-05-09 00:42:18 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Michael Hackstein a9bd2b3259 Fixed include order of backbone models and collections 2014-05-08 23:22:15 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Michael Hackstein b7ac696af8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-08 22:41:10 +02:00
Max Neunhoeffer 9b5f015747 Prepare setup for cluster arangorestore. 2014-05-08 22:38:52 +02:00
Michael Hackstein 92f02fbce3 Fixed design bugs in graph viewer 2014-05-08 19:09:17 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
Jan Steemann 2ddfdd8632 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 16:14:42 +02:00
Jan Steemann d2732aa929 don't leak barriers 2014-05-08 16:14:33 +02:00
Frank Celler ec16df4e40 Merge pull request #811 from triAGENS/joins 
Missing description of joins
 2014-05-08 16:06:57 +02:00
scottashton 6a6e92eb5c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 15:16:51 +02:00
scottashton 31355e7aca showClusterView tests 2014-05-08 15:16:45 +02:00
Jan Steemann f18d117228 added GC 2014-05-08 14:36:12 +02:00