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

420 Commits

Author SHA1 Message Date
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
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 3c32dd4cbb result not used 2012-06-14 11:19:50 +02:00
Heiko Kernbach 81edb0ec0a aranqo quiet 2012-06-11 13:34: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
Frank Celler 94122e8a6b fixed error handling 2012-05-28 11:49:40 +02:00
Frank Celler 3ed5aee738 Merge branch 'master' of https://github.com/fceller/ArangoDB into devel 2012-05-25 15:40:39 +02:00
Frank Celler 86fcb881e9 fixed === and !== and == and != 2012-05-25 15:33:35 +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 3a63c092cb Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2012-05-25 10:17:45 +02:00
Heiko Kernbach fc72cd4b16 fixed social line break, style 2012-05-25 10:17:38 +02:00
Frank Celler 1e3ab217f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-05-25 00:26:50 +02:00
Frank Celler 2184db3303 removed globals 2012-05-25 00:16:40 +02:00
Frank Celler 8c4fc40f2d jslint 2012-05-24 23:55:16 +02:00
Heiko Kernbach b1f8409801 added format toggle for query 2012-05-24 16:36:21 +02:00
Frank Celler ef3c8d0de6 cleanup JSLInt 2012-05-24 15:40:48 +02:00
Heiko Kernbach b239853639 welcomemsg 2012-05-24 13:57:40 +02:00
Frank Celler e5d4c3f9f7 Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-05-24 12:18:37 +02:00
Frank Celler c5d79cb0d9 linked errors 2012-05-24 12:18:17 +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
Heiko Kernbach 6347afffdd prompt style 2012-05-23 14:15:04 +02:00
Heiko Kernbach e9e3b678bb changed a functions name 2012-05-23 14:10:50 +02:00
Heiko Kernbach 0a81988649 add doc bugfix 2012-05-23 14:07:59 +02:00
Heiko Kernbach c1b120b8dc avocsh welcomemsg 2012-05-23 13:25:02 +02:00
Heiko Kernbach 3d16ccda68 json document save validation 2012-05-23 13:03:26 +02:00
Heiko Kernbach 389308417b json document save validation 2012-05-23 13:01:28 +02:00
Heiko Kernbach 6122891b8c json document save validation 2012-05-23 13:00:07 +02:00
Frank Celler 21951b3bab Merge branch 'devel' of github.com:triAGENS/ArangoDB 2012-05-23 12:47:39 +02:00
Frank Celler 724421fef1 cleanup 2012-05-23 12:47:21 +02:00
Heiko Kernbach e04a191329 added journalSize 2012-05-23 12:10:16 +02:00
Heiko Kernbach edaa9dd78d links 2012-05-23 11:46:58 +02:00
Frank Celler 0236954f04 Merge branch 'devel' of github.com:triAGENS/ArangoDB 
Conflicts:
	html/admin/js/client.js
	html/admin/js/master.js
 2012-05-23 11:44:40 +02:00
Frank Celler 5572250c9d replaced by link 2012-05-23 11:20:12 +02:00
Frank Celler 70a70f205f client.js... 2012-05-23 10:39:37 +02:00
Frank Celler 95313be897 renamed /document => /_api/document 2012-05-22 16:31:47 +02:00
Heiko Kernbach 8b0ddb56a6 fixed save document 2012-05-22 12:51:52 +02:00
Heiko Kernbach ee15b97153 bugfix sourceview 2012-05-21 11:11:49 +02:00
Heiko Kernbach c089534e98 test 2012-05-15 14:10:08 +02:00
Heiko Kernbach 81f653bf9b mergemaster 2012-05-15 13:36:51 +02:00
Heiko Kernbach c33c7775bd bugfixes 2012-05-14 15:05:16 +02:00
Frank Celler 763e7aba98 renamed to Arango 2012-05-12 14:40:34 +02:00
Heiko Kernbach 7735386109 improved gui 2012-05-11 16:48:16 +02:00
Heiko Kernbach 8175228858 style 2012-05-11 12:44:04 +02:00
Heiko Kernbach ebc5f0165b style 2012-05-10 16:43:46 +02:00
Heiko Kernbach 33e47eb243 added configuration (readonly) 2012-05-10 15:08:18 +02:00
Heiko Kernbach 9f0ef666f8 navstyle 2012-05-09 09:49:10 +02:00
Heiko Kernbach 7600a9a6e8 style/sliderbutton 2012-05-08 15:02:56 +02:00
Heiko Kernbach 1f0d6f854b update 2012-05-08 13:01:27 +02:00
Heiko Kernbach 57021e1ce2 style 2012-05-08 09:20:50 +02:00
Heiko Kernbach d791764eff style update 2012-05-07 15:12:46 +02:00
Heiko Kernbach ea4ccca4d8 query/avocsh style update 2012-05-07 10:48:42 +02:00
Heiko Kernbach 5c7c3eac11 style 2012-05-04 14:10:56 +02:00
Heiko Kernbach 1036e54d1a rename 2012-05-04 09:03:57 +02:00
Heiko Kernbach c8f0bfa9cc json bugfix 2012-05-03 18:58:38 +02:00
Heiko Kernbach 15533e7ce8 update 2012-05-03 17:26:11 +02:00
Heiko Kernbach 0c8e8256fa update 2012-05-03 17:06:27 +02:00
Heiko Kernbach b9e6132527 changed edit coll. view 2012-05-03 16:16:49 +02:00
Heiko Kernbach 7898b07b1a css/design 2012-05-03 14:08:06 +02:00
Heiko Kernbach 30014ed1ea bugfix/added syntax highlighting 2012-05-03 11:57:49 +02:00
Heiko Kernbach 02eb4c162f bugfix 2012-04-30 16:33:25 +02:00
Heiko Kernbach de110701cd design update, load indicator 2012-04-30 16:29:04 +02:00
Heiko Kernbach ba37a2a339 save doc bugfix; design update 2012-04-30 15:40:41 +02:00
Heiko Kernbach 40a568a23e pagination update 2012-04-30 10:10:59 +02:00
Heiko Kernbach 8b1a9c4abd log bugfix 2012-04-27 14:13:14 +02:00
Heiko Kernbach 2f9a625385 new doc pagination instead of loading all docs; style update 2012-04-27 13:54:32 +02:00
Heiko Kernbach d93309c704 logview update 2012-04-27 10:40:08 +02:00
Heiko Kernbach f270656df3 log bugfix, changed create collection view 2012-04-26 13:14:38 +02:00
Heiko Kernbach 239f42a7f7 refresh logs added 2012-04-26 10:40:38 +02:00
Heiko Kernbach 5dbc4a6d5b design update 2012-04-25 14:33:35 +02:00
Heiko Kernbach 522fa3988e pagination bugfix:w 2012-04-25 11:12:50 +02:00
Heiko Kernbach a5c265ddf0 merge 2012-04-24 12:47:54 +02:00