1
0
Fork 0
Commit Graph

3005 Commits

Author SHA1 Message Date
Michael Hackstein 8db629096d Fixed AQL editor headerbar to new classes 2014-01-25 09:43:06 +01:00
Michael Hackstein 4b916b3030 Moverd more id bound elements from header bar style to class bound elements for reusability 2014-01-25 09:21:14 +01:00
Michael Hackstein aa861e9a02 Adjusted line indention 2014-01-25 09:20:01 +01:00
Michael Hackstein 440d0bdfc0 Added headerBar class to all views 2014-01-25 01:07:28 +01:00
Michael Hackstein 13a2de1c9e Moved transparentHeader style to headerBar.css and started unification 2014-01-25 00:54:21 +01:00
Michael Hackstein 8a3e66f4e4 Added classes to pagination buttons, s.t. they are using rounded style as well 2014-01-25 00:02:39 +01:00
Michael Hackstein 4899db58bf Joined the lists of buttons in documents overview, it is now one list with five elements not five lists with one element 2014-01-25 00:01:46 +01:00
Michael Hackstein ddab77cb96 CSS cleanup and added rounded shape to buttons. 2014-01-25 00:00:39 +01:00
Michael Hackstein 91068a8fdd Started adding css classes to the header bar s.t. they can be reused and css bindings to ids are superflous 2014-01-24 23:59:46 +01:00
Michael Hackstein b4f9c89b2d Added a new css file to contain all information regarding the header bar on top of each view. Content has to be moved there though 2014-01-24 23:58:10 +01:00
Michael Hackstein a0316bf03b Removed binding to undefined function 2014-01-24 23:57:12 +01:00
Max Neunhoeffer 7d5723756f Implement DELETE REST method on the coordinator. 2014-01-24 21:31:58 +01:00
a-brandt ab42b2adfe Bugfix: Expected '===' and instead saw '==' 2014-01-24 14:53:04 +01:00
a-brandt 0550715088 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-24 14:50:45 +01:00
Jan Steemann ea2af50683 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	Documentation/ImplementorManual/HttpSystem.md
	js/apps/system/aardvark/aardvark.js
	js/apps/system/aardvark/frontend/css/buttons.css
	js/server/version-check.js
