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

5221 Commits

Author SHA1 Message Date
gschwab c0a7aa2d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-22 08:32:37 +02:00
gschwab 3947574805 renamed edgeDefinitions -> _edgeDefinitions 2014-05-22 08:32:34 +02:00
Michael Hackstein 75d5a04ae7 Embedded cursors into fluent AQL interface for graphs. 2014-05-21 18:22:30 +02:00
Michael Hackstein bf89abb737 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 17:34:08 +02:00
Michael Hackstein 852c4da742 Added an example for Example generation in code to general graph module 2014-05-21 17:34:03 +02:00
Thomas Schmidts 166d010b35 added declaration in update vertex 2014-05-21 14:25:21 +02:00
Esteban Lombeyda 4af97257b9 Buf fix: Java Script Syntax error 2014-05-21 12:51:25 +02:00
Esteban Lombeyda 32aee78f7b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 11:53:34 +02:00
Esteban Lombeyda 0b6846e963 Supporting new signature for JS update function 2014-05-21 11:52:06 +02:00
Michael Hackstein 0904f00d77 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-21 09:55:50 +02:00
Michael Hackstein 27474a7960 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-21 09:55:37 +02:00
gschwab e20f18bb1a drop graph after tests 2014-05-21 09:46:27 +02:00
Michael Hackstein ed14083e6f Implemented a wrapper around collections in graph module. Old collection functionality is now preserved 2014-05-21 09:45:53 +02:00
Jan Steemann 11ea87f8fc issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:48:39 +02:00
Jan Steemann ecf08da0cf cleanup 2014-05-20 17:44:52 +02:00
Jan Steemann 15c37a6def Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 17:09:58 +02:00
Jan Steemann 369ffd7788 issue #866: Recurrent/obtrusive "No statistical data yet" popup 2014-05-20 17:08:47 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +02:00
gschwab acb43a202f fixed remove for vertexColelctions 2014-05-20 16:51:54 +02:00
scottashton 88e8ea849f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 16:45:27 +02:00
scottashton a8cacef57d added GRAPH_NEIGHBORS 2014-05-20 16:45:22 +02:00
Michael Hackstein d03a8fa11b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 16:22:47 +02:00
Michael Hackstein dddc5cbd9e Added an _exists function to the general-graph module, which checks if there is a graph with given name to avoid error throwing within apps 2014-05-20 16:22:44 +02:00
scottashton 3b076c4629 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:55:35 +02:00
scottashton c99ce5167d traversal aql 2014-05-20 15:55:07 +02:00
gschwab 4080e1f681 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:53:24 +02:00
gschwab 0cc4969a31 jslint 2014-05-20 15:53:20 +02:00
Michael Hackstein eb7150d815 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 15:48:38 +02:00
Michael Hackstein 35f602fef2 Renamed collections for AQL queries to contain 'UnitTests' prefix 2014-05-20 15:48:33 +02:00
gschwab de2fd3ff69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 15:35:13 +02:00
gschwab 072b00c54b edges of a vertex will be removed, when vertex is removed 2014-05-20 15:35:09 +02:00
Max Kerp 13c3b80976 clean up 2014-05-20 15:17:51 +02:00
Max Kerp b11cffa1c9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 14:53:48 +02:00
Max Kerp 8dd3babebd fixed scss-lint 2014-05-20 14:53:05 +02:00
Michael Hackstein f8d2faf8d5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 14:43:47 +02:00
Michael Hackstein bb9aaaeb4e Fixed error handling on restrict. It will now throw an error if query is restricted to an unkown collection 2014-05-20 14:43:42 +02:00
scottashton b1ce2058fd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:50:40 +02:00
scottashton 009f83026a finished GRAPH_PATHS in aql 2014-05-20 13:50:34 +02:00
Michael Hackstein f89b50a72e Fixed test for directedRelationDefinition error handling 2014-05-20 13:29:00 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
gschwab 3897840af5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:39 +02:00
gschwab a2460276d3 forgot to rename some variables... 2014-05-20 13:25:34 +02:00
Max Neunhoeffer 464b6720ca Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-20 13:25:10 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
gschwab ef1665391a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 12:56:41 +02:00
gschwab ad10fc85e6 added drop function for graphs 2014-05-20 12:56:33 +02:00
Jan Steemann 9513227449 test fuxx 2014-05-20 12:44:51 +02:00
Jan Steemann 7d7396a0a8 added derived file 2014-05-20 11:50:42 +02:00
Max Kerp 5b630fb01b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:40:47 +02:00
Jan Steemann 52be779997 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:40:19 +02:00
Michael Hackstein 1be58a157c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 11:39:37 +02:00
Michael Hackstein d89ff71dbc Implemented generalGraph as a datasource for Traversal queries incl. tests 2014-05-20 11:39:33 +02:00
Max Kerp 9ca0447b69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:39:18 +02:00
Max Kerp a1feb3e19e implemented a form-validation for text-inputs, now 
prohibiting the user to save custom AQl queries containing special html
characters.
 2014-05-20 11:36:18 +02:00
