1
0
Fork 0
Commit Graph

10009 Commits

Author SHA1 Message Date
Claudius Weinberger 573d6bf323 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-27 10:49:35 +01:00
Frank Celler 8406f51435 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	VERSION
	arangod/Ahuacatl/ahuacatl-access-optimiser.c
	arangod/Ahuacatl/ahuacatl-codegen.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/graph/traversal.js
	js/common/modules/org/arangodb/graph/traversal.js
	js/server/modules/org/arangodb/ahuacatl.js
	lib/HttpServer/HttpCommTask.h
2014-02-27 09:13:03 +01:00
Frank Celler 87a753da51 generate full libs 2014-02-26 22:14:42 +01:00
Jan Steemann 85e0a5e9c3 client tests 2014-02-26 20:07:37 +01:00
Jan Steemann 316f23a9b5 fixed invalid test return values 2014-02-26 20:05:01 +01:00
Jan Steemann 6b0f7da114 fix invalid database name 2014-02-26 19:35:18 +01:00
Jan Steemann d420e40e4c jslint 2014-02-26 19:16:40 +01:00
Frank Celler 0da561c148 updated for 1.4.11 2014-02-26 18:29:20 +01:00
gschwab b89d0ed584 deleted unused icon 2014-02-26 18:13:01 +01:00
gschwab 2d187f1998 default 'active' when creating new user 2014-02-26 17:44:54 +01:00
gschwab 7caed403ff status bar cleaned up 2014-02-26 17:34:30 +01:00
gschwab 51d7f97766 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 16:04:06 +01:00
gschwab 1d43106cb0 status bar redesigned 2014-02-26 16:03:55 +01:00
Jan Steemann 785df6f016 added documentation for AQL SHORTEST_PATH 2014-02-26 13:42:56 +01:00
Jan Steemann 3cce5f09fe updated CHANGELOG 2014-02-26 13:40:50 +01:00
Jan Steemann bb0f87cfdc fixed bug in Graph.pathTo 2014-02-26 13:40:08 +01:00
Jan Steemann cfae17c667 make SYS_UNIT_TESTS_RESULT writeable 2014-02-26 13:36:01 +01:00
Jan Steemann 90d6a337da make SYS_UNIT_TESTS_RESULT writeable 2014-02-26 13:35:12 +01:00
Jan Steemann 276a3cf3a1 added SHORTEST_PATH AQL function, fixed bug in Graph.pathTo 2014-02-26 13:34:42 +01:00
gschwab c737ea0c77 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 13:31:59 +01:00
gschwab 70e10e7a84 fixed tooltips 2014-02-26 13:31:20 +01:00
Heiko Kernbach d0503da9d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 11:35:37 +01:00
Heiko Kernbach 3befaff6fc testview incl. template for uploading json 2014-02-26 11:35:09 +01:00
Jan Steemann d61a1178a9 fixed undefined variable access 2014-02-26 10:39:36 +01:00
Jan Steemann 24e4ad502f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-26 10:38:26 +01:00
Jan Steemann 24d607c7ee fixed undefined variable access 2014-02-26 10:38:17 +01:00
gschwab d5193c4dd5 fixed tooltips 2014-02-26 10:22:37 +01:00
Claudius Weinberger 44069a28b2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-25 20:29:08 +01:00
gschwab 9720aed04f missing ; added 2014-02-25 16:52:58 +01:00
gschwab 4b8e9565ae fixed css for node list 2014-02-25 14:11:08 +01:00
gschwab f0e19f8aaa the lib does not work properly with firefox, so the part of the lib is deactivated. 2014-02-25 13:55:01 +01:00
gschwab cd43b58d53 hide search options 2014-02-25 13:08:52 +01:00
gschwab 4e764437be prevent deleting active user 2014-02-25 12:58:28 +01:00
gschwab e7c78de979 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-25 11:37:16 +01:00
gschwab 5857f616ed userManagement switched from table to tiles 2014-02-25 11:37:07 +01:00
Jan Steemann 0b2c38bfac fixed uninitialised variable access 2014-02-24 17:50:19 +01:00
Jan Steemann edb0e61e13 fixed uninitialised variable access 2014-02-24 17:48:56 +01:00
gschwab bddaabf2f1 jslint fixes 2014-02-24 14:31:35 +01:00
gschwab 7681c2e3e6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-24 14:27:11 +01:00
gschwab a49e05cf0a modified scss 2014-02-24 14:27:06 +01:00
Jan Steemann bb3704e04b fixed small memleak 2014-02-24 14:23:50 +01:00
Jan Steemann 98489ea718 jslint 2014-02-24 14:22:38 +01:00
Jan Steemann a6b71d8eba fixed memleak 2014-02-24 14:19:42 +01:00
gschwab 2ccf8ff127 change password added 2014-02-24 13:50:12 +01:00
Jan Steemann ca4d4c2f06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-24 11:12:55 +01:00
Jan Steemann 870f969933 added user validation API at POST `/_api/user/<username>` 2014-02-24 11:12:37 +01:00
gschwab 83e2bccd5a prevent browsers from displaying a broken img 2014-02-24 11:08:18 +01:00
gschwab c6c7694711 toggle dropdown on click in navigate bar 2014-02-23 19:53:05 +01:00
Michael Hackstein 93f5b89a0c The central div is now central and no more 5 px off 2014-02-22 16:36:54 +01:00
gschwab 031cf6dc3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/queryView.ejs
2014-02-22 15:36:32 +01:00