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

2690 Commits

Author SHA1 Message Date
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
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +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
Jan Steemann 67f72b26fa split big group of statistics into 2 separate groups 
Conflicts:
	CHANGELOG
 2013-12-13 16:08:58 +01:00
Heiko Kernbach f4e4e411cf icons 2013-12-13 16:01:07 +01:00
Jan Steemann 1010d515bb added detailed HTTP request statistics 
Conflicts:
	CHANGELOG
 2013-12-13 16:00:02 +01:00
Jan Steemann 0a2e39085f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 15:59:15 +01:00
Jan Steemann ed927d26c8 split big group of statistics into 2 separate groups 2013-12-13 15:58:59 +01:00
Heiko Kernbach 72a9d6f14f icons 2013-12-13 15:52:20 +01:00
Heiko Kernbach fc9038dcfa changed icons to new arango icon set 2013-12-13 15:44:09 +01:00
Michael Hackstein 05a2baff05 The right-click context menu is now disabled in context of the SVG 2013-12-13 13:06:22 +01:00
Heiko Kernbach 839112dbad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-13 12:36:17 +01:00
Michael Hackstein 8624ab3278 GraphViewer: Whenever the content of the adapter is reseted now the content of the colourmap is reseted as well 2013-12-13 11:43:33 +01:00
Michael Hackstein 07cc648b55 Fixed a test in the dispatcher that failed unpredictibly 2013-12-13 11:17:03 +01:00
Michael Hackstein 18d2c3327b GraphVieweri: the abstract Adapter now propagetes a cleanUp call to the general viewer. 2013-12-13 11:16:19 +01:00
Michael Hackstein bb1abbac72 GraphViewer: Implemented passing around the graphviewer object through adapters, required for reseting 2013-12-13 10:44:16 +01:00
Michael Hackstein e6df75784f GraphViewer Added tests for the graphViewer object ot be passed arround through adapter instances, which is required for reset 2013-12-13 10:43:23 +01:00
Michael Hackstein f024bf07a2 The Colourlist is now reseted whenever the user picks a different attribute for colouring 2013-12-12 17:00:14 +01:00
Michael Hackstein 34b775086c Added test to reset the colourlist on attribute change 2013-12-12 09:43:37 +01:00
Heiko Kernbach 221b18a5e7 css fix 2013-12-12 08:46:08 +01:00
Michael Hackstein f04c25e051 Finally all GraphViewer Tests added and running under phantomjs and added to automatic test 2013-12-10 10:51:41 +01:00
Michael Hackstein 62e9a9d3d6 Fixed tests for arango ui component in graphviewer. It is now also added to PhantomJS test suite 2013-12-08 14:42:00 +01:00
Michael Hackstein cb854e8250 Fixed tests for modularityJoiner to run with phantomJS (different result because of different sorting order of object keys) 2013-12-08 13:23:34 +01:00
Michael Hackstein 1ebac6f022 Removed old location of graphviewer tests, they have been moved to the central frontend test repo 2013-12-06 18:22:05 +01:00
Michael Hackstein 24f33fb248 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-06 14:45:15 +01:00
Michael Hackstein aca868dba8 Added information line about the bug in Safari 2013-12-06 14:44:51 +01:00
Jan Steemann 705efbfb07 improved error and help messages 2013-12-04 22:42:05 +01:00
Jan Steemann 8ac6d9728e better clone some objects returned by AQL user-defined functions 2013-12-04 22:05:54 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests 
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
 2013-12-04 22:05:00 +01:00
