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

125 Commits

Author SHA1 Message Date
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 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