1
0
Fork 0
Commit Graph

2679 Commits

Author SHA1 Message Date
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
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 50105fc0d9 fixed error in index documentation 2014-01-13 17:30:08 +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 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 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
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
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 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 ca1e6288a2 allow functions results as parameters in all function calls 2014-01-06 11:14:54 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Jan Steemann 1dd385f52d use `--data-binary` instead of `--data` in curl examples 2014-01-03 12:12:54 +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