Jan Steemann 6ecfc44f11 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-20 11:32:02 +02:00
Max Kerp 9a2566ad4c fixed the bug that the number of total documents wasn't updated 
when deleting a document and modified the test.
 2014-05-20 11:24:31 +02:00
gschwab b3ad2e303f added tests 2014-05-20 10:37:40 +02:00
gschwab a786369d2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 09:52:30 +02:00
gschwab 434e1009c6 changed to setUp and tearDown 2014-05-20 09:52:25 +02:00
Michael Hackstein b416f8b762 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-20 09:43:39 +02:00
Michael Hackstein 058e1dc0e8 Added setUp and tearDown to AQLQueries test suite in general graph 2014-05-20 09:43:35 +02:00
gschwab 3c0fdae6f7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 08:57:48 +02:00
gschwab bfb5610426 x-edges tests 2014-05-20 08:57:44 +02:00
Michael Hackstein ff54178f22 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 17:47:47 +02:00
Michael Hackstein b798c4f23a Enabled tests against AQL execution in graph module 2014-05-19 17:47:42 +02:00
Jan Steemann b06e89da54 simplified 2014-05-19 17:44:56 +02:00
scottashton 4d2939de17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 16:42:34 +02:00
scottashton 0f68fa982d fixed bug in edges 2014-05-19 16:42:30 +02:00
Michael Hackstein af96bf0b70 Fixed jslint warning, missing semicolon 2014-05-19 16:19:22 +02:00
Michael Hackstein 6a33a9f9e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 16:17:34 +02:00
Michael Hackstein 39b38ae159 Commented part of the fluent AQL interface in graphs, there is some conception necessary. Implemented a filter alternative instead 2014-05-19 16:17:30 +02:00
Jan Steemann 59aa16de0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 15:50:19 +02:00
scottashton 35b34e4804 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 15:28:16 +02:00
scottashton 256868bdc2 aql function edges 2014-05-19 15:28:05 +02:00
gschwab 81c4982380 added tests for vertex and edges - fixed jslint 2014-05-19 15:15:58 +02:00
gschwab 37f7002c75 added tests for vertex and edges - fixed jslint 2014-05-19 15:06:15 +02:00
gschwab c38a455760 added tests for vertex and edges 2014-05-19 15:04:19 +02:00
Jan Steemann 9453beb7cc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 14:25:34 +02:00
Michael Hackstein 105dde54a7 Implemented filter on general graph module and simplified test code 2014-05-19 13:12:10 +02:00
Jan Steemann 5c100bc85b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 12:07:26 +02:00
Michael Hackstein 044f094139 Fixed a bug in graph module aql generation. For in was missing 2014-05-19 12:02:21 +02:00
Jan Steemann 3b8d282c7b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-19 11:55:27 +02:00
Michael Hackstein 8bf9922693 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 11:46:25 +02:00
Michael Hackstein deb477b453 Implemented restrict on edges/inEdges/outEdges in general graph module 2014-05-19 11:46:19 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
 2014-05-19 11:21:58 +02:00
