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

242 Commits

Author SHA1 Message Date
Heiko Kernbach a189b8136d cleanup 2014-02-20 23:07:15 +01:00
Heiko Kernbach 56812347d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 23:02:59 +01:00
Heiko Kernbach 6901045535 new edit view for documents 2014-02-20 23:02:15 +01:00
Frank Celler b01d9d77e7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/ApplicationV8.h
	arangod/V8Server/v8-actions.cpp
	js/apps/system/aardvark/frontend/js/bootstrap/module-internal.js
	js/apps/system/aardvark/frontend/scss/generated.css
	js/server/version-check.js
	lib/Dispatcher/Job.h
	lib/GeneralServer/GeneralServerJob.h
 2014-02-20 21:02:07 +01:00
Michael Hackstein d0d61fb5a3 Integerated the new underscore templates in the admin interface. Performancebost of 50% yay 2014-02-20 20:31:53 +01:00
Guido Schwab 45513567d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-20 19:09:49 +01:00
Guido Schwab 63c722ab0c some layout changes 2014-02-20 19:09:28 +01:00
Michael Hackstein 168b256acb fixed a css bug, it was possible to scroll far to the right on the collections view 2014-02-20 17:43:23 +01:00
Jan Steemann ad0636fc58 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
 2014-02-20 16:05:00 +01:00
