1
0
Fork 0
arangodb/html/admin/js
Frank Celler 4605fbba9a Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1
Conflicts:
	CHANGELOG
	Doxygen/Examples.ArangoDB/startup1
	Makefile.in
	arangod/Documentation/command-line-options.dox
	arangod/Documentation/install-manual.dox
	arangod/Makefile.files
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/auth.h
	arangosh/V8Client/arangosh.cpp
	html/admin/css/layout.css
	lib/Basics/ssl-helper.h
	lib/HttpServer/ApplicationHttpServer.cpp
	lib/HttpServer/ApplicationHttpServer.h
	lib/HttpServer/HttpServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.cpp
	lib/HttpsServer/ApplicationHttpsServer.h
2012-07-24 22:56:03 +02:00
..
modules fixed === and !== and == and != 2012-05-25 15:33:35 +02:00
.master.js.swo renamed to Arango 2012-05-12 14:40:34 +02:00
avocsh1.js aranqo quiet 2012-06-11 13:34:53 +02:00
client.js replaced by link 2012-05-23 11:20:12 +02:00
errors.js linked errors 2012-05-24 12:18:17 +02:00
jquery-1.7.2.js merge 2012-04-24 12:47:54 +02:00
jquery-ui-1.8.18.custom.min.js merge 2012-04-24 12:47:54 +02:00
jquery-ui.js merge 2012-04-24 12:47:54 +02:00
jquery.address-1.4.js merge 2012-04-24 12:47:54 +02:00
jquery.autogrow.js changed autogrow settings 2012-07-05 12:18:38 +02:00
jquery.dataTables.js fixed table width/content 2012-06-18 14:35:19 +02:00
jquery.flot.crosshair.js added statistics charts 2012-07-17 14:32:20 +02:00
jquery.flot.js added statistics charts 2012-07-17 14:32:20 +02:00
jquery.flot.resize.js added statistics charts 2012-07-17 14:32:20 +02:00
jquery.flot.stack.js added statistics charts 2012-07-17 14:32:20 +02:00
jquery.jeditable.autogrow.js style/colorscheme changes 2012-07-06 12:38:13 +02:00
jquery.jeditable.js merge 2012-04-24 12:47:54 +02:00
jquery.layout-latest.js merge 2012-04-24 12:47:54 +02:00
jquery.qtip.js added statistics charts 2012-07-17 14:32:20 +02:00
jquery.sha256.js merge 2012-04-24 12:47:54 +02:00
jquery.snippet.js bugfix/added syntax highlighting 2012-05-03 11:57:49 +02:00
json2.js merge 2012-04-24 12:47:54 +02:00
jsunity.js merge 2012-04-24 12:47:54 +02:00
master.js Merge branch '1.1' of github.com:triAGENS/ArangoDB into 1.1 2012-07-24 22:56:03 +02:00
print.js fixed printing 2012-05-23 15:58:43 +02:00
test.js result not used 2012-06-14 11:19:50 +02:00