1
0
Fork 0
Commit Graph

378 Commits

Author SHA1 Message Date
Michael Hackstein 42173af80d Finished implementing foxx upload in WI 2014-01-24 12:51:54 +01:00
Michael Hackstein c762f17b01 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 11:30:39 +01:00
Michael Hackstein 1192dcbf87 Fixed style of Foxx Importer 2014-01-24 11:30:32 +01:00
Jan Steemann ae6b4be148 upload applications via web interface 2014-01-24 11:15:17 +01:00
Michael Hackstein 93dc981252 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 10:25:00 +01:00
Michael Hackstein cb288e21e6 Start of Foxx download in WI implementation. Not functional yet 2014-01-24 10:24:31 +01:00
Frank Celler 6679995e76 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	Documentation/man/man1/arangob.1
	Documentation/man/man1/arangodump.1
	Documentation/man/man1/arangoimp.1
	Documentation/man/man1/arangorestore.1
	Documentation/man/man1/arangosh.1
	Documentation/man/man8/arango-dfdb.8
	Documentation/man/man8/arangod.8
	Documentation/man/man8/foxx-manager.8
	Documentation/man/man8/rcarangod.8
	Makefile.in
	VERSION
	aclocal.m4
	build.h
	config/config.guess
	config/config.sub
	config/missing
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/server/bootstrap/module-internal.js
	js/server/modules/org/arangodb/actions.js
	js/server/modules/org/arangodb/foxx/authentication.js
	js/server/modules/org/arangodb/foxx/manager.js
	lib/ApplicationServer/ApplicationServer.cpp
2014-01-23 22:24:20 +01:00
Frank Celler fdee836023 release version 1.4.7 2014-01-23 17:13:52 +01:00
Michael Hackstein ca6383b5ff Fixed minor css error 2014-01-23 16:42:55 +01:00
Michael Hackstein ed8a60226c Removed overspecified css entry 2014-01-23 16:41:12 +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
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +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
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
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
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 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
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