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

627 Commits

Author SHA1 Message Date
Michael Hackstein 7094f4378e Converted footer view to scss and added resizing functionality. 2014-02-09 23:07:21 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.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/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
 2014-02-09 18:39:11 +01:00
Michael Hackstein d875e213fb Improvements for navbar in SCSS , simplified code and removed old navbar.css from manifest. 2014-02-09 13:28:26 +01:00
Michael Hackstein 3d9bdcc210 Navbar now completely moved to Scss 2014-02-09 13:10:26 +01:00
Michael Hackstein 61aeeeceae Renamed logo (missing d) and optimized navbar setup 2014-02-08 09:12:09 +01:00
Michael Hackstein 2670c30ef3 Started moving from css to scss for better maintanence. Also started cleanup process 2014-02-08 08:55:49 +01:00
Frank Celler 0bc50d9d10 release version 1.4.9 2014-02-07 21:45:05 +01:00
Jan Steemann b4d9f10f17 fixed some database methods 2014-02-06 15:54:34 +01:00
Jan Steemann c38c038492 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsItemView.css
	js/apps/system/aardvark/frontend/css/graphlayout.css
 2014-02-06 13:18:52 +01:00
Jan Steemann b5550e17a6 updated tests and documentation 2014-02-06 12:11:17 +01:00
Michael Hackstein c83f4621c1 Fixed tests for new graphviwer toolbox layout 2014-02-04 09:21:03 +01:00
Michael Hackstein 4dc635e59c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-03 11:42:48 +01:00
Michael Hackstein 08858d414b Added new version of graphViewer Icons 2014-02-03 11:42:18 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Claudius Weinberger 2748152fc5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/buttons.css
 2014-02-01 17:28:18 +01:00
Claudius Weinberger 7d29bfcf6a some ui improvements 2014-02-01 17:26:13 +01:00
Jan Steemann 3db9bbe0cc evil mimetype detection attempt 2014-02-01 17:02:42 +01:00
Michael Hackstein 0ee6183d3d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-01 09:47:28 +01:00
Michael Hackstein 1e21d3750f Fixed tests for graph previewer 2014-02-01 09:47:19 +01:00
Jan Steemann 4a99cde395 jslintified several tests 2014-02-01 01:50:58 +01:00
Jan Steemann 8be60b04db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 23:59:01 +01:00
Jan Steemann 74c0457b4b added version check for admin interface 2014-01-31 23:58:36 +01:00
Michael Hackstein f580bd1ade Fixed tests for translated arrow positions. 2014-01-31 23:38:33 +01:00
Michael Hackstein 6b12a0babc The db selection select box is now readable in firefox 2014-01-31 23:09:24 +01:00
Michael Hackstein 0c59b93390 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 22:57:47 +01:00
Michael Hackstein 7c063d3572 The graph viewer now has arrows 2014-01-31 22:57:03 +01:00
Michael Hackstein 6f44fcf00e Made unexpanded vertices semi-transparent, i am not yet happy with this 2014-01-31 21:41:40 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +01:00
Max Neunhoeffer c2e6c16395 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 19:34:55 +01:00
Max Neunhoeffer b6c3600ecc Add an include needed to please the compiler on Linux. 2014-01-31 19:31:36 +01:00
Max Neunhoeffer 73f3dbc328 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-31 18:56:47 +01:00
Michael Hackstein 2a289bf28d Fixed a bug where the group-by list of the graphviewer has not been stored locally 2014-01-31 18:17:25 +01:00
Michael Hackstein 0c62714017 Fixed a bug where dragging of nodes was not possible and connecting them with edges made everything even worse 2014-01-31 17:38:15 +01:00
Michael Hackstein f7735391df Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 14:06:51 +01:00
Jan Steemann 9643469631 do not allow changing shard key attributes 2014-01-31 13:19:03 +01:00
Michael Hackstein 46c9b0e83b Added a confirmation dialog before deleting nodes/edges 2014-01-31 13:04:55 +01:00
Jan Steemann 48e3a5828c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
 2014-01-31 11:31:09 +01:00