2014-01-24 14:50:09 +01:00
a-brandt 041b7f5daa added HAS and HAS_NOT 2014-01-24 14:49:50 +01:00
Jan Steemann 78d29b1503 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-24 14:37:24 +01:00
Jan Steemann b3df999f56 jshund 2014-01-24 14:37:16 +01:00
Jan Steemann d793702247 fixed obvious error in body parsing 2014-01-24 14:30:06 +01:00
Jan Steemann cb5af05a76 fixed web interface in non-cluster mode 2014-01-24 13:54:35 +01:00
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
Max Neunhoeffer f5c274e8c0 Fix error handling and another bug in create document for cluster. 2014-01-24 10:35:37 +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
Jan Steemann d55a5b156c added tests and documentation for issue #748 2014-01-23 17:22:19 +01:00
Frank Celler fdee836023 release version 1.4.7 2014-01-23 17:13:52 +01:00
Jan Steemann ab79b901e3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-23 16:49:11 +01:00
Jan Steemann 6ec73a5589 fixed reference to unused variable 2014-01-23 16:48:24 +01:00
Jan Steemann 733fd3ebd5 Merge branch 'devel' of https://github.com/dajester2013/ArangoDB into dajester2013-devel 2014-01-23 16:45:31 +01:00
Michael Hackstein 6ab7de4aca Removed further overspecified CSS objects 2014-01-23 16:43:44 +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
Michael Hackstein 25dee09874 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-23 16:31:41 +01:00
Michael Hackstein c5550ba703 Removed unnecessary overspecified css token 2014-01-23 16:31:32 +01:00
Max Neunhoeffer 9230f5020c First case of create document is working on cluster. 2014-01-23 16:16:06 +01:00
Jan Steemann d4227b32ef jshund 2014-01-23 14:57:54 +01:00
dajester2013 bc09265335 Update ahuacatl.js
vertexFilterType -> vertexFilterMethod
2014-01-23 06:02:30 -06:00
Max Neunhoeffer 69c3456e1d Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-23 13:01:15 +01:00
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
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 5f442ef742 bugfixes 2014-01-23 11:47:49 +01:00
Michael Hackstein 6a0d219bd5 Fixed bug in agency communication. Discrepancy with Agency content 2014-01-23 10:12:48 +01:00
Michael Hackstein eeca60897a Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-23 08:14:22 +01:00
Michael Hackstein 4a63a4c03d Cluster Information is now updated automaticaly 2014-01-23 08:13:08 +01:00
Jan Steemann 39fd7611ed load/unload of collections 2014-01-22 17:20:06 +01:00
Jan Steemann 8a74c2864e cleanup of current/collections 2014-01-22 11:41:32 +01:00
Jan Steemann e81e057510 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-22 08:38:09 +01:00
Jan Steemann 3e84a3b650 don't throw errors on startup on coordinator 2014-01-22 08:37:54 +01:00
Michael Hackstein d78e3ed92b Added tests for cluster views, of necessary information is passed through each view 2014-01-21 16:48:33 +01:00
Michael Hackstein 8d48855875 Wired Coordinators to backend 2014-01-21 16:29:18 +01:00
Jan Steemann 7e732174ce Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 15:14:13 +01:00
Jan Steemann ddfa36274d preparation 2014-01-21 15:14:07 +01:00
Michael Hackstein 23e0122f0f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 14:42:22 +01:00
Michael Hackstein 43f7248f44 Wired DBServers -> Databases -> Collections -> Shards to backend 2014-01-21 14:42:09 +01:00
Max Neunhoeffer c4590d3a40 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-21 14:28:48 +01:00
Max Neunhoeffer a1a99170e1 Add information about Current collections to ClusterInfo. 2014-01-21 14:28:30 +01:00
Michael Hackstein 7cd01e816c Fixed new discrepancies between the etcd agency and the high level javascript communication, based on Shards in Collections in the Current state 2014-01-21 14:16:24 +01: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
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +01:00
Jan Steemann 74c76ce41e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-21 11:10:52 +01:00
Jan Steemann 2ddacc65e8 clean up Current/Databases for ourselves 2014-01-21 11:10:25 +01:00
Max Neunhoeffer 06953daf80 Fix reporting of dropped shard in Current. 2014-01-21 10:44:02 +01:00
Max Neunhoeffer eec3c08f87 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-21 09:57:26 +01:00
Max Neunhoeffer 18436b6b27 Fix reporting of new collection in Current (shardID instead of DBserverID) 2014-01-21 09:56:54 +01:00
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Frank Celler 251c2fa448 release version 1.4.6 2014-01-20 22:09:44 +01:00
Michael Hackstein 41b35c82da Prepared databases, collections and shards for retrieval from foxx. No Fake data involved in these classes anymore. ToDo: Foxx routes 2014-01-20 17:57:08 +01:00
Michael Hackstein c7f86b3def Updated high-level js communication library for newest version of agency comm 2014-01-20 16:37:56 +01:00
Michael Hackstein 77003e90c0 Wired the Frontend for Cluster DBServers with the Backend. A missmatch is left due to changes in AgencyComm. Servers are always in state warning. 2014-01-19 22:47:54 +01:00
Michael Hackstein af3a5d093e Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-18 20:15:34 +01:00
Michael Hackstein a0cb9d832f Created Models and Collections for cluster objects. These return fake data right now, but make wiring to foxx a lot easier 2014-01-18 20:15:20 +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 435b56bea2 fixed dropping of collections 2014-01-17 18:27:55 +01:00
Jan Steemann 7751576907 report errors back to the server 2014-01-17 14:19:52 +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
Max Neunhoeffer e5f8331093 Report collection better in Current. 2014-01-17 14:03:16 +01:00
Michael Hackstein 6a002416d2 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-17 13:07:27 +01:00
Michael Hackstein e5c9fbec3e Added a cascading unrender if clicking in Menu levels 2014-01-17 13:07:19 +01:00
Jan Steemann 4f31e99097 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-17 12:43:44 +01:00
Jan Steemann 07c0ed3bab creation/removal of local shards 2014-01-17 12:43:34 +01:00
Michael Hackstein 099fac2582 Fixed test for clusterCoordinator 2014-01-17 11:24:29 +01:00
Michael Hackstein 052e84fc2e First version of Coordinator Overview in cluster 2014-01-17 10:36:03 +01:00
Michael Hackstein 80ffa5d73d First version of shard overview in cluster interface 2014-01-17 09:40:20 +01:00
Michael Hackstein 723545a1d4 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-17 09:24:53 +01:00
Michael Hackstein 1a233fb1d5 Added first version of Cluster collection overview 2014-01-17 09:24:46 +01:00
Jan Steemann 9cbc6d55ca Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 17:03:23 +01:00
Jan Steemann 8010963a94 handle plan change for create/drop database 2014-01-16 17:03:10 +01:00
Michael Hackstein 7b37f6840d Added first version of cluster database overview. Right now only datbase name is presented to the user 2014-01-16 15:58:39 +01:00
Michael Hackstein d0265724a3 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:23:35 +01:00
Michael Hackstein f95c3dfa79 First version of primary server view in the cluster 2014-01-16 15:23:28 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5b4a0bf3c2 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:01:53 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann 334cd51e6f include console 2014-01-16 15:01:07 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +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
Michael Hackstein 4a2d874678 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 17:14:35 +01:00
Michael Hackstein 3421822f0e First version of server view displaying pairs of db servers. Design missing 2014-01-15 17:13:59 +01:00
Michael Hackstein a4e500ebf5 Improved the overview and added a seperate coordinators view, it is actually completely different compared to db servers 2014-01-15 17:08:56 +01:00
Jan Steemann b0e4dc91dd adjusted listDatabases and doesDatabaseExist 2014-01-15 16:01:05 +01:00
Michael Hackstein 6feeab89b6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 14:50:10 +01:00
Michael Hackstein bb1a12c76b Finished first version of Cluster Overview using fake data. User now gets a prominent overview over his cluster and can decide if coordinators or databases are effected by failures 2014-01-15 14:49:56 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Jan Steemann fcb545d268 removed unused methods 2014-01-15 14:00:42 +01:00
Jan Steemann e02b0b52e1 renamed methods 2014-01-15 10:52:56 +01:00
Michael Hackstein b0419841f8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 17:19:06 +01:00
Michael Hackstein ab54081b72 Moved more button-styling to buttons css, except third-party libs all should be there now 2014-01-14 17:18:57 +01:00
Michael Hackstein 5622b1a1f4 Added Headlines to all cluster columns 2014-01-14 17:18:02 +01:00
Jan Steemann 2aba046c7d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 16:21:57 +01:00
Jan Steemann ce2627619e create collection stub 2014-01-14 16:21:48 +01:00
Michael Hackstein 8816bfab14 Fixed merge confilct 2014-01-14 15:01:17 +01:00
Michael Hackstein e4976723b6 Added the cluster dashboard to hidden route, will not yet be reachable via navigation 2014-01-14 14:57:25 +01:00
Michael Hackstein 8948b87f12 Added the Cluster Dashboard to the karma tests 2014-01-14 14:55:52 +01:00
Michael Hackstein 6b8333207b Added first implementation of the Cluster Dashboard. Functionality is basic, displayed data is faked and design is comming soon 2014-01-14 14:52:52 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Jan Steemann 4ec6f04932 return collection properties 2014-01-14 13:19:43 +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