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

145 Commits

Author SHA1 Message Date
Jan Steemann a36846f365 issue #307 2012-12-01 01:10:40 +01:00
Jan Steemann bb8709a380 adjusted collection API 2012-11-30 23:55:19 +01:00
Jan Steemann f07e2c8005 test 2012-11-30 10:02:27 +01:00
Jan Steemann 58f330fa5e test 2012-11-30 10:00:34 +01:00
Jan Steemann b12f4d7e2d issue #304 2012-11-30 01:40:40 +01:00
Frank Celler 249492a89c Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	CHANGELOG
	Documentation/Manual/GlossaryCollectionName.md
	Documentation/Manual/NewFeatures11.md
	Documentation/UserManual/FirstStepsArangoDB.md
	VERSION
	arangod/Documentation/api-blueprints.dox
	arangod/HashIndex/hasharray.c
	arangod/RestHandler/RestVocbaseBaseHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/v8-actions.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/compactor.c
	arangod/VocBase/document-collection.c
	configure.ac
	html/admin/js/master.js
	js/server/ahuacatl.js
	js/server/arango-upgrade.js
	lib/BasicsC/voc-errors.h
	lib/V8/V8LineEditor.cpp
	lib/V8/v8-utils.cpp
 2012-11-27 12:34:58 +01:00
Jan Steemann 8ff9eefdbe fixed update in web interface 2012-11-23 10:39:11 +01:00
Jan Steemann 92b3c7c35d fixed web interface updates 2012-11-23 10:37:23 +01:00
Heiko Kernbach 797fcada47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2012-11-22 18:00:17 +01:00
Heiko Kernbach ee5c6673cd removed wrong hash string 2012-11-22 18:00:09 +01:00
Heiko Kernbach 6414850cfa removed wrong hash string 2012-11-22 17:59:04 +01:00
Jan Steemann 8b8ecc40b4 mark values as read-only 2012-11-22 17:52:59 +01:00
Jan Steemann dfcc53c865 fixed web interface 2012-11-22 17:48:42 +01:00
Heiko Kernbach edeb2e2651 frontend: devel -> 1.1 2012-11-22 16:55:17 +01:00
Jan Steemann cfc8fc0a2c prettified 2012-11-22 16:35:55 +01:00
Jan Steemann 58caf59a57 fixed error messages 2012-11-22 16:04:48 +01:00
Jan Steemann 2a863836a7 fixed web interface paging etc. 2012-11-22 15:39:05 +01:00
Jan Steemann 26b847dda6 collection type 2012-11-22 13:58:19 +01:00
Jan Steemann 89a16e8e12 display collection type 2012-11-22 13:57:15 +01:00
Jan Steemann 03fa01b699 added collection type label to web interface 2012-11-22 12:23:51 +01:00
Jan Steemann 6ba6711392 added collection type label to web interface 2012-11-22 12:20:01 +01:00
Jan Steemann bda92a8c64 finally 2012-11-22 12:06:36 +01:00
Jan Steemann d7ab82b524 finally 2012-11-22 12:05:22 +01:00
Jan Steemann d762a5420e issue #282 2012-11-22 11:56:23 +01:00
Jan Steemann 362a21a1f7 issue #282 2012-11-22 11:54:02 +01:00
Jan Steemann c3602440d0 issue #282 2012-11-22 11:49:02 +01:00
Jan Steemann 5b537d221c issue #282 2012-11-22 11:17:58 +01:00
Jan Steemann 0880a1e90f issue #282 2012-11-22 11:14:31 +01:00
a-brandt 9acc4c1625 added "_key" attribute 2012-11-19 16:15:04 +01:00
Heiko Kernbach 00073097eb improvements 2012-11-16 18:20:58 +01:00
Heiko Kernbach 301b5fc0d8 css fixes 2012-11-09 16:50:00 +01:00
Heiko Kernbach 68a2f2117f Revert " css fixes" 
This reverts commit 66534df409b4a34e955c1f0c24f8f9a802594d48.
 2012-11-09 16:31:19 +01:00
Heiko Kernbach 4ea6c62294 css fixes 2012-11-09 15:56:29 +01:00
Heiko Kernbach 3864f41856 changed statistics design 2012-09-17 12:48:13 +02:00
Frank Celler 55824fa836 fixed issue #197: HTML web interface calls /_admin/user-manager/session 2012-09-13 13:42:53 +02:00
Heiko Kernbach f03a91fac4 removed console.log 2012-09-07 16:05:05 +02:00
Heiko Kernbach d3e96d9576 added mean statistics to bytesSent/bytesReceived 2012-09-07 15:56:43 +02:00
Heiko Kernbach 725aef286e test 2012-09-07 13:15:45 +02:00
Heiko Kernbach 588f38a2e8 fixed missing json parse 2012-09-07 12:33:02 +02:00
Frank Celler dc858ce842 Merge remote-tracking branch 'origin/1.1' into devel 
Conflicts:
	html/admin/css/layout.css
	html/admin/js/master.js
 2012-08-18 09:09:44 +02:00
Frank Celler aef20e2887 Merge branch 'master' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	Makefile.local
	arangod/Documentation/command-line-options.dox
	arangod/RestServer/ArangoServer.cpp
	build.sh
	html/admin/js/master.js
 2012-08-05 22:46:55 +02:00
Frank Celler ce5480ad09 removed wrong version number 2012-08-03 14:33:27 +02:00
Heiko Kernbach 97a38b243d optimized statistics 2012-08-01 12:59:13 +02:00
Heiko Kernbach b67cd9947a stat interface changes 2012-07-30 14:04:17 +02:00
Heiko Kernbach bff3727e19 dashboard changes 2012-07-27 14:07:22 +02:00
Heiko Kernbach 20845ab4ce Merge branch '1.1' of https://github.com/triAGENS/ArangoDB into 1.1 2012-07-27 10:40:16 +02:00
Heiko Kernbach d49ab8e8cd changed dashboard 2012-07-27 10:40:09 +02:00
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
Heiko Kernbach 675cfa0f44 stat interface changes 2012-07-24 13:20:46 +02:00
Heiko Kernbach e2afd5d42e stat windows now complete draggable resizable 2012-07-24 10:43:21 +02:00