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

672 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
Jan Steemann d420e40e4c jslint 2014-02-26 19:16:40 +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 1d43106cb0 status bar redesigned 2014-02-26 16:03:55 +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
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 5857f616ed userManagement switched from table to tiles 2014-02-25 11:37:07 +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 98489ea718 jslint 2014-02-24 14:22:38 +01:00
gschwab 2ccf8ff127 change password added 2014-02-24 13:50:12 +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
gschwab 1790ee4dd9 git commit --amend --reset-author 2014-02-22 15:28:07 +01:00
Michael Hackstein d190c35cb5 Removed the invisible AND from filters 2014-02-22 13:31:49 +01:00
Michael Hackstein f3d272d3e4 Fixed filter pagination 2014-02-22 13:30:23 +01:00
Michael Hackstein f00b398e89 Now complete line of dropdown is clickable 2014-02-22 12:27:25 +01:00
Claudius Weinberger 8036575ce9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-22 11:38:24 +01:00
Michael Hackstein 5fc5922349 Fixed graphviewer dropdown menu and several other css mismatches 2014-02-22 11:11:58 +01:00
Michael Hackstein b100eb85e4 Removed unused routes and views and templates 2014-02-22 08:44:24 +01:00
Michael Hackstein e9d8392e48 Fixed dropdown layout which was broken for imports 2014-02-22 08:15:55 +01:00
Michael Hackstein 629c533b6a Added new button definitions to scss, no bootstrap required there anymore 2014-02-22 00:16:41 +01:00
Guido Schwab 760baf44bd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 21:41:58 +01:00
Guido Schwab 1416860832 some pixelpushing 2014-02-21 21:41:50 +01:00
Michael Hackstein 14ba49ac10 Fixed some button styles and fixed applications view, it is now much more intuitive to install an app 2014-02-21 21:21:49 +01:00
Claudius Weinberger feaffffc66 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-21 21:17:12 +01:00
Michael Hackstein 6020b914b8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-21 20:59:31 +01:00
Michael Hackstein e3ee4d8f86 Added buttons to scss 2014-02-21 20:59:23 +01:00
Guido Schwab f57514a933 nav bar spacer modified 2014-02-21 19:17:43 +01:00
Guido Schwab 1dd358e5ec restricted max length of db name in navbar - shortened 2014-02-21 16:43:15 +01:00
Guido Schwab 85d1f6af3d restricted max length of db name in navbar - fixed caret 2014-02-21 16:38:39 +01:00
Guido Schwab 43e59bf946 restricted max length of db name in navbar 2014-02-21 16:18:46 +01:00
Guido Schwab 7e08be3f33 finally fixed links in DB-menu 2014-02-21 15:52:29 +01:00
Guido Schwab cfb5ca5953 fixed links in DB-menu 2014-02-21 15:28:00 +01:00