Jan Steemann 16264f992d better clone some objects returned by AQL user-defined functions 2013-12-04 20:39:51 +01:00
Jan Steemann c63655b64c make test more reliable 2013-12-04 20:38:07 +01:00
Michael Hackstein 0c4b20d4cb Internal modification of the graph viewer ui 2013-12-04 18:26:45 +01:00
Michael Hackstein 87e056ea25 Fixed karma config, it now requires d3.v3.min instead of d3.v3. There is inconsistent behaviour between these two 2013-12-04 18:19:02 +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 1902a67b0e The GraphViewer will now again be aware of new nodes _key and _rev 2013-12-02 22:47:31 +01:00
Michael Hackstein cec169fc4f Removed debug output 2013-12-02 15:42:03 +01:00
Michael Hackstein 4d8d4307dd Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 15:36:38 +01:00
Michael Hackstein 1697e3c326 Fixed bug for ArangoDB internal errors, they have not properly been presented to the user in the Graph Management 2013-12-02 15:36:33 +01:00
Michael Hackstein 3004232b57 Type in placeholder text 2013-12-02 15:23:05 +01:00
Michael Hackstein 242b02fe0f Added error messages to new graph management overview 2013-12-02 15:19:52 +01:00
Jan Steemann 1955c8353f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-02 15:12:42 +01:00
Jan Steemann 32a247aa2f added tests for creating / dropping graphs 2013-12-02 15:12:07 +01:00
Michael Hackstein f9d4f7b725 Fixed typo. placehilder somehow does not want to show up in the interface... 2013-12-02 14:53:12 +01:00
Michael Hackstein c1bb1140c9 Fixed a bug where it was only possible to create one graph 2013-12-02 14:34:07 +01:00
Michael Hackstein 87e885d30f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 14:25:12 +01:00
Michael Hackstein c5d98f03bb Increased font size of AQL editor 2013-12-02 14:24:55 +01:00
Jan Steemann 08846a810e fixed unreadable swagger documentation 2013-12-02 14:00:44 +01:00
Jan Steemann 78598f5217 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-12-02 13:59:28 +01:00
Jan Steemann a5f6faaae4 issue #675: Dropping a collection used in "graph" module breaks the graph 2013-12-02 13:58:29 +01:00
Michael Hackstein 97678a7c36 Added new karma configuration now containing all files. 2013-12-02 13:27:18 +01:00
Michael Hackstein b4ef900052 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 13:20:43 +01:00
Michael Hackstein 4fc67b7381 Fixed GraphViewer CSS check, changed to different class but forgot the test 2013-12-02 13:20:31 +01:00
Jan Steemann a76318f940 fixed unreadable swagger documentation 2013-12-02 13:19:59 +01:00
Michael Hackstein 80127c75fa Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-12-02 13:13:15 +01:00
Michael Hackstein ff190720e3 Fixed JSLint warning line to long 2013-12-02 13:13:08 +01:00
Michael Hackstein aece2834f8 Fixed a bug in the graph manager 2013-12-02 13:12:54 +01:00
Jan Steemann 9f72a28aca fixed issue #701: ArangoStatement undefined in arangosh 2013-12-02 09:54:20 +01:00
Jan Steemann 3623cd4292 fixed issue #701: ArangoStatement undefined in arangosh 2013-12-02 09:53:49 +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 61b4022882 Added thumbnails class to database management view 2013-12-01 21:27:12 +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 103f36f223 Functionality of the graph management implemented. CSS to go 2013-11-29 14:51:48 +01:00
Michael Hackstein e04ff0822f Started implementing the graph management in the Web Interface. Tests are implemented as well as method stubs. Not yet functional and CSS is missing. 2013-11-29 09:53:37 +01:00
Michael Hackstein bb89e43515 Added a button to create the Graph Management Dialog 2013-11-28 15:29:12 +01:00
Michael Hackstein aa06036a1b Fixed karma config to load graph model and collection 2013-11-28 14:59:00 +01:00
Michael Hackstein 7b8d4e6f35 Added a collection for graphs data, right now this collection can only fetch graphs and is only used in graphs interface 2013-11-28 14:50:44 +01:00
Michael Hackstein ebb0ae026b Fixed ids that were given to multiple html elements. Added some tests for the graphView. Only Basics are tested, advanced options not yet 2013-11-28 13:25:27 +01:00
Michael Hackstein fd494a81f3 Removed debug output 2013-11-28 10:42:01 +01:00
Michael Hackstein a81cd3d321 Fixed a bug where a graph could not be selected for the viewer 2013-11-28 10:31:54 +01:00
Michael Hackstein 4ec105f5e9 Made domObserver tests work with PhantomJS. Added to automatic tests 2013-11-28 09:48:03 +01:00
Michael Hackstein fed5b288e5 Fixed a bug in karma config, required a file with small caps name which actuall had capital letters 2013-11-28 09:10:07 +01:00
Michael Hackstein a495fb4157 Made the create vertex option of GraphViewer aware of the mouse location. Not yet tested, hence disabled at some point before actual node positioning 2013-11-28 00:49:51 +01:00
Michael Hackstein a79d9b5123 Moved karma tests for the GraphViewer to the central test repo. Made most of them work in Phantomjs, the others will follow. Now they are disabled for Jenkins 2013-11-28 00:48:19 +01:00
Michael Hackstein e52a8159ce Possible fix for #638 2013-11-27 23:51:13 +01:00
Michael Hackstein b5e61471b4 Fixed query view drop down 2013-11-27 15:39:34 +01:00