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

13437 Commits

Author SHA1 Message Date
Jan Steemann 577860c978 renamed struct attribute 2014-06-03 19:15:01 +02:00
Jan Steemann a4b8e86cda Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 19:08:07 +02:00
Jan Steemann 30384bf491 prevent copying 2014-06-03 18:14:36 +02:00
Jan Steemann 63f982bc6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 18:12:51 +02:00
Jan Steemann 3876df9b25 raii 2014-06-03 18:12:44 +02:00
Jan Steemann edd97f9bf3 removed doxygen comments 2014-06-03 17:35:44 +02:00
Frank Celler 8dc8600eb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/server/modules/org/arangodb/foxx/model.js
 2014-06-03 17:20:18 +02:00
Frank Celler 44aefb2344 added mountedApp 2014-06-03 17:19:03 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
Jan Steemann 399a843e23 use and release databases and collections during collection 2014-06-03 17:17:41 +02:00
Jan Steemann fb87b35dec initial implementation of wal logfile collection, scans markers only atm 2014-06-03 16:39:49 +02:00
scottashton 5ef0371ad6 make jslint stop nagging 2014-06-03 16:31:44 +02:00
scottashton af4d4e6d25 make jslint stop nagging 2014-06-03 16:30:23 +02:00
gschwab 859f104c5d jslint 2014-06-03 16:29:46 +02:00
scottashton 8f347f2b54 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:25:26 +02:00
scottashton 006eb3b61b calculation of measurements for graphs added and changed calculation of shortst paths to Floyd–Warshall algorithm 2014-06-03 16:25:13 +02:00
gschwab d4058d5aba Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 16:08:48 +02:00
gschwab 6166c6bff5 path function for fluent interface added 2014-06-03 16:08:42 +02:00
Frank Celler 2b29c627cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-03 15:56:58 +02:00
Frank Celler 2dfe5ceb76 only use next action if not restarting 2014-06-03 15:52:41 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Esteban Lombeyda eda4186b99 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-03 14:35:31 +02:00
Esteban Lombeyda 3ec823c804 Error string for remove, replace, update modified 2014-06-03 14:35:06 +02:00
Heiko Kernbach 507a6fe1c9 moved dropdown divider for database selection to the right place 2014-06-03 13:57:37 +02:00
Heiko Kernbach 42faa8af1b shortcut style and position changed 2014-06-03 11:59:33 +02:00
Heiko Kernbach 5731d38f94 removed shift keybinding for info modal 2014-06-03 11:44:22 +02:00
Heiko Kernbach 4308ddcc7f changed mouse style when hovering on navigation-dropdown-items 2014-06-03 11:37:19 +02:00
Heiko Kernbach 6ffb0ef26d merge 2014-06-03 11:34:29 +02:00
Heiko Kernbach 1d08dbb7b5 changed dropdown-item:hover to default style 2014-06-03 11:17:51 +02:00
Jan Steemann a9a12e42c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	Makefile.am
 2014-06-03 10:18:08 +02:00
Jan Steemann 715d11cb22 removed consts 2014-06-03 10:17:09 +02:00
Jan Steemann 9532f9216d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-03 10:13:27 +02:00
Jan Steemann 07e2fce6b8 fixed keepNull in cluster 2014-06-03 10:13:19 +02:00
Frank Celler 0467ea1ba0 splitted datadir 2014-06-03 09:49:26 +02:00
Frank Celler e6d7f438cb Merge pull request #885 from pluma/require-submodules 
Added fallback to allow requiring submodules (fixes #789)
 2014-06-03 09:42:48 +02:00
Frank Celler 2ac20c5195 Merge pull request #884 from pluma/foxx-models-io 
Better Foxx.Model attribute handling (fixes #877 and #878)
 2014-06-03 09:39:51 +02:00
Jan Steemann 8688ae6b87 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 09:31:52 +02:00
Jan Steemann 12b8e1c239 exclude aardvark tests from make install 2014-06-03 09:30:44 +02:00
Jan Steemann 6403b2c569 removed mr leftovers 2014-06-03 08:56:54 +02:00
Jan Steemann 7501fad516 removed VocBase/marker.h and VocBase/marker.cpp 2014-06-02 18:06:50 +02:00
Jan Steemann f7f1b3116a Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 17:57:31 +02:00
Jan Steemann 3f8455685c make debug output configurable 2014-06-02 17:57:19 +02:00
Jan Steemann c6388411ef removed unused test thread 2014-06-02 17:56:43 +02:00
Michael Hackstein f0084fa116 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/actions/api-simple.js
 2014-06-02 17:35:15 +02:00
Michael Hackstein 3e00b6aa30 Started with the documentation of the fluent interface in graphs module. Added documents accordingly. 2014-06-02 17:32:50 +02:00
gschwab 3746cfa1c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-02 16:57:25 +02:00
gschwab 062c6649e2 remove is transactional now 2014-06-02 16:57:20 +02:00
Max Neunhoeffer d3b94a9ffd Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-02 16:34:24 +02:00
Max Neunhoeffer 11012c1d2b Remove unnecessary file. 2014-06-02 16:33:58 +02:00
Jan Steemann 478973c9f5 updated .gitignore 2014-06-02 16:33:11 +02:00