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

2825 Commits

Author SHA1 Message Date
dajester2013 f99df3b6b0 Update ahuacatl.js 
followVertices changed to filterVertices
 2014-01-23 05:48:23 -06:00
dajester2013 1cad676170 Update ahuacatl.js 
fix indentation
 2014-01-23 05:46:34 -06:00
dajester2013 27806d90a8 traversal(_tree) vertex filtering 
added params "filterVertices" and "vertexFilterType" to traversal(_tree).  "filterVertices" accepts an array of examples similar to "followEdges", while "vertexFilterType" defines how to filter out vertices that do not match the examples. "vertexFilterType" can be set to "prune", "exclude", or (default) ["prune","exclude"].
 2014-01-23 05:45:28 -06:00
Jan Steemann 17c8de6560 updated CHANGELOG 
Conflicts:
	CHANGELOG
 2014-01-21 13:41:20 +01:00
Jan Steemann 2d4db0ea40 mount all system apps by name 2014-01-21 13:39:57 +01:00
Jan Steemann f6b872e01c updated CHANGELOG 2014-01-21 13:38:32 +01:00
Jan Steemann d10748155f follow up for issue #738 2014-01-21 13:31:01 +01:00
Jan Steemann f99f362f07 small improvement for issue #738 2014-01-21 13:30:38 +01:00
Alan Plum 3e653e303d Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-21 13:28:46 +01:00
Jan Steemann 0c039e0264 mount all system apps by name 2014-01-21 13:27:40 +01:00
Frank Celler 251c2fa448 release version 1.4.6 2014-01-20 22:09:44 +01:00
Jan Steemann 4f5052f469 issue #730: initial implementation of A* 2014-01-18 01:46:24 +01:00
Jan Steemann a2e11e606b added graph-specific error code 2014-01-18 01:08:24 +01:00
Jan Steemann 583878176b issue #736: AQL function to parse collection and key from document handle 
Conflicts:

	CHANGELOG
 2014-01-17 23:13:06 +01:00
Jan Steemann e99f813e0a follow up for issue #738 2014-01-17 22:58:43 +01:00
Jan Steemann 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Jan Steemann ed08a41a11 small improvement for issue #738 2014-01-17 22:01:24 +01:00
Jan Steemann c0aa6157ff Merge branch 'globals-filename-dirname' of https://github.com/pluma/ArangoDB into devel 2014-01-17 21:41:44 +01:00
Alan Plum 371bba964b Added __dirname, __filename pseudo-globals. Fixes #733. 2014-01-17 21:31:16 +01:00
Jan Steemann 0bbbd53d4d added fm.rescan() method 
Conflicts:
	CHANGELOG
 2014-01-17 14:06:27 +01:00
Jan Steemann c7380398d9 added fm.rescan() method 2014-01-17 14:04:10 +01:00
Frank Celler d0c05f6628 fixed issue #734: foxx cookie and route problem 2014-01-16 14:16:47 +01:00
Frank Celler 87009c7e6e added missing db prefix 2014-01-16 14:08:45 +01:00
Frank Celler c2c574d828 added missing encoding 2014-01-16 14:08:28 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config 
Conflicts:
	js/actions/api-foxx.js
 2014-01-15 18:10:26 +01:00
Jan Steemann db0c6dacae added test 2014-01-15 18:09:56 +01:00
Jan Steemann d8ac4046f8 added fm.configJson method 2014-01-15 18:07:47 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann 231e277113 added fm.configJson method 2014-01-15 17:54:59 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Frank Celler 30252c1877 Merge pull request #731 from pluma/error-response-error-names 
Added support for error names instead of error types
 2014-01-14 00:27:39 -08:00
