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

18026 Commits

Author SHA1 Message Date
Michael Hackstein fd8e3783c9 Fixed a bug with two identically named check boxes and click events that were not correctly unbound 2014-11-28 17:06:31 +01:00
Michael Hackstein 288f174011 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-11-28 16:49:53 +01:00
Michael Hackstein cedfea877f Removed unused frontend libraries ColVis and dataTables 2014-11-28 16:38:25 +01:00
Michael Hackstein a593ad7587 Replaced datatables by own implementation, less overhead easier to handle and not broken in Firefox 2014-11-28 16:31:24 +01:00
Max Neunhoeffer 305c2ae04e Update CHANGELOG with Max's changes for 2.3.1. 2014-11-28 16:23:18 +01:00
Max Neunhoeffer 85d3c43ab0 Revert "More error output if update() in foxx manager fails." 
This reverts commit 3e6822a3917eb18ad45b6a0f145c87ca686fc54c.
 2014-11-28 16:16:16 +01:00
Max Neunhoeffer 6a53d40c24 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 16:15:47 +01:00
Max Neunhoeffer 7664fc643c Fix a bug in AQL COLLECT statement. Sorts out #1127. 
This concerned every COLLECT statement, only the first group had access
to the values of the variables before the COLLECT statement.
 2014-11-28 16:14:44 +01:00
Jan Steemann acf070c6ac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-28 15:58:48 +01:00
Jan Steemann 200eacd592 remove KEEP 2014-11-28 15:58:26 +01:00
Max Neunhoeffer faef09a576 Cleanup cleanupDirectories list after cleanup of directories. 2014-11-28 15:22:01 +01:00
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +01:00
Max Neunhoeffer b44b98c8ee More error output if update() in foxx manager fails. 
This is a temporary output to track down the continuous testing
problems.
 2014-11-28 14:43:09 +01:00
Jan Steemann bc8579f20b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-28 13:58:59 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Max Neunhoeffer 877b1d6df9 Fix a comment. 2014-11-28 13:33:15 +01:00
Max Neunhoeffer 0445b547be Fix a buffer overflow that did not have any effect. 2014-11-28 13:31:27 +01:00
Max Neunhoeffer 2a03393121 Improve documentation of COLLECT AQL statement. 2014-11-28 13:25:56 +01:00
Max Neunhoeffer a76e22f03a Only put non-toplevel vars into the INTO variable in a COLLECT. 
This restores the behaviour of 2.2.
 2014-11-28 13:05:15 +01:00
Max Neunhoeffer 676ec3694d Choose more sensible block sizes for fetch from dependency. 2014-11-28 11:43:09 +01:00
Max Neunhoeffer 4e48475a9f Fix a bug in list access for AqlValues. 2014-11-28 11:21:47 +01:00
Jan Steemann b3d46923f2 jslint 2014-11-27 13:08:09 +01:00
Willi Goesgens 7a3c7193de Be a bit more specific about howto run tests, and where to get more help. 2014-11-27 12:47:32 +01:00
Lucas Dohmen 919e6c5d0f Update to FoxxGenerator 0.5.1 2014-11-27 11:52:00 +01:00
Jan Steemann bc85f07b2f issue #1126 2014-11-26 23:20:11 +01:00
Jan Steemann 65f83d01a3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-26 20:24:57 +01:00
Jan Steemann 84b5b67941 issue #1126: cleaned up compilation manual 2014-11-26 20:24:45 +01:00
Jan Steemann e7c7f774e0 added tests 2014-11-26 20:24:28 +01:00
Jan Steemann 8dbeef6092 Merge pull request #1125 from threez/patch-2 
Fixed statistics for FreeBSD
 2014-11-26 20:04:21 +01:00
Jan Steemann 292eaad273 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-26 19:49:38 +01:00
Jan Steemann 45ebdf7581 enable more indexes 2014-11-26 19:49:28 +01:00
threez 21b498127c Fixed statistics for FreeBSD 
By default it would try to compile the windows code, since the TRI_HAVE_MACOS_MEM_STATS doesn't cover BSD's.
 2014-11-26 16:57:40 +01:00
Max Neunhoeffer b2f93a048a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-26 16:47:55 +01:00
Max Neunhoeffer 27cff93a4e Two comment changes. 2014-11-26 16:47:32 +01:00
Alan Plum d4ee5dbc0b Updated joi to 4.9.0. 2014-11-26 15:53:47 +01:00
Jan Steemann 6d9d04da18 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-26 15:24:11 +01:00
Jan Steemann 513ae2b3dd fixed jslint warnings 2014-11-26 15:24:03 +01:00
Jan Steemann 16b7c4a1a8 VS 2014-11-26 15:22:30 +01:00
threez fe02d691d8 Fixes compile issue on FreeBSD/clang 
lib/Basics/logging.cpp:1876:12: error: cannot initialize a variable of type 'CODE *' (aka '_code *') with an lvalue of type 'const CODE [25]'
    CODE * ptr = TRI_facilitynames;
           ^     ~~~~~~~~~~~~~~~~~

FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512
Target: x86_64-unknown-freebsd10.1
 2014-11-26 15:05:43 +01:00
Jan Steemann 57aefb988d fix optimization of subqueries 2014-11-26 15:01:55 +01:00
Jan Steemann e5adbf4f56 properly display required pathParams in Foxx documentation 
do not restrict route summary to 60 characters
 2014-11-26 11:21:14 +01:00
Jan Steemann a8282f8220 fixed never-disappearing "query is operating" display 2014-11-26 10:50:03 +01:00
Jan Steemann 37026e8c84 Merge pull request #1121 from triAGENS/appcontext-base-url 
Expose root-relative mount URL on applicationContext
 2014-11-26 10:28:42 +01:00
Jan Steemann 34eb2a8c5a removed unused functions 2014-11-25 23:18:45 +01:00
Jan Steemann c69fa0b0dc fixed invalid optimization, added test cases 2014-11-25 23:18:24 +01:00
Alan Plum a947b909a4 Expose root-relative mount URL as appContext.baseUrl. 2014-11-25 13:35:41 +01:00
Jan Steemann 9846fd0d36 removed unused function 2014-11-24 17:36:11 +01:00
Jan Steemann e5125a097b updated CHANGELOG 2014-11-24 13:14:21 +01:00
Jan Steemann f464fe99cd removed unused function 2014-11-24 13:00:45 +01:00
Jan Steemann efa8d2b32b fixed tests 2014-11-24 12:55:49 +01:00