1
0
Fork 0
Commit Graph

1543 Commits

Author SHA1 Message Date
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
gschwab e9337524aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-16 15:45:23 +02:00
gschwab 1caae7c6e3 removed dead code - collectionView not used anymore, because of new modal concept 2014-04-16 15:45:17 +02:00
scottashton d0b06f66e4 dashboard d3 2014-04-16 13:37:01 +02:00
Michael Hackstein b12b6a1232 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-16 08:58:38 +02:00
Michael Hackstein e619028d08 Fixed a caching problem in IE JS Shell 2014-04-16 08:58:31 +02:00
scottashton e515acf6a2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-15 17:34:25 +02:00
scottashton 1da96a0826 dahsboard refactoring 2014-04-15 17:34:14 +02:00
Michael Hackstein 4744992648 Unified pagination of newLogs with _paginationView 2014-04-15 09:48:52 +02:00
Michael Hackstein dc164ec6d2 Fixed scss-lint warnings 2014-04-15 08:53:34 +02:00
Michael Hackstein f870abed3b Added new list of files for karma 2014-04-15 08:49:51 +02:00
Michael Hackstein 2450af2f6f Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-15 08:47:31 +02:00
Michael Hackstein 1e6bf8dfea Fixed JS-lint warnings 2014-04-15 08:47:25 +02:00
Michael Hackstein 22fd9fd699 Fixed karma tests for missing logsView (old) 2014-04-15 08:45:27 +02:00
Frank Celler cdadfe152a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-14 18:37:05 +02:00
Frank Celler 23c4d59cb9 added async requests difference (instead of absolute value) 2014-04-14 18:35:51 +02:00
Michael Hackstein 4e5b95420c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-14 18:33:33 +02:00
Michael Hackstein 82fac7710b Fixed a authentication problem in the cluster dashboard 2014-04-14 18:33:28 +02:00
scottashton 99e4f8bb90 adjusted distributioncharts to process the max value 2014-04-14 18:07:31 +02:00
Frank Celler 8dadcfc19d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-14 17:58:56 +02:00
Frank Celler 54412ec3e9 fixed cuts & values 2014-04-14 17:58:42 +02:00
scottashton 5bf35adc53 jslinted 2014-04-14 17:57:39 +02:00
scottashton 388787c717 dashboard refactoring 2014-04-14 17:45:32 +02:00
scottashton 5eb28e2468 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-14 17:36:46 +02:00
scottashton 4ac4dd7268 dashboard refactoring 2014-04-14 17:36:40 +02:00
gschwab f472c253b6 jslint... 2014-04-14 16:16:41 +02:00
gschwab 06ccfaf2a7 fixed another self=this issue 2014-04-14 15:17:13 +02:00
scottashton 32d0c75c23 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-14 14:56:27 +02:00
scottashton a07b4b107b started d3 charts 2014-04-14 14:56:14 +02:00
gschwab 8539a425f4 deleted dead code 2014-04-14 14:50:12 +02:00
gschwab d70bce57f2 check connectionValidationKey before setting the connection information 2014-04-14 14:47:21 +02:00