1
0
Fork 0
Commit Graph

98 Commits

Author SHA1 Message Date
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
Heiko Kernbach 1d104db59e added resizable/dragable/pointable/hideable/ statistic functionalities 2012-07-20 13:43:37 +02:00
Heiko Kernbach e2d7293987 added statistics charts 2012-07-17 14:32:20 +02:00
Heiko Kernbach 0644bd1a6f style/colorscheme changes 2012-07-06 12:38:13 +02:00
Heiko Kernbach 206a091588 changed autogrow settings 2012-07-05 12:18:38 +02:00
Heiko Kernbach da1080d66f added autogrow function for editable textarea 2012-07-05 11:28:38 +02:00
Jan Steemann b906dd95b7 issue #121: fixed and simplified size reporting in HTML admin front end 2012-07-04 13:44:23 +02:00
Jan Steemann 4d75d9013f fixed escaping and unescaping of strings in source edit mode 2012-07-04 11:13:50 +02:00
Jan Steemann 7a07b7b6c8 fixed HTML escaping in admin frontend 2012-07-04 10:07:04 +02:00
Heiko Kernbach 72ac985cef added cancel/undo functionality for editing/creating document 2012-06-20 12:00:32 +02:00
Heiko Kernbach 5e21b3879a query style changes 2012-06-18 15:22:22 +02:00
Heiko Kernbach e90dfc312b 150px -> 200px 2012-06-18 14:40:21 +02:00
Heiko Kernbach 59e85716e9 fixed table width/content 2012-06-18 14:35:19 +02:00
Heiko Kernbach 3d0dc82f9d ui changes 2012-06-15 11:09:09 +02:00
Heiko Kernbach 59fee44010 ui changes 2012-06-14 13:52:53 +02:00
Heiko Kernbach d0ed6d8db1 fixed create collection with no journalsize 2012-06-04 11:32:33 +02:00
Heiko Kernbach d55c3d3408 sh changes 2012-06-01 12:22:27 +02:00
Heiko Kernbach e95f95dbdc require 2012-05-31 09:48:51 +02:00
Heiko Kernbach 1159479250 autocomplete changes 2012-05-25 15:17:51 +02:00
Heiko Kernbach b87f5ee864 autocomplete changes 2012-05-25 15:16:49 +02:00
Heiko Kernbach f0cc293635 added autocomplete to query & shell 2012-05-25 14:57:51 +02:00
Heiko Kernbach 4664e896d5 changed hidden btns -> disabled 2012-05-25 14:30:59 +02:00
Heiko Kernbach 0896014d75 hide unusable buttons, remove pointers 2012-05-25 14:12:20 +02:00
Heiko Kernbach 93904d1dd7 removed console.log's 2012-05-25 13:49:27 +02:00
Heiko Kernbach a906d139bf added json format function to avocsh 2012-05-25 13:45:45 +02:00
Heiko Kernbach 4a8a9d7668 table width settings 2012-05-25 12:57:45 +02:00
Heiko Kernbach fbc8a14a50 Merge branch 'devel' of github.com:/triAGENS/ArangoDB into devel 2012-05-25 12:41:59 +02:00
Heiko Kernbach 5cd1f4280d require 2012-05-25 12:41:46 +02:00
Frank Celler 888436b95d Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-05-25 12:21:43 +02:00
Frank Celler a0cd51d2fc moved /document => /_api/document 2012-05-25 12:21:02 +02:00
Heiko Kernbach fc72cd4b16 fixed social line break, style 2012-05-25 10:17:38 +02:00
Heiko Kernbach b1f8409801 added format toggle for query 2012-05-24 16:36:21 +02:00
Heiko Kernbach b239853639 welcomemsg 2012-05-24 13:57:40 +02:00
Heiko Kernbach add6711670 2columns align right 2012-05-24 11:59:02 +02:00
Heiko Kernbach 76b78d1727 addded documentation 2012-05-24 11:21:32 +02:00
Heiko Kernbach 8bbc7db557 clearing forms 2012-05-23 19:25:48 +02:00
Heiko Kernbach 24116d012d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-05-23 19:20:54 +02:00
Heiko Kernbach 173e588ee9 clear fields when entered new collection view 2012-05-23 19:20:37 +02:00
Jan Steemann 516e642b64 issue #86: don't suppress backspace and cursor keys 2012-05-23 19:10:35 +02:00
Jan Steemann d5beb4bc7b issue #79: fixed wrong order of escaping and string truncation in front end 2012-05-23 18:47:31 +02:00
Frank Celler 894f3cab5b Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-05-23 15:59:02 +02:00
Frank Celler 2554ce698e fixed printing 2012-05-23 15:58:43 +02:00
Heiko Kernbach c3ed58f484 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-05-23 15:12:10 +02:00
Heiko Kernbach 50fdf2118b toggle button style 2012-05-23 15:11:53 +02:00
Frank Celler 5d30fec5d2 Merge branch 'devel' of github.com:triAGENS/ArangoDB
Conflicts:
	html/admin/js/avocsh1.js
	html/admin/js/master.js
2012-05-23 15:03:08 +02:00
Frank Celler bb96f1c7fa renamed /document => /_api/document 2012-05-23 15:01:44 +02:00
Heiko Kernbach a204d8a507 prompt style 2012-05-23 14:36:04 +02:00
Heiko Kernbach 1486446650 prompt style 2012-05-23 14:17:15 +02:00