Max Neunhoeffer 3966ce0ac7 Rename sharding dir to cluster 2014-01-31 11:24:01 +01:00
Jan Steemann bd7c5d4113 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 11:23:38 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Michael Hackstein d30585ceb2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 09:29:00 +01:00
Michael Hackstein 817013004b Fixed a bug where node creation does not work determinisiticly 2014-01-31 09:28:53 +01:00
Jan Steemann a5d4b1b5a1 make change for issue #755 less strict 2014-01-31 02:07:27 +01:00
Jan Steemann d17e049ed7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 02:02:49 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Michael Hackstein a219bc8342 Changed internal layout of the graphviewer, This fixes issues with the context menu, click events and display of edges to be 2014-01-31 01:16:38 +01:00
Michael Hackstein e22972578c Headerbar buttons now have a cursor: pointer 2014-01-31 01:14:45 +01:00
Michael Hackstein cb4d9deb3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 01:09:51 +01:00
Claudius Weinberger fadb568728 fixed merge conflict 2014-01-31 01:00:49 +01:00
Claudius Weinberger 7f92c53519 Some layout changes 2014-01-31 00:56:56 +01:00
Michael Hackstein 6ffd56760c Fixed a bug in the WI where it was not possible to install a foxx in a specific version 2014-01-30 23:55:17 +01:00
Michael Hackstein 521a46088c Fixed a bug with undefined values printed to console.log but they had no effect 2014-01-30 20:39:37 +01:00
Michael Hackstein 875100a195 Encapsulated the GraphViewer menu into a container with padding 2014-01-30 20:38:49 +01:00
Michael Hackstein 86d8ddb71e Removed pointless console.log 2014-01-30 20:37:21 +01:00
Jan Steemann e9c5af7895 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	CHANGELOG
	js/apps/system/aardvark/frontend/css/collectionsView.css
	js/apps/system/aardvark/frontend/css/layout.css
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-01-30 19:40:21 +01:00
Michael Hackstein a51979818a Added test for graph deletion confirmation 2014-01-30 17:13:23 +01:00
Michael Hackstein 54346784ca Added confirm dialog to graph deletion 2014-01-30 16:56:31 +01:00
Michael Hackstein 301b8ac7c2 The graph management delete button is now correct red color and hover effect does not change it to green 2014-01-30 16:05:47 +01:00
Michael Hackstein 402d80930b Fixed spelling mistake 2014-01-30 15:15:08 +01:00
Michael Hackstein 0b57142b5d Fixed colour discrepeancy of API views 2014-01-30 15:12:04 +01:00
Michael Hackstein fd80bf7387 Unified datatable colouring of odd and even 2014-01-30 15:11:23 +01:00
Michael Hackstein fcb30082c9 Unified modal dialog closing icon from graphviewer and main interface 2014-01-29 15:48:39 +01:00
Michael Hackstein 1a8fdab48a The Manage Graphs button is now allways displayed 2014-01-29 15:45:32 +01:00
Michael Hackstein 71e9eda131 The Search field in the graph viewer is now visible 2014-01-28 17:05:25 +01:00
Max Neunhoeffer c3f01237b0 Implement replace and update on cluster. 
This still has a freeing too early bug with TRI_json_t.
 2014-01-28 16:49:44 +01:00
Michael Hackstein 19228f5f43 Fixed a wrong label for new foxx importer in web interface 2014-01-28 14:35:13 +01:00
Michael Hackstein 0bf874b8e6 Fixed a wrong label for new foxx importer in web interface 2014-01-28 14:10:30 +01:00
Michael Hackstein 8d100b688e Added some more information for the secondary server 2014-01-28 14:07:01 +01:00
Michael Hackstein dbcdd72da4 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-28 09:48:04 +01:00
Michael Hackstein 983f616add Removed unnecessary information that server is connected on startup 2014-01-28 09:43:53 +01:00
Jan Steemann 0a2d61a42a added SHORTEST_PATH AQL function, allow user-defined functions for filtering in TRAVERSAL etc. 2014-01-28 01:51:27 +01:00
Frank Celler bd69ad9843 release version 1.4.8 2014-01-27 13:36:41 +01:00
Michael Hackstein 7731d2ce4d Finished implementing foxx upload in WI 2014-01-27 13:02:14 +01:00
Michael Hackstein f383c0d654 Fixed style of Foxx Importer 2014-01-27 13:01:56 +01:00
Jan Steemann 16b90f3b60 upload applications via web interface 2014-01-27 13:01:45 +01:00
Michael Hackstein 780eaa84b8 Start of Foxx download in WI implementation. Not functional yet 2014-01-27 13:01:15 +01:00
Michael Hackstein 5ca6bc159d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-27 09:55:19 +01:00
Michael Hackstein d4346dc53d Fixed test for dropdown menu icons in header bar 2014-01-27 09:55:10 +01:00
Michael Hackstein e3693c1d2b Increased font-weight for better readability 2014-01-27 09:54:42 +01:00
Michael Hackstein 6b2472b05c Fixed tests for new graphviewer headerbar leayout 2014-01-27 09:33:46 +01:00
Michael Hackstein b28613e406 Added a title to the graph viewer, finally... 2014-01-27 09:21:44 +01:00
Michael Hackstein a214f057e1 Fixed the graphviewer to new header bar layout 2014-01-27 09:17:53 +01:00
Michael Hackstein cd40fe8328 Fixed Documents and Graph Management view 2014-01-25 10:14:29 +01:00
Michael Hackstein 717baf65a3 Removed unnecessary id from header bars 2014-01-25 10:08:17 +01:00
Michael Hackstein 7676559a47 Fixed Dashboard View Header bar to new classes 2014-01-25 09:56:29 +01:00
Michael Hackstein 6229fc8802 Fixed Databases View Header bar to new classes 2014-01-25 09:55:49 +01:00
Michael Hackstein 4a0d3089f6 Fixed collections tab headerbar to new classes 2014-01-25 09:46:51 +01:00
Michael Hackstein c7d4e7d3fa Fixed Applications view headerbar to new classes 2014-01-25 09:44:25 +01:00
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
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
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 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
Frank Celler fdee836023 release version 1.4.7 2014-01-23 17:13:52 +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
Max Neunhoeffer 165d98578a First hack at create document via REST on cluster. 2014-01-23 13:00:44 +01:00
Michael Hackstein 4a63a4c03d Cluster Information is now updated automaticaly 2014-01-23 08:13:08 +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
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
Jan Steemann 80e8250d54 fixed segfault 2014-01-21 12:50:35 +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 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 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
Michael Hackstein e5c9fbec3e Added a cascading unrender if clicking in Menu levels 2014-01-17 13:07:19 +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 1a233fb1d5 Added first version of Cluster collection overview 2014-01-17 09:24:46 +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
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +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
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
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
Michael Hackstein 8816bfab14 Fixed merge confilct 2014-01-14 15:01:17 +01:00