Michael Hackstein 5255e8f26b Added tests for restriction on edges call in general graph module 2014-05-19 11:08:23 +02:00
Michael Hackstein d558fa8fbd Started implementing fluent AQL interface. Right now allows edges 2014-05-19 10:55:16 +02:00
scottashton d9951b9642 finished tests for _create and _graph 2014-05-19 09:47:37 +02:00
scottashton 58eefee6b5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 09:45:49 +02:00
scottashton 0c0c2773fa finished tests for _create and _graph 2014-05-19 09:45:43 +02:00
Michael Hackstein aec7099a3e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 09:34:06 +02:00
Michael Hackstein a0985ec515 Fixed tests to use graph functions starting with _ 2014-05-19 09:34:02 +02:00
Jan Steemann 295870565b issue #864: Inconsistent behavior of AQL REVERSE(list) function 2014-05-19 09:31:39 +02:00
Michael Hackstein 4ac62a5461 Fixed JSLint and renamed graph functions to start with _ 2014-05-19 09:30:44 +02:00
Michael Hackstein 0ee4913d5a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-19 08:50:46 +02:00
scottashton 1ac649cf94 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-19 08:43:01 +02:00
scottashton 4dbbc550df work in progress 2014-05-19 08:42:37 +02:00
Jan Steemann 2cb694b2d5 make test restartable 2014-05-17 13:13:30 +02:00
Jan Steemann bed37d7d11 slightly less comparisons 2014-05-17 12:04:54 +02:00
Michael Hackstein 0a73cd6823 Implemented restrict interface on edges, right now implementation is not optimized, missing cursor functionality 2014-05-17 11:27:47 +02:00
Jan Steemann e532223fcd small optimizations 2014-05-17 01:38:39 +02:00
Jan Steemann 63b287157f jshund 2014-05-17 00:55:37 +02:00
Jan Steemann 0ca849efb9 emit buffer to prevent very big string allocations/reallocations 2014-05-17 00:12:32 +02:00
Jan Steemann 1c6f63bad0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 20:13:33 +02:00
Jan Steemann a0ffb65b88 emit output of print function to prevent buffering of super-long strings 2014-05-16 20:11:31 +02:00
Heiko Kernbach 6582ce9b8a merge 2014-05-16 20:02:29 +02:00
Heiko Kernbach 71f8619ede karma 2014-05-16 20:01:26 +02:00
Heiko Kernbach 8aa7120dbb jslint 2014-05-16 20:01:07 +02:00
Heiko Kernbach 8172666dbb added new indicator for shortcuts help 2014-05-16 19:47:43 +02:00
Heiko Kernbach 2eaac09ec4 added hotkey modal template to manifest.json 2014-05-16 19:36:57 +02:00
Heiko Kernbach e14c87f0d7 added template for hotkeys modal 2014-05-16 19:36:37 +02:00
Heiko Kernbach 9d3b292183 new scss file for hotkeys modal 2014-05-16 19:36:23 +02:00
Heiko Kernbach a0bbd238c3 added global shortkey helper - press question mark + shift 2014-05-16 19:35:51 +02:00
Heiko Kernbach 02680a4c15 fixed arangoSpec 2014-05-16 19:35:25 +02:00
Jan Steemann 51e9059e3e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-16 19:06:26 +02:00
Jan Steemann e3f7df878e added derived file 2014-05-16 19:06:16 +02:00
Michael Hackstein 20d33b80a5 Bound collections by name to graph object. graph.v === db.v 2014-05-16 17:22:32 +02:00
Michael Hackstein f490018530 Renamed internal functionality to '_' and internal variables with equal names to '__' 2014-05-16 16:50:11 +02:00
Michael Hackstein fd939bdca2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:28:03 +02:00
Michael Hackstein 4824e6e914 Refactored tests to make them more dry 2014-05-16 16:27:27 +02:00
Michael Hackstein 1e9e5d3254 Fixed a bug where only collections with the name 'relationName' could be created 2014-05-16 16:26:45 +02:00
scottashton a40e2ebdfe pre merge commit 2014-05-16 16:17:02 +02:00
scottashton 1a0b0e4a49 pre merge commit 2014-05-16 16:16:48 +02:00
gschwab 55c494c81d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 16:12:40 +02:00
gschwab 1960ce34f4 added vertex and edge methods 2014-05-16 16:10:22 +02:00
Michael Hackstein a6b238c8f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 15:43:30 +02:00
Michael Hackstein 69eeba2403 Commented failing tests in general graph for commit. Productive code missing, but test first 2014-05-16 15:37:05 +02:00
Heiko Kernbach b4ecbff331 fixed collections logs spec 2014-05-16 15:35:56 +02:00
Michael Hackstein e404d070f4 Fixed merge conflict on general graph tests 2014-05-16 15:31:39 +02:00
scottashton 47dfdcd75c first version of create graph 2014-05-16 15:19:16 +02:00
scottashton 11faa956a7 first version of create graph 2014-05-16 15:17:54 +02:00
Michael Hackstein 1b43b18bdc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:56:18 +02:00
gschwab f0194b5b25 fixed jslint 2014-05-16 14:52:09 +02:00
Michael Hackstein 3c95b7564f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-16 14:50:02 +02:00
Michael Hackstein 739ab6d54c Added first tests for restrict on edges. Not working yet, preconditions are missing 2014-05-16 14:49:58 +02:00
Jan Steemann 7b44fd92f9 fixed db.collection.geo documentation 2014-05-16 14:46:13 +02:00
Heiko Kernbach bb92ebe4fc merge 2014-05-16 13:12:23 +02:00
Heiko Kernbach 70a7f1a45c removed shellviewspec from json 2014-05-16 13:11:21 +02:00
gschwab 6451af1cb4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/common/modules/org/arangodb/general-graph.js
 2014-05-16 13:10:31 +02:00