Michael Hackstein e7b796173f Unified badges and buttons on tiles 2014-02-20 11:17:12 +01:00
Michael Hackstein efa911632f Merge remote-tracking branch 'origin/devel' into sharding 2014-02-19 16:12:00 +01:00
Heiko Kernbach dafbe9f025 gritter cleanup 2014-02-19 16:00:55 +01:00
Michael Hackstein a7d0b59aee The general layout is now moved to a single class and the dropdowns have bin unified to one class 2014-02-19 14:36:51 +01:00
Frank Celler 066abd777c Merge branch 'devel' of github.com:triAGENS/ArangoDB into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-02-19 10:21:00 +01:00
gschwab dfb352a23c added some userManagement functionality 2014-02-19 08:38:04 +01:00
Heiko Kernbach b69fad0381 merge origin/devel 2014-02-18 14:29:44 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Heiko Kernbach e8aaac38e2 css fix 2014-02-18 08:26:17 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
Heiko Kernbach 43f431d036 added missing css pointer 2014-02-11 18:00:08 +01:00
Heiko Kernbach 45917d9400 info-view bugfix, updated new icons 2014-02-11 17:18:55 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Heiko Kernbach a99815de0b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:06:33 +01:00
Heiko Kernbach 2a5e8340a4 serveral bugfixes document editing view 2014-02-11 13:57:43 +01:00
Michael Hackstein f87b594a1c Added new classes for the tiles in collection overview. They should now be easily reusable for Databases and Applications 2014-02-11 09:58:09 +01:00
Michael Hackstein 4fd06a6f32 Finished with general positioning of elements in scss. Much much (much)* simpler now 2014-02-10 11:59:26 +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
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
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
Michael Hackstein 6b12a0babc The db selection select box is now readable in firefox 2014-01-31 23:09:24 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +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
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
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 875100a195 Encapsulated the GraphViewer menu into a container with padding 2014-01-30 20:38:49 +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 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 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 71e9eda131 The Search field in the graph viewer is now visible 2014-01-28 17:05:25 +01:00
Michael Hackstein e3693c1d2b Increased font-weight for better readability 2014-01-27 09:54:42 +01:00
Michael Hackstein cd40fe8328 Fixed Documents and Graph Management view 2014-01-25 10:14:29 +01:00
Michael Hackstein 6229fc8802 Fixed Databases View Header bar to new classes 2014-01-25 09:55:49 +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 13a2de1c9e Moved transparentHeader style to headerBar.css and started unification 2014-01-25 00:54:21 +01:00
Michael Hackstein ddab77cb96 CSS cleanup and added rounded shape to buttons. 2014-01-25 00:00:39 +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
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
Michael Hackstein 1192dcbf87 Fixed style of Foxx Importer 2014-01-24 11:30:32 +01:00
Michael Hackstein cb288e21e6 Start of Foxx download in WI implementation. Not functional yet 2014-01-24 10:24: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 c5550ba703 Removed unnecessary overspecified css token 2014-01-23 16:31:32 +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 f95c3dfa79 First version of primary server view in the cluster 2014-01-16 15:23:28 +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
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 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
Michael Hackstein 605d6e9483 Moved the content a bit mor to the top 2014-01-02 14:00:09 +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
Heiko Kernbach 040db09706 css, icons 2013-12-13 16:11:17 +01:00
Heiko Kernbach fc9038dcfa changed icons to new arango icon set 2013-12-13 15:44:09 +01:00
Heiko Kernbach 221b18a5e7 css fix 2013-12-12 08:46:08 +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 ce61a119c9 Added layout to the graph management button 2013-12-02 09:09:04 +01:00
Michael Hackstein 88ff664a9a Further unification of datatables. Right now Graph Management and Documents are unified, others ToDo. Basic Graph Management now working, to add: Filter, Pagination 2013-12-01 23:19:09 +01:00
Michael Hackstein e77c35ebbd Added a buttons CSS which should contain all buttons in the future. Started to unify datatable layouts 2013-12-01 22:45:00 +01:00
Michael Hackstein 10b292a481 Introduced an arangoDatatables CSS class that can be reused in several views. Moved documentTableID bound selectors to this class 2013-12-01 21:58:06 +01:00
Michael Hackstein 4905007eef Moved definition of content to the central general.css. Removed class form-actions from query view, all of it has been overwritten anyways 2013-12-01 21:22:19 +01:00
Michael Hackstein 9aa9c13285 Changed padding of container class to margin. Objects right below the navbar are now finally clickable. Added a margin to the row class keeping the footer at distance (everything is visible now when scrolling down 2013-12-01 20:40:31 +01:00
Michael Hackstein b483f82267 Moved definition of background colouring to a central css sheet 2013-11-29 21:13:50 +01:00
Michael Hackstein f23f2ba7ff Merged badge style definitions 2013-11-29 19:29:26 +01:00
Michael Hackstein e2200fb5a3 Merged style of Icons 2013-11-29 19:06:22 +01:00
Michael Hackstein c17c0a7ccd Merged several content div styles 2013-11-29 17:13:15 +01:00
Michael Hackstein 0236dbbb83 Merged replication divs 2013-11-29 16:55:33 +01:00
Michael Hackstein aef100e72a Merged several badge rule definitions 2013-11-29 16:45:19 +01:00
Michael Hackstein b819fd4426 Merged equal attributes of red and green lights 2013-11-29 16:40:28 +01:00
Michael Hackstein bc5a6ecd91 Merged arangoBtn and arangoBtn success 2013-11-29 16:36:17 +01:00
Michael Hackstein 8a62ae0d60 Merged icons and some hover effects 2013-11-29 16:34:11 +01:00
Michael Hackstein 50cbffb1a2 Merged dashboard and transparent header 2013-11-29 16:31:16 +01:00
Michael Hackstein a5822c0987 Started merging duplicate css rules for queryView 2013-11-29 16:25:04 +01:00
Michael Hackstein 9f54e62a83 Removed graph viewers search class. It is identical to normal searchInput 2013-11-29 16:24:38 +01:00
Michael Hackstein dd89f32a51 Merged two almost equal CSS entries 2013-11-29 16:23:44 +01:00
Michael Hackstein 09e789e6d6 Fixed the Navigation bar in the browser 2013-11-27 15:07:13 +01:00
Michael Hackstein 709c44ecc1 Moved screensize adaption to different css file 2013-11-27 13:41:45 +01:00
Michael Hackstein b49ade8e58 Css fixes 2013-11-27 13:09:30 +01:00
Michael Hackstein 3a81265afd Improved GraphViewer Layout 2013-11-27 13:07:38 +01:00
Michael Hackstein 054218d95f Updated GraphViewer CSS. It now has a filter dropdown and the suggestion box is adjusted accordingly 2013-11-19 17:14:46 +01:00
Michael Hackstein 2420bd893a Modified dropdown menus, all of them share one class now reduces large parts of css. GraphViewer uses this dropdown also 2013-11-18 16:26:34 +01:00
Michael Hackstein abd2400a1d More css optimizations of the graph viewer. List of attributes this time. 2013-11-18 15:01:03 +01:00
Michael Hackstein 09961581ec GraphViewer: Moved the label list into the graph viewer space and added a padding 2013-11-18 11:58:10 +01:00
Michael Hackstein b4915aed2d Started updating CSS of graphViewer, increasead buttons 2013-11-18 10:41:27 +01:00
Michael Hackstein 045321b318 Moved the selection box from navigation bar back to footer bar 2013-11-17 00:02:08 +01:00
Heiko Kernbach 2cf6b7a2cf css change for query selectbox 2013-11-08 10:33:47 +01:00
Michael Hackstein 638ba6c090 Fixed Selection box within the navigation bar and removed it from footer. Database tab is now functional 2013-11-07 15:36:59 +01:00
Michael Hackstein b23e163f60 Added selection view css 2013-11-06 15:46:05 +01:00
Michael Hackstein e118ba2e74 Added selection box in Admin interface to switch between databases. The user will only see databases where he has access to 2013-11-05 16:21:17 +01:00
Heiko Kernbach 58789bd999 fixed menu width calculation 2013-11-03 19:39:41 +01:00
Heiko Kernbach 6a332efc38 new database view 2013-11-03 19:30:33 +01:00
Heiko Kernbach d665f150fd database view frontend 2013-10-31 22:11:51 +01:00
Heiko Kernbach b6aae2733f added database models 2013-10-31 18:50:29 +01:00
Jan Steemann 6a91e241e2 issue #645: Allow jumping from edge to linked vertices 2013-10-29 02:46:05 +01:00
Jan Steemann c6599b907c issue #647: fixed tooltips 2013-10-29 00:42:39 +01:00
Michael Hackstein a322c71083 Merge 2013-10-25 17:28:28 +02:00
Michael Hackstein b6af46725a GraphViewer: Nodes will now user pointer and edges will now be thicker and use pointer 2013-10-25 17:27:05 +02:00
Heiko Kernbach 47d28a9157 css 2013-10-25 13:47:48 +02:00
Heiko Kernbach 249dd53fe1 small design update 2013-10-25 12:26:30 +02:00
Heiko Kernbach 8ce910f0f6 commit for 1.4 final 2013-10-25 12:16:21 +02:00
Heiko Kernbach 5ba92cd646 design 2013-10-18 21:51:52 +02:00
Heiko Kernbach 87c0e8d1a8 design 2013-10-18 19:11:22 +02:00
Heiko Kernbach ed65b6c14e shell css 2013-10-18 10:41:37 +02:00
Heiko Kernbach 5b9795deb2 removed multiline shell editor 2013-10-18 10:31:53 +02:00
Michael Hackstein 7c35cc983c Issue: 609 - Modified background colour to suggested value from @luebbert42. 2013-10-16 14:53:09 +02:00
Jan Steemann 89f9bf2bb0 hide div in footer 2013-10-16 12:44:48 +02:00
Jan Steemann a6b7f7a6b1 issue #603 2013-10-16 12:42:23 +02:00
Heiko Kernbach 0cf4ae5a8e radio buttons styling 2013-10-11 19:14:53 +02:00
Heiko Kernbach c0ee8f2c0a visual status for replication state 2013-10-11 18:45:31 +02:00
Heiko Kernbach 87c98ce5d8 css 2013-10-11 16:45:03 +02:00
Heiko Kernbach 715dce6437 css 2013-10-11 15:58:39 +02:00
Heiko Kernbach ee9cb07e8f removed old background, changed some css 2013-10-11 14:58:18 +02:00
Heiko Kernbach f18720a882 OpenSans font, css changes 2013-10-11 14:36:24 +02:00
Heiko Kernbach 7634c53d0f green glow for searchInput + width 2013-10-11 12:34:20 +02:00
Heiko Kernbach 79e172fd3d api button styling 2013-10-11 11:56:18 +02:00
Heiko Kernbach 62de199b78 foxxcss 2013-10-08 23:31:48 +02:00
Heiko Kernbach b7235c33b4 css fixes for apps-view and docs-view 2013-10-08 23:29:53 +02:00
Heiko Kernbach 9087af2e61 more transparency, new api style 2013-10-08 21:57:35 +02:00
Heiko Kernbach 2a7803d673 more transparency, new api style 2013-10-08 21:56:55 +02:00
Heiko Kernbach 777afe2547 footer optimized 2013-10-08 19:52:30 +02:00
Jan Steemann 1f4992a1d4 fixed display of database name in web interface 2013-10-07 23:50:57 +02:00
Jan Steemann d47aab1950 allow /_api/logs only for the `_system` database 2013-10-07 14:23:48 +02:00
Heiko Kernbach 81fd438b11 changed footer background-color 2013-10-04 12:54:21 +02:00
Jan Steemann 729bbc44f0 use per-database directories for Foxx apps 2013-09-30 10:57:29 +02:00