Jan Steemann f8c50ade6e force reloading of user functions 2014-01-13 17:50:36 +01:00
Jan Steemann 8ea145cd8f force reloading of user functions 2014-01-13 17:49:44 +01:00
Jan Steemann 50105fc0d9 fixed error in index documentation 2014-01-13 17:30:08 +01:00
Jan Steemann f3dd1431a8 Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 2014-01-13 17:26:20 +01:00
Jan Steemann 7458abceda fixed error in index documentation 2014-01-13 17:02:09 +01:00
Frank Celler 9a68feaa98 release version 1.4.5-rc2 2014-01-13 14:34:55 +01:00
Michael Hackstein 4bb630b030 Further additions to router tests 2014-01-12 22:05:41 +01:00
Michael Hackstein 93065b4a3d Added some more tests to web-interface router. Some routes are tested now. Fixed some minor bugs during tests 2014-01-12 14:44:21 +01:00
Alan Plum d055c778d4 Added support for error names instead of error types. 2014-01-11 21:37:59 +01:00
Frank Celler 13d1e5e5ab Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 12:02:25 +01:00
Frank Celler 2fd7bfcbc3 Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 02:35:31 -08:00
Jan Steemann 22a7f3e083 a few small corrections in the upload web interface 2014-01-10 18:38:12 +01:00
Jan Steemann 0e5c9c8a85 a few small corrections in the upload web interface 2014-01-10 18:05:06 +01:00
Jan Steemann f95a0dc6c1 defer evaluation of subqueries 2014-01-10 16:45:36 +01:00
Jan Steemann 269e50eb8f defer evaluation of logical operators 2014-01-10 16:45:07 +01:00
Jan Steemann a9c2dcc83d Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 
Conflicts:
	CHANGELOG
 2014-01-10 16:43:18 +01:00