gschwab 24871b64ef start implement edges() 2014-05-16 13:08:33 +02:00
scottashton fd944eee8e fixed jslint 2014-05-16 13:02:56 +02:00
Heiko Kernbach 969826af27 jslint 2014-05-16 13:01:34 +02:00
Heiko Kernbach 4cb82ee0b1 logs bugfix 2014-05-16 12:58:25 +02:00
Heiko Kernbach fc8003b4d7 fixed logs spec 2014-05-16 12:26:47 +02:00
Heiko Kernbach 903b3aaaeb temp commented out 2014-05-16 12:21:21 +02:00
Heiko Kernbach e5115fabfd removed console logs 2014-05-16 12:19:19 +02:00
Heiko Kernbach f5c1fcd25f added shellViewSpec, invertet order of logs showing up @ frontend 2014-05-16 12:18:19 +02:00
scottashton 266f72a253 initial checkin for new graph module 2014-05-16 11:29:22 +02:00
scottashton b74a0b18e6 added tests to new jsoneditor function 2014-05-15 16:44:30 +02:00
Jan Steemann 978c6b1991 giving up 2014-05-15 16:28:14 +02:00
Jan Steemann 7b4f8d3fd9 try to fix test 2014-05-15 16:03:06 +02:00
Michael Hackstein d3ca063b4e Added click on top row for json-editor to insert initial attribute/value pair 2014-05-15 15:45:51 +02:00
Jan Steemann 8959d9df41 adjusted test 2014-05-15 12:35:23 +02:00
Jan Steemann 824cda67e2 fixed test 2014-05-15 10:45:40 +02:00
scottashton 700480f20a adjusted all require(org/arangodb/graph) to new graph-blueprint module 2014-05-15 10:33:20 +02:00
Jan Steemann 2adeda7da3 restrict cap constraint for _statistics 2014-05-14 21:34:32 +02:00
Jan Steemann a69d93b7c9 fixed variable name 2014-05-14 21:14:15 +02:00
Jan Steemann 9984b341ac fixed comment 2014-05-14 21:12:58 +02:00
Frank Celler db566d53d9 added rewriteRequest 2014-05-14 20:15:12 +02:00
Jan Steemann ee8fe74a8a removed tabs 2014-05-14 17:41:00 +02:00
scottashton 37f81ee9d6 added new "old" module graph-blueprint and directed to that whenever graph has been required 2014-05-14 17:11:59 +02:00
scottashton 1d2fbb67ed removed tests 2014-05-14 15:44:20 +02:00
scottashton f79cd75081 Closes #851 2014-05-14 15:30:06 +02:00
Jan Steemann 8818a880bc added comments 2014-05-14 11:41:39 +02:00
Jan Steemann 2d36eb2473 removed name attribute 2014-05-14 09:47:48 +02:00
Jan Steemann 684bc82a5f fixed jslint warning 2014-05-13 18:18:32 +02:00
Jan Steemann eeedb022d0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-13 18:16:04 +02:00
Jan Steemann 299e05c0b2 fixed unrestricted queries in cluster dashboard 2014-05-13 18:15:34 +02:00
Max Kerp 2ff1218759 fixed JSLint 2014-05-13 17:59:05 +02:00
Max Kerp d0a40b8981 fixed the ace cursor bug by updating ace.js and 
setting the default font-family to courier new. Added firefox
support for the custom query name check feedback. This needs to go into
the stylesheets but i didnt't find a way to make this work just yet, cause i
don't know the styles well enough. Hope Michael or Heiko can help me
with this.
 2014-05-13 17:47:25 +02:00
Jan Steemann adf9092744 fixed jslint warnings 2014-05-13 14:05:59 +02:00
Max Kerp fcc223a1b1 Implemented a check for invalid query names. 
Now prohibiting saving names with special html characters while giving
visual feedback.
 2014-05-13 13:42:30 +02:00
Jan Steemann 658294ecb3 fixed file with conflicts 2014-05-12 17:22:09 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
 2014-05-12 16:49:20 +02:00
Jan Steemann 4cf29af60a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-12 13:56:12 +02:00
Jan Steemann 204a16c224 fixed compiler warning 2014-05-12 13:55:58 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
scottashton 1bb91230f0 adjusted tests 2014-05-12 11:02:07 +02:00
Jan Steemann c47058c6de issue #860: Documentation: Wrong example 2014-05-12 09:57:43 +02:00
Frank Celler e83c7b3a34 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-12 00:44:58 +02:00
Frank Celler c12831a361 fixed interval 2014-05-12 00:44:44 +02:00
Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-12 00:07:46 +02:00
Claudius Weinberger 109c6d6304 redesign dashboard 2014-05-11 23:45:36 +02:00
Claudius Weinberger 86cd2a8390 redesign dashboard 2014-05-11 23:43:09 +02:00
Claudius Weinberger 1e32c7a2d2 redesign dashboard 2014-05-11 23:22:41 +02:00
Claudius Weinberger 3740035736 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 22:43:48 +02:00
Claudius Weinberger 14256b504e redesign dashboard 2014-05-11 22:42:49 +02:00
Frank Celler a315c7cc16 better history 2014-05-11 22:39:42 +02:00
Claudius Weinberger cb28bb478a design Dashboard 2014-05-11 20:58:28 +02:00
Claudius Weinberger 22344c9b66 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 15:12:52 +02:00
Claudius Weinberger 71c50b9942 redesign dashbaord 2014-05-11 15:12:27 +02:00
Frank Celler d376c70b20 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
 2014-05-11 15:04:42 +02:00
Frank Celler 7044757739 fixed order (big number on top) 2014-05-11 15:03:31 +02:00
Claudius Weinberger 1b1241f91e Merge branch 'devel' of github.com:fceller/ArangoDB into devel 2014-05-11 00:41:54 +02:00
Claudius Weinberger ea487051c4 redesign dashboard 2014-05-11 00:41:36 +02:00
Frank Celler d1172f7f48 added cutoff 2014-05-11 00:16:42 +02:00
Claudius Weinberger 9252bb8629 redesign dashboard 2014-05-10 22:31:17 +02:00
Claudius Weinberger 67672b8492 redesign Dashboard 2014-05-10 21:35:19 +02:00
Jan Steemann 442fa7503c added more delay for busy workers 2014-05-10 02:34:18 +02:00
Jan Steemann d23fe23254 added tasks manual entry 2014-05-10 02:25:59 +02:00
Jan Steemann bb25e5cb72 added derived file 2014-05-10 00:46:47 +02:00
Jan Steemann 548a79ac4d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-10 00:43:40 +02:00
Jan Steemann cfc2d407d7 added tests for task management 2014-05-10 00:43:14 +02:00
Max Neunhoeffer 8ce1b08183 Add a ClusterMethod to truncate a collection in a cluster. 2014-05-09 23:14:41 +02:00
Jan Steemann 5bca4e354b fix preselection of query select box after adding 2014-05-09 21:47:51 +02:00
Claudius Weinberger 7844755d8e redesign Dashboard 2014-05-09 21:37:19 +02:00
Heiko Kernbach 39a620e6d5 scss lint 2014-05-09 20:33:38 +02:00
Heiko Kernbach fac8fccef2 scss lint 2014-05-09 20:23:16 +02:00
Heiko Kernbach 22a9043f32 query view 2014-05-09 20:02:36 +02:00
Max Kerp aa2971c349 Issue #513 : fixed JSLint 2014-05-09 19:55:59 +02:00
Max Kerp eab7955c4a Issue #513 Almost there. Just cleaning up now. 2014-05-09 19:35:37 +02:00
Max Kerp 0623f6f4cd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 19:02:55 +02:00
Max Kerp de5bd18056 implemented override of custom queries functionality 2014-05-09 19:02:48 +02:00
Heiko Kernbach 91ee14605c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-05-09 18:49:33 +02:00
Heiko Kernbach f3665a1943 query view, table css fix, added delete button for custom query 2014-05-09 18:46:41 +02:00
Jan Steemann 3becebf488 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 17:36:42 +02:00
Jan Steemann 82595ee169 improved periodic task management 2014-05-09 17:36:24 +02:00
Frank Celler dbbde35340 Merge branch'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:30:59 +02:00
Max Kerp 02842fb19e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:24:16 +02:00
Max Kerp 16600971b2 Working on the custom query manager 2014-05-09 17:23:57 +02:00
Frank Celler 65ad94d9cf Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-09 17:15:11 +02:00
Frank Celler c2d57c7909 added applicationContext and foxxFilename 2014-05-09 17:12:55 +02:00
Frank Celler 327d669741 fixed safeJoin (missing join) 2014-05-09 17:10:30 +02:00
scottashton dfbe827525 more tests 2014-05-09 16:23:17 +02:00
Jan Steemann eb73bfb127 make some collections smaller 2014-05-09 15:22:11 +02:00
scottashton 7433d6bf35 disabled useSSLonCoordinators, currently not supported 2014-05-09 14:15:44 +02:00
Jan Steemann 92f3f277f1 make some of the system collections smaller 2014-05-09 13:50:08 +02:00
Jan Steemann 91327e1497 fixed jslint warning 2014-05-09 13:31:52 +02:00
Max Neunhoeffer fb7f28f488 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-09 11:48:21 +02:00
Max Neunhoeffer 21b0264e01 Sort out SSL in PortFinder. 2014-05-09 11:48:06 +02:00
scottashton 4c376a991d finished tests showClusterView and gained 100% coverage, fixe modal bug in showClusterView 2014-05-09 09:01:32 +02:00
Jan Steemann 20f1940458 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-09 00:42:32 +02:00
Jan Steemann c843a12149 jshund 2014-05-09 00:42:18 +02:00
Michael Hackstein a9bd2b3259 Fixed include order of backbone models and collections 2014-05-08 23:22:15 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Michael Hackstein b7ac696af8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-08 22:41:10 +02:00
Michael Hackstein 92f02fbce3 Fixed design bugs in graph viewer 2014-05-08 19:09:17 +02:00
Jan Steemann 78185a60d7 fixed return code for async job cancellation 2014-05-08 18:27:46 +02:00
scottashton 6a6e92eb5c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 15:16:51 +02:00
scottashton 31355e7aca showClusterView tests 2014-05-08 15:16:45 +02:00
Jan Steemann f18d117228 added GC 2014-05-08 14:36:12 +02:00
scottashton a97054c20a removed deleted files from karma config file 2014-05-08 14:17:15 +02:00
scottashton 9cd765e4df Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-08 14:15:36 +02:00
scottashton 3ebfbc099b more tests for showClusterView, fixed bug so documents table is drawn after deletion again 2014-05-08 14:15:31 +02:00
Jan Steemann 0218291d20 added test for issue #848 2014-05-08 14:08:24 +02:00
Frank Celler 755558d734 removed old files 2014-05-08 11:45:53 +02:00
Frank Celler 0ecfe5e154 added empty remark 2014-05-08 11:18:08 +02:00
Michael Hackstein f4b1002856 Fixed tests for resizing 2014-05-07 22:30:53 +02:00
Michael Hackstein f7c9b68807 Fixed resize handling for graph viewer 2014-05-07 21:48:09 +02:00
Michael Hackstein b34c90acf3 Fixed test for arangoAdapterUI 2014-05-07 21:29:56 +02:00
Michael Hackstein c1ab48f029 Fixed a bug where grouping of nodes was not executed correctly #838 2014-05-07 21:23:29 +02:00
Michael Hackstein c124e03782 Fixed a bug where random start node and direction of graph was not accepted properly 2014-05-07 21:19:15 +02:00
Michael Hackstein 81b866a5a4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-07 21:04:08 +02:00
Michael Hackstein ad374858b4 Fixed merge conflicts with shutdown button spec 2014-05-07 21:03:59 +02:00
Jan Steemann 21cfd10453 added AQL FLATTEN function 2014-05-07 19:50:58 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
scottashton ddbeb4aecb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 17:57:59 +02:00
scottashton e1d05d178e started tests for showClusterView 2014-05-07 17:57:24 +02:00
Max Neunhoeffer 62ca0e9a30 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-05-07 16:47:06 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
scottashton 97a776510e more tests 2014-05-07 16:19:19 +02:00
scottashton 169ca7589e fixed healthcheck 2014-05-07 11:12:37 +02:00
Michael Hackstein 0c57095b9f Added spec for shutdown button 2014-05-06 19:27:07 +02:00
Max Kerp 3e72aa86c8 Issue #513 I created a third tab for managing custom queries 
the new editor will be changed to a table just like in the
collectionsView tommorow.
 2014-05-06 17:41:46 +02:00
scottashton 0b3bfdf3e6 tests for cluster views 2014-05-06 17:09:16 +02:00
Heiko Kernbach 2d4204692b jslint 2014-05-06 15:08:55 +02:00
scottashton 0dd1ec64f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-06 14:54:05 +02:00
scottashton 37ff09579c adjusted healthcheck 2014-05-06 14:53:58 +02:00
Heiko Kernbach 870c032917 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-06 14:45:50 +02:00
Heiko Kernbach e5139f3e84 100% coverage of navigationView 2014-05-06 14:45:43 +02:00
scottashton 4f4c5388d5 enabled cluster frontend to configure a cluster for ssl comm 2014-05-06 14:22:11 +02:00
Jan Steemann 2320c20f61 issue #847: fixed wrong return code value in docs 2014-05-06 13:11:12 +02:00
Max Neunhoeffer ad5db2a380 Use cluster auth for shutdown. 2014-05-06 13:02:38 +02:00
Max Neunhoeffer 7b44869eb3 Fix kickstarter process startup and shutdown. 2014-05-06 11:44:25 +02:00
Jan Steemann 8f821d62fe prevent AQL query from failing 2014-05-05 21:50:15 +02:00
scottashton c81686ab5b delete index only by collection name 2014-05-05 15:27:31 +02:00
scottashton 123ac848a8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-05 15:17:49 +02:00
scottashton cd9f6da1f7 refactored arangoCollectionsCollection 2014-05-05 15:17:38 +02:00
Michael Hackstein 8fe265d434 Fixed SCSS-Lint 2014-05-05 10:52:14 +02:00
Claudius Weinberger 50cb3f5600 Dashboard redesign 2014-05-05 08:26:36 +02:00
Frank Celler 31a5c8f7fc fixed percision 2014-05-05 00:06:57 +02:00
Claudius Weinberger 6688cb4190 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
 2014-05-04 23:41:28 +02:00
Claudius Weinberger bfeff84705 Dashboard redesign 2014-05-04 23:37:31 +02:00
Frank Celler acc173b7d7 fixed title 2014-05-04 21:44:09 +02:00
Frank Celler 29fb388b1c repair async & sync 2014-05-04 20:30:37 +02:00
Claudius Weinberger f36dcb8164 Merge branch 'devel' of github.com:fceller/ArangoDB into devel 
Dashboard redesign
 2014-05-04 18:50:30 +02:00
Claudius Weinberger 87c54c6163 Dashboard redesign 2014-05-04 18:49:01 +02:00
Frank Celler db4b974814 cluster statistics 2014-05-04 15:28:18 +02:00
Frank Celler 3608301be2 cosmetics 2014-05-04 15:27:34 +02:00
Claudius Weinberger ce4cd13669 Dashboard redesign 2014-05-04 14:10:44 +02:00
Claudius Weinberger 169d0d1262 Dashbaord redesign 2014-05-04 00:36:59 +02:00
Claudius Weinberger 73f512e548 Dashboard redesign 
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
	js/apps/system/aardvark/frontend/scss/_constants.scss
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-05-04 00:33:21 +02:00
Claudius Weinberger da6d3a2e7d shboard redesign 2014-05-04 00:25:02 +02:00
Frank Celler e34e331f1c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-04 00:07:25 +02:00
Frank Celler 723cf4da2a fixed statistics for standalone 2014-05-04 00:06:45 +02:00
Michael Hackstein 9596b7d9c0 Resized the legend of graphs based on screen-width 2014-05-03 21:05:46 +02:00
Jan Steemann 9fef86a071 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 22:11:32 +02:00
Jan Steemann b978a271ea added AQL function `CURRENT_DATABASE()` 2014-05-02 22:06:47 +02:00
Jan Steemann 0a5e641f97 added index memory usage statistics 
this also adds index memory usage to the output of the `figures` method
 2014-05-02 22:05:29 +02:00
Heiko Kernbach 3434db8de1 #821 - added icon indicator for server status (footer) 2014-05-02 19:32:25 +02:00
Heiko Kernbach 512d1681e3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 19:28:40 +02:00
Heiko Kernbach f197fbc3d1 fixed specs 2014-05-02 19:28:32 +02:00
Max Kerp 64aa7b8eec fixed that a click anywhere on the foxxAppView opens a new Tab 
Now only a click on the image will open the app in a new Tab
 2014-05-02 19:14:33 +02:00
Heiko Kernbach 3f7fe4c533 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 19:09:05 +02:00
Heiko Kernbach 0259dbb011 fixed spec 2014-05-02 19:06:28 +02:00
Max Kerp 6db9934d86 changed the padding of the dropdown-header 2014-05-02 19:02:49 +02:00
Max Kerp 7e014039f9 fixed issue #735. A click on the app img opens the app in a new tab now 2014-05-02 18:59:24 +02:00
Claudius Weinberger 0bc2d9872c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 17:19:53 +02:00
Claudius Weinberger 1682a95e8a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
 2014-05-02 17:18:26 +02:00
Heiko Kernbach efb8396576 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 17:17:07 +02:00
Heiko Kernbach 43ec4eae4a added jsoneditor code theme, removed readonlykeys 2014-05-02 17:16:59 +02:00
Michael Hackstein 46ae6a19d9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 15:36:19 +02:00
Michael Hackstein 46ec20a7e1 Added edge labels #805 2014-05-02 15:36:14 +02:00
Heiko Kernbach 86a74ae445 update views after removal of a database 2014-05-02 15:14:16 +02:00
Max Kerp 874c8c769e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 14:59:34 +02:00
Heiko Kernbach 2237d1a93f bugfix database nav menue, collections not re-fetched/rendered 2014-05-02 14:52:17 +02:00
Max Kerp 65f6bf2a3f Added a divider in the databse dropdown menu and changed color of 
corneredBadge to be consistent with the overall design
 2014-05-02 14:36:10 +02:00
Heiko Kernbach e18a38edaa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-02 12:31:10 +02:00
Heiko Kernbach 7f11405f59 manage dbs now shows all collections + specs for changes 2014-05-02 12:31:03 +02:00
Jan Steemann 65023d63f8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-02 12:00:49 +02:00
Jan Steemann 02a532a122 added CURRENT_USER function for AQL 2014-05-02 12:00:39 +02:00
Heiko Kernbach ab0f4dbe63 added hotkeys + tests for jasmin 2014-05-02 11:12:56 +02:00
Heiko Kernbach f3d2e28379 added specs for modal hotkeys 2014-05-02 10:44:14 +02:00
Heiko Kernbach 7cd6cb1039 modalview specs added 2014-05-01 22:33:23 +02:00
Heiko Kernbach 44415975bb arangoSpec 2014-05-01 22:18:32 +02:00
Heiko Kernbach f0f7f6ae2c added tests to arangoSpec 2014-05-01 22:09:13 +02:00
Heiko Kernbach a4ea3e0cf6 bugfix event loop 2014-05-01 21:25:55 +02:00
Michael Hackstein f14a05ebf5 Fixed test for change label and color 2014-04-29 11:04:40 +02:00
Michael Hackstein 8a788b3605 Fix of graphviewer change labelcolor 2014-04-29 11:04:21 +02:00
Michael Hackstein 253e893c76 Added tests for the single-machine view 2014-04-28 13:08:37 +02:00
Michael Hackstein 8e64fa2088 Added test for the cluster scenario selector 2014-04-27 21:10:12 +02:00
Michael Hackstein 1b58478e15 Removed dead code 2014-04-27 20:18:50 +02:00
Michael Hackstein f637d49bce Added a spec for loginModalView in cluster setup 2014-04-27 19:13:53 +02:00
Michael Hackstein d83b56f9f4 Fixed JSLint 2014-04-26 12:11:14 +02:00
Heiko Kernbach c6483da71f hotkeys 2014-04-25 18:14:37 +02:00
Heiko Kernbach a6baad7a48 enabled hotkeys for scrolling + modals 2014-04-25 18:02:25 +02:00
Heiko Kernbach 5dae71c4c7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-25 12:47:05 +02:00
Heiko Kernbach c941fd581b finished notification view spec 2014-04-25 12:46:59 +02:00
Jan Steemann 18302b3ab4 do not segfault on cancellation 2014-04-25 12:45:31 +02:00
scottashton dcf0f8fbb8 bugfix 2014-04-25 12:30:05 +02:00
scottashton 2076b61396 changed dashboardView, only 2 digits after comma, css bug in resizing d3charts 2014-04-25 11:42:19 +02:00
scottashton 708e0a40ae Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-25 10:30:51 +02:00
scottashton 9156d8b261 bugfix 2014-04-25 10:30:46 +02:00
Michael Hackstein ea859faeb1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-25 10:20:24 +02:00
Michael Hackstein 1bb40173e6 Added more tests 2014-04-25 10:20:21 +02:00
scottashton 1be1c6afff dashbardView 100% tested 2014-04-25 09:57:58 +02:00
scottashton 8aed40c821 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-25 09:43:34 +02:00