1
0
Fork 0
Commit Graph

3306 Commits

Author SHA1 Message Date
Jan Steemann d117f2916a issue #248: pull out some sort of subqueries 2012-10-22 09:14:38 +02:00
Frank Celler d27ba1cf30 Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 2012-10-20 22:56:54 +02:00
Frank Celler 0499d8b4e2 ixed wrong attribute
Conflicts:
	js/common/bootstrap/js-modules.h
2012-10-20 22:46:59 +02:00
Frank Celler 3b5a0967bc Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	CHANGELOG
	Documentation/Makefile.files
	Installation/build.sh
	arangod/Documentation/communication.dox
	arangod/HashIndex/hasharray.c
	arangod/HashIndex/hashindex.c
	lib/Rest/Endpoint.cpp
	lib/Rest/Endpoint.h
	lib/Rest/EndpointIp.h
	lib/Rest/EndpointIpV4.h
	lib/Rest/EndpointIpV6.h
	lib/Rest/EndpointUnixDomain.cpp
2012-10-20 22:37:25 +02:00
Frank Celler 61856501ea changed .module to .content for modules in collection _modules
Conflicts:
	js/common/bootstrap/js-modules.h
2012-10-20 22:17:54 +02:00
Frank Celler 7e3e6ecfc7 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-10-20 22:17:22 +02:00
Frank Celler 7f33ac5519 added autoload for modules
Conflicts:
	CHANGELOG
	js/server/js-server.h
2012-10-20 22:07:50 +02:00
a-brandt c70d081fc9 one more try for centos 5 2012-10-19 16:02:31 +02:00
a-brandt fbc20e6aed added some extra options for "make on centos 5 2012-10-19 15:26:10 +02:00
Frank Celler 4d6b3e1b5f more manual cleanup 2012-10-18 18:02:13 +02:00
Frank Celler aaf74fe8f6 fixed title for website output 2012-10-18 17:33:21 +02:00
Frank Celler 4800deb389 upgraded to Doxygen 1.8.x 2012-10-18 16:40:17 +02:00
Frank Celler e8093d68fe upgraded to Doxygen 1.8.x 2012-10-18 16:38:20 +02:00
Frank Celler 9cb12583c6 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-10-18 15:42:03 +02:00
Frank Celler 5cdb1c3868 merged examples paths, new intro text 2012-10-18 15:41:54 +02:00
Frank Celler c1b0c37480 added module org/arangodb, added convinient functions 2012-10-18 15:39:00 +02:00
Frank Celler 9e4dad83d9 joined Examples, added options to html2html to add header 2012-10-18 11:57:03 +02:00
Jan Steemann 736b02e992 disable syncing of shapes for unittests (speeds them up) 2012-10-17 18:53:19 +02:00
Jan Steemann e291764fa8 less CPU bashing in SYS_WAIT 2012-10-17 18:50:32 +02:00
Jan Steemann 83b9001f62 removed many unused variables 2012-10-17 18:50:17 +02:00
Jan Steemann 8684b2630d fixed a crash with --database.force-sync-shapes = false 2012-10-17 18:46:46 +02:00
Jan Steemann 4df461b783 fixed a crash with --database.force-sync-shapes = false 2012-10-17 18:45:24 +02:00
Frank Celler 3aebed3020 Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	Documentation/Makefile.files
2012-10-17 18:03:46 +02:00
Frank Celler 7709ff3eef do not use header and footer 2012-10-17 18:02:59 +02:00
Frank Celler 04f6a677b1 new css from Stefan 2012-10-17 18:02:18 +02:00
Frank Celler 1efad1d9c7 fixed file permissions 2012-10-17 18:01:57 +02:00
Jan Steemann 937168d098 slightly less comparisons 2012-10-17 17:51:19 +02:00
Jan Steemann 4d6f32a5d4 more languages 2012-10-17 17:50:55 +02:00
Jan Steemann 0c4da6a1d7 added test cases for edge insert/update rollback 2012-10-17 17:37:29 +02:00
Jan Steemann d58c48bdd8 fix rollback of edge update
The rollback of edge marker modification used a wrong marker size and thus uninitialised memory.
Achim found this
2012-10-17 17:25:12 +02:00
Jan Steemann 4fcd8bfac5 fix rollback of edge update
The rollback of edge marker modification used a wrong marker size and thus uninitialised memory.
Achim found this
2012-10-17 17:23:02 +02:00
Jan Steemann a5402ee458 comments 2012-10-17 17:02:45 +02:00
Jan Steemann dd07a3c311 do not remove Doxygen/wiki on make clean 2012-10-17 16:58:11 +02:00
Jan Steemann 929d184ac6 do not remove Doxygen/wiki on make clean 2012-10-17 16:57:35 +02:00
Jan Steemann 5c4d981e7a added tests, fixed documentation 2012-10-17 16:50:35 +02:00
Jan Steemann 057cadc5c0 added some tests, fixed docs 2012-10-17 16:49:48 +02:00
Jan Steemann 6f5961a9eb added some extra comments 2012-10-17 16:05:51 +02:00
Jan Steemann 4db3f9ca29 issue #245 2012-10-17 15:50:55 +02:00
Jan Steemann 53669bd342 issue #245 2012-10-17 15:50:06 +02:00
Jan Steemann 507e9e3b79 increase sleep time 2012-10-17 15:41:30 +02:00
Jan Steemann 215ce95a8c increase sleep time 2012-10-17 15:40:59 +02:00
Jan Steemann d2d7896846 moved classes to separate files 2012-10-17 15:23:10 +02:00
Jan Steemann 158ab1c5f1 fixed doxygen error 2012-10-17 14:26:00 +02:00
Jan Steemann 6c51946a2f fixed doxygen error 2012-10-17 14:25:25 +02:00
Jan Steemann be54759314 issue #245 2012-10-17 14:24:31 +02:00
Jan Steemann c2be68fc7f issue #245 2012-10-17 14:21:46 +02:00
Jan Steemann ab2849f18b removed generated files 2012-10-17 13:15:15 +02:00
Jan Steemann df8078f05f removed file (seems not needed anymore) 2012-10-17 13:14:31 +02:00
Jan Steemann 875bfd7f79 issue #247 2012-10-17 13:12:12 +02:00
Jan Steemann 4021f64700 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-10-17 13:08:13 +02:00