Jan Steemann dc8fdf8ca0 defer evaluation of subqueries 2014-01-10 16:42:46 +01:00
Michael Hackstein e547a87c2d Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF 2014-01-10 16:00:21 +01:00
Michael Hackstein 7d86b21a43 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-10 15:59:35 +01:00
Michael Hackstein dc6f83d561 Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF 2014-01-10 15:59:28 +01:00
Jan Steemann 8277e7582c defer evaluation of logical operators 2014-01-10 10:58:30 +01:00
Frank Celler 005144ff05 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 23:07:38 +01:00
Frank Celler 9582ea8c94 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 14:05:06 -08:00
Alan Plum 1a5f4c98f2 Fixed package file resolution. Fixes #718, #720. 2014-01-09 23:03:30 +01:00
Alan Plum 3d511060ce App requires should be module-relative by default. Fixes #721 2014-01-09 22:06:57 +01:00
Alan Plum 6c0f9ef6b0 Fixed package file resolution. Fixes #718, #720. 2014-01-09 19:06:15 +01:00
Alan Plum 1b72d07efc Default package "main" to "index". Fixes #719. 2014-01-09 18:17:20 +01:00
Jan Steemann 7a3635adf9 fixed problem with AQL functions in multiple databases 2014-01-08 09:53:03 +01:00
Jan Steemann 56054d3e66 fixed problem with AQL functions in multiple databases 2014-01-08 09:51:56 +01:00
Jan Steemann 02a84a4f92 allow functions results as parameters in all function calls 2014-01-06 11:15:48 +01:00
Jan Steemann ca1e6288a2 allow functions results as parameters in all function calls 2014-01-06 11:14:54 +01:00
Frank Celler 5455f2eeee release version 1.4.5-rc1 2014-01-03 15:00:51 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 3023521535 fixed client-side implementation of function registration 2014-01-03 13:58:01 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Jan Steemann ef84ba6705 fixed potential deadlock in global context execution 2014-01-03 13:45:43 +01:00
Jan Steemann 1dd385f52d use `--data-binary` instead of `--data` in curl examples 2014-01-03 12:12:54 +01:00
Michael Hackstein ccd231551e Moved the content a bit mor to the top 2014-01-02 14:01:52 +01:00
Michael Hackstein 605d6e9483 Moved the content a bit mor to the top 2014-01-02 14:00:09 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 684464c935 release version 1.4.4 2013-12-24 10:15:45 +01:00
Frank Celler 046eb9df9d release version 1.4.4-rc1 2013-12-22 18:28:12 +01:00
Frank Celler 2e3956856e generated files 2013-12-22 14:59:37 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Jan Steemann 5d5035ed3a fixed JS error 2013-12-18 16:24:03 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Michael Hackstein ec83539390 The start view of the graph viewer now offers support for multiple label/colour attributes 2013-12-18 09:36:05 +01:00
Michael Hackstein bf520f652f GraphViewer it is now possible to define a list of label attributes and colour attributes 2013-12-17 23:25:06 +01:00
Michael Hackstein d3be3c37b8 GraphViewer: Nodes can now be coloured by a list of attributes also. Still Missing Interface 2013-12-17 11:04:05 +01:00
Michael Hackstein 521314c73a The nodeshaper will now cut down long word labels. Also it is able internally use an array of label attributes. TODO: Add list to colours and offer interface for it 2013-12-17 09:57:40 +01:00
Michael Hackstein 3be384a624 Fixed all karma tests (especially JSLint in Browsers). Problem is that i had a test checking for location.replace which did fail but pointed the browser to some undefined location instead 2013-12-17 09:06:46 +01:00
Michael Hackstein 736a00449b Added some more style to the context menu. Now looks like a list of normal buttons 2013-12-16 17:31:50 +01:00
Michael Hackstein d71cdae36b Added context menu to edges. Started with styling. Needs some more love 2013-12-16 17:31:14 +01:00
Michael Hackstein 5bf4714ce0 Fixed merge conflict in karma.conf 2013-12-16 16:42:44 +01:00
Michael Hackstein 490417de31 Started with adding a context menu for nodes. Modified karma config. It now does not run JSLint and WebWorkers specific tests, they somhow fail on the jenkins server. Will be fixed again 2013-12-16 16:41:24 +01:00
Frank Celler 99c79485e8 added firefox 2013-12-16 11:14:27 +01:00
Michael Hackstein 08fc5db114 GraphViewer readed pannign buttons, got deleted by accident 2013-12-13 23:16:34 +01:00
Michael Hackstein b7a34326f9 GraphViewer Added a context menu for edges 2013-12-13 23:14:28 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Heiko Kernbach 3f1ffd2d70 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 16:11:23 +01:00
Heiko Kernbach 040db09706 css, icons 2013-12-13 16:11:17 +01:00
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Heiko Kernbach f4e4e411cf icons 2013-12-13 16:01:07 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann 0a2e39085f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 15:59:15 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Heiko Kernbach 72a9d6f14f icons 2013-12-13 15:52:20 +01:00
Heiko Kernbach fc9038dcfa changed icons to new arango icon set 2013-12-13 15:44:09 +01:00
Michael Hackstein 05a2baff05 The right-click context menu is now disabled in context of the SVG 2013-12-13 13:06:22 +01:00
Heiko Kernbach 839112dbad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:36:17 +01:00
Michael Hackstein 8624ab3278 GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well 2013-12-13 11:43:33 +01:00
Michael Hackstein 07cc648b55 Fixed a test in the dispatcher that failed unpredictibly 2013-12-13 11:17:03 +01:00
Michael Hackstein 18d2c3327b GraphVieweri: the abstract Adapter now propagetes a cleanUp call to the general viewer. 2013-12-13 11:16:19 +01:00
Michael Hackstein bb1abbac72 GraphViewer: Implemented passing around the graphviewer object through adapters, required for reseting 2013-12-13 10:44:16 +01:00
Michael Hackstein e6df75784f GraphViewer Added tests for the graphViewer object ot be passed arround through adapter instances, which is required for reset 2013-12-13 10:43:23 +01:00
Michael Hackstein f024bf07a2 The Colourlist is now reseted whenever the user picks a different attribute for colouring 2013-12-12 17:00:14 +01:00
Michael Hackstein 34b775086c Added test to reset the colourlist on attribute change 2013-12-12 09:43:37 +01:00
Heiko Kernbach 221b18a5e7 css fix 2013-12-12 08:46:08 +01:00
Michael Hackstein f04c25e051 Finally all GraphViewer Tests added and running under phantomjs and added to automatic test 2013-12-10 10:51:41 +01:00
Michael Hackstein 62e9a9d3d6 Fixed tests for arango ui component in graphviewer. It is now also added to PhantomJS test suite 2013-12-08 14:42:00 +01:00
Michael Hackstein cb854e8250 Fixed tests for modularityJoiner to run with phantomJS (different result because of different sorting order of object keys) 2013-12-08 13:23:34 +01:00
Michael Hackstein 1ebac6f022 Removed old location of graphviewer tests, they have been moved to the central frontend test repo 2013-12-06 18:22:05 +01:00
Michael Hackstein 24f33fb248 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-06 14:45:15 +01:00
Michael Hackstein aca868dba8 Added information line about the bug in Safari 2013-12-06 14:44:51 +01:00
Jan Steemann 705efbfb07 improved error and help messages 2013-12-04 22:42:05 +01:00
Jan Steemann 8ac6d9728e better clone some objects returned by AQL user-defined functions 2013-12-04 22:05:54 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 16264f992d better clone some objects returned by AQL user-defined functions 2013-12-04 20:39:51 +01:00
Jan Steemann c63655b64c make test more reliable 2013-12-04 20:38:07 +01:00
Michael Hackstein 0c4b20d4cb Internal modification of the graph viewer ui 2013-12-04 18:26:45 +01:00
Michael Hackstein 87e056ea25 Fixed karma config, it now requires d3.v3.min instead of d3.v3. There is inconsistent behaviour between these two 2013-12-04 18:19:02 +01:00
Michael Hackstein b2238b473a Added the google font locally, no connection to google required any more 2013-12-04 18:02:21 +01:00
Michael Hackstein 1902a67b0e The GraphViewer will now again be aware of new nodes _key and _rev 2013-12-02 22:47:31 +01:00
Michael Hackstein cec169fc4f Removed debug output 2013-12-02 15:42:03 +01:00
Michael Hackstein 4d8d4307dd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 15:36:38 +01:00
Michael Hackstein 1697e3c326 Fixed bug for ArangoDB internal errors, they have not properly been presented to the user in the Graph Management 2013-12-02 15:36:33 +01:00
Michael Hackstein 3004232b57 Type in placeholder text 2013-12-02 15:23:05 +01:00
Michael Hackstein 242b02fe0f Added error messages to new graph management overview 2013-12-02 15:19:52 +01:00
Jan Steemann 1955c8353f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-02 15:12:42 +01:00
Jan Steemann 32a247aa2f added tests for creating / dropping graphs 2013-12-02 15:12:07 +01:00
Michael Hackstein f9d4f7b725 Fixed typo. placehilder somehow does not want to show up in the interface... 2013-12-02 14:53:12 +01:00
Michael Hackstein c1bb1140c9 Fixed a bug where it was only possible to create one graph 2013-12-02 14:34:07 +01:00
Michael Hackstein 87e885d30f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 14:25:12 +01:00
Michael Hackstein c5d98f03bb Increased font size of AQL editor 2013-12-02 14:24:55 +01:00
Jan Steemann 08846a810e fixed unreadable swagger documentation 2013-12-02 14:00:44 +01:00
Jan Steemann 78598f5217 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-02 13:59:28 +01:00
Jan Steemann a5f6faaae4 issue #675: Dropping a collection used in "graph" module breaks the graph 2013-12-02 13:58:29 +01:00
Michael Hackstein 97678a7c36 Added new karma configuration now containing all files. 2013-12-02 13:27:18 +01:00
Michael Hackstein b4ef900052 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 13:20:43 +01:00
Michael Hackstein 4fc67b7381 Fixed GraphViewer CSS check, changed to different class but forgot the test 2013-12-02 13:20:31 +01:00
Jan Steemann a76318f940 fixed unreadable swagger documentation 2013-12-02 13:19:59 +01:00
Michael Hackstein 80127c75fa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 13:13:15 +01:00
Michael Hackstein ff190720e3 Fixed JSLint warning line to long 2013-12-02 13:13:08 +01:00
Michael Hackstein aece2834f8 Fixed a bug in the graph manager 2013-12-02 13:12:54 +01:00
Jan Steemann 9f72a28aca fixed issue #701: ArangoStatement undefined in arangosh 2013-12-02 09:54:20 +01:00