1
0
Fork 0
Commit Graph

1673 Commits

Author SHA1 Message Date
Michael Hackstein d82338adc1 Added tests for correct behaviour of callback functions in arangoCollection Model 2014-04-24 00:44:05 +02:00
Michael Hackstein 7a54d907d9 Removed debug files from karma config, they should not be tested 2014-04-24 00:43:38 +02:00
Michael Hackstein f9527934da Removed dead code 2014-04-24 00:43:06 +02:00
Michael Hackstein e3ffe8fe8a Improved users collection and added tests 2014-04-24 00:42:55 +02:00
Michael Hackstein c0a347cdc5 Added test for log model 2014-04-24 00:42:22 +02:00
Michael Hackstein 53d1b57ed7 Increased Test coverage for graph model 2014-04-24 00:40:38 +02:00
Michael Hackstein f988994ef5 Fixed karma tests and JSLint 2014-04-23 17:16:38 +02:00
scottashton 4bbf9970a9 minor bugfixes and resizing of detailcharts 2014-04-23 16:46:44 +02:00
Michael Hackstein 093a86f4c1 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
2014-04-23 16:05:51 +02:00
Michael Hackstein 1edd9f8699 Made all bars clickable with the unbelievable magic hack 2014-04-23 16:00:26 +02:00
scottashton 2e7649dcbc fixed modal warning bug 2014-04-23 15:58:12 +02:00
Michael Hackstein 3055fef939 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-23 15:46:12 +02:00
Michael Hackstein 50acbb1533 Made the residentSize bar clickable by using d3.js magic hack 2014-04-23 15:46:07 +02:00
scottashton 160e7501cd changed modal warning in case statistics are not yet available 2014-04-23 15:39:58 +02:00
scottashton 7a744251fa fixed minor bug 2014-04-23 15:26:31 +02:00
scottashton 1e32a19b6f jslinted router spec 2014-04-23 15:08:53 +02:00
scottashton 9d4d7bef6b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-23 15:07:30 +02:00
scottashton 76dd01dcfa refactored router and added modal warning whenever dahsboard statistics are not available 2014-04-23 15:07:21 +02:00
Heiko Kernbach 9c6c2de7c7 updated notification vierw spec 2014-04-23 12:35:11 +02:00
Heiko Kernbach eb5de72025 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-23 12:27:10 +02:00
Heiko Kernbach dd3456f95f added spec for notification view 2014-04-23 12:27:03 +02:00
Michael Hackstein 6458932207 Fixed issue with large collections and fixed test for arango.js 2014-04-23 09:59:06 +02:00
Michael Hackstein 7b07664c55 Removed unused code 2014-04-23 09:34:59 +02:00
scottashton ce51bff2ed jslinted dashboardview 2014-04-22 14:18:50 +02:00
scottashton 782c0ea025 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-22 14:15:29 +02:00
scottashton 7b5e25bc32 fixed detail modal view from cluster server 2014-04-22 14:15:22 +02:00
Jan Steemann 75802ccf73 added derived file 2014-04-22 11:32:19 +02:00
Jan Steemann ec26253f77 fix handling of properties with value `false` 2014-04-22 11:31:23 +02:00
scottashton a5475ba430 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-22 11:02:10 +02:00
scottashton b7ce24aaf5 remove traces of logCollection 2014-04-22 11:02:05 +02:00
Jan Steemann c68506e02d removed deleted file 2014-04-22 10:57:51 +02:00
Jan Steemann 01a5818983 removed unused logsView.js 2014-04-22 10:56:38 +02:00
Jan Steemann 9bef8615fc removed useless file 2014-04-22 10:53:35 +02:00
scottashton 0e96bcde17 SCSS HELL 2014-04-17 17:27:05 +02:00
gschwab 0200a10e4d too many , 2014-04-17 15:03:21 +02:00
gschwab ed2a5fbb6b fixed scsslint 2014-04-17 14:57:34 +02:00
gschwab 80234f43c3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 14:50:23 +02:00
gschwab 6dfd793cc1 started refactored collection collectionsView 2014-04-17 14:50:17 +02:00
scottashton e4d5dfd7f2 clusterdashboard refactoring, backbone events are now passed into modalview 2014-04-17 14:12:13 +02:00
scottashton ca80048166 adjusted statistics request for clusterFrontend 2014-04-17 10:17:04 +02:00
scottashton 4e4ecb40f4 adjusted statistics request for clusterFrontend 2014-04-17 09:53:10 +02:00
scottashton a3e10fbcae adjusted statistics request for clusterFrontend 2014-04-17 09:50:42 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
2014-04-16 20:16:22 +02:00
scottashton 58e0d20559 fixed tests 2014-04-16 17:21:33 +02:00
scottashton eb1d0f5d28 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-16 17:03:32 +02:00
scottashton f1bf4e427b scss-linted files and started clusterserver dashboard ng 2014-04-16 17:03:24 +02:00
gschwab d797ee12c0 fixed scss lint 2014-04-16 16:10:40 +02:00
gschwab 9cf0de91b7 deleted unused file 2014-04-16 15:51:24 +02:00
gschwab 860c51c390 removed dead code - collectionView not used anymore, because of new modal concept - tests adjusted - part 2 2014-04-16 15:50:11 +02:00
gschwab b5f0fce04a removed dead code - collectionView not used anymore, because of new modal concept - tests adjusted 2014-04-16 15:47:46 +02:00