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

4577 Commits

Author SHA1 Message Date
scottashton 4e4ecb40f4 adjusted statistics request for clusterFrontend 2014-04-17 09:53:10 +02:00
scottashton 7d130e56f5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 09:50:54 +02:00
scottashton a3e10fbcae adjusted statistics request for clusterFrontend 2014-04-17 09:50:42 +02:00
Frank Celler 76b4c71d2e added isSystem to default representation 2014-04-17 09:46:10 +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
Frank Celler 39fd596abc changed return of users.remove 
Conflicts:
	js/actions/api-user.js
 2014-04-16 19:56:04 +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 1a7beab656 removed old files 2014-04-14 18:38:11 +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
gschwab 610d879298 removed old logs 2014-04-14 14:31:48 +02:00
gschwab 44adcd04f5 fixed check all connections (was broken because of async=true 2014-04-14 14:29:26 +02:00
gschwab ab01569204 added tests for arangoCollectionModel 2014-04-14 10:32:17 +02:00
gschwab 609b8139c5 removed some '**' in manifest.json 2014-04-14 08:24:21 +02:00
Jan Steemann ca871efff0 added derived file 2014-04-13 22:21:34 +02:00
Jan Steemann 2050049b06 added periodic job management 
this adds functions internal.deletePeriod() and internal.getPeriodic()
functions internal.definePeriodic() now also has an extra parameter to
specify the name of a periodic job. this makes it more easy to tell
jobs apart in the result of internal.getPeriodic().
 2014-04-13 22:19:46 +02:00
Jan Steemann af4acee8e0 do not load ALL collections when the web interface is loaded 2014-04-13 22:10:21 +02:00
Jan Steemann 9a3a55d199 always escape URLs 2014-04-13 22:05:43 +02:00
Michael Hackstein 31f3d36443 Removed debug output 2014-04-13 15:11:01 +02:00
Michael Hackstein 2392d3de08 Modified aardvark to use internal configuration to store notification infos 2014-04-13 15:08:59 +02:00
Michael Hackstein 0c210c5118 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-13 14:56:38 +02:00
Michael Hackstein 5751680d68 Added tests for the version check 2014-04-13 14:56:35 +02:00
Frank Celler 22ad916024 added configuration module, documentation is not there yet 2014-04-13 14:20:09 +02:00
Frank Celler 8464018141 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-13 14:18:33 +02:00
Michael Hackstein 49213dffdc Fixed a potential bug in karma tests. The router was not always mocked correctly, which would cause errors if order of tests is changed 2014-04-13 13:18:08 +02:00
Michael Hackstein d04e8ab0cf Fixed #824. Removed debug version of arango in WebUI 2014-04-13 07:37:25 +02:00
Michael Hackstein 94a452293a Simplified coordinator checkin WebUI 2014-04-13 07:35:00 +02:00
Michael Hackstein 29ced35952 Fixed all karma tests 2014-04-12 02:26:40 +02:00
Heiko Kernbach eccb329434 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-11 19:12:30 +02:00
Heiko Kernbach 32b18f1163 karma specs for newlogview and documntview 2014-04-11 19:12:22 +02:00
Jan Steemann 2c030d0119 autoload modules 2014-04-11 18:43:14 +02:00
Michael Hackstein a54d7a6a9e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
 2014-04-11 17:26:32 +02:00
Michael Hackstein 776a9e6c7a Improved version check, it now allows a user to tell the system to stop doing it 2014-04-11 17:24:05 +02:00
gschwab 61c3395eb1 removed some '**' in manifest.json 2014-04-11 16:07:42 +02:00
gschwab 9ceacd2827 fixed scsslint 2014-04-11 15:31:00 +02:00
gschwab 2f98f52120 fixed manifest for pagination 2014-04-11 15:14:12 +02:00
gschwab 2a3ab21398 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-11 15:13:01 +02:00
gschwab 552566fa28 fixed css for cluster# 2014-04-11 15:12:55 +02:00
scottashton e087685150 fixed bug in statsitics 2014-04-11 13:23:36 +02:00
scottashton ed6bc4f6a2 dashboard refactoring 2014-04-11 12:31:05 +02:00
scottashton f5a664e93b added missing stats to statistics app and did further dashboard fefactoring 2014-04-11 12:30:09 +02:00
Jan Steemann c8d21f5cb3 issue #818: Foxx: foxx-manager spelling error in shell 2014-04-11 12:15:13 +02:00
gschwab 432220e661 added focus to buttons for keyboard navigation support 2014-04-11 11:43:12 +02:00
gschwab 8cce9d353f deleted dead code 2014-04-11 11:24:19 +02:00
gschwab dd1ce6b79b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-11 11:10:53 +02:00
gschwab 92da0f254d refactored collection info modal 2014-04-11 11:10:49 +02:00
Michael Hackstein 138c296295 The web interface will now check for available updates and will inform the user if thereis one available 2014-04-11 11:07:07 +02:00
Michael Hackstein 11f280b22c Removed console output 2014-04-11 10:41:11 +02:00
Michael Hackstein 353fe04b83 Fixed indention of router 2014-04-11 10:34:38 +02:00
Michael Hackstein 5bcc334c45 Further improvements of dashboard style 2014-04-11 10:31:09 +02:00
Michael Hackstein c88729ba76 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-11 08:54:57 +02:00
Michael Hackstein a89ab0d76d Applied scss fixes to new dashboard 2014-04-11 08:54:51 +02:00
scottashton fcc382de9d dashboard refactoring 2014-04-11 08:52:16 +02:00
Michael Hackstein 6d970741e4 Fixed some js tests 2014-04-10 22:11:24 +02:00
Heiko Kernbach bcbc2375ea Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-10 21:36:26 +02:00
Heiko Kernbach 9ed0f874ac new logs view spec 2014-04-10 21:35:52 +02:00
Frank Celler e30414b839 fixed path 2014-04-10 17:32:08 +02:00
scottashton c4b3b3293b dashboard refactoring 2014-04-10 17:32:01 +02:00
gschwab 4baa888c70 cleaned manifest.json 2014-04-10 17:31:59 +02:00
gschwab 68be5db03b added foxx app to change initial password 2014-04-10 17:31:44 +02:00
Frank Celler 99bc134bcf added password token functions 2014-04-10 17:31:33 +02:00
scottashton fae1c057d5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-10 16:55:25 +02:00
scottashton 457edf6221 newDyGraph 2014-04-10 16:54:43 +02:00
gschwab d488aca451 deleted dead code 2014-04-10 16:37:46 +02:00
gschwab f95fdc099e some more fixes 2014-04-10 16:22:11 +02:00
gschwab 6a24749a1e hopefully fixed some tests... 2014-04-10 16:12:28 +02:00
gschwab bdfaf0916c removed newCollectionView.* 2014-04-10 14:35:10 +02:00
gschwab 149aee2bc7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-10 13:03:17 +02:00
gschwab 89e85926cd Strating with '_' is no longer defined as 'isSystem' 2014-04-10 13:03:05 +02:00
Frank Celler 8bd9ab4537 added missing deletes, pathes, others 2014-04-10 12:54:27 +02:00
Frank Celler 08484ce292 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-10 11:48:41 +02:00
Frank Celler fc0ffd40b6 added missing figures 2014-04-10 11:48:35 +02:00
gschwab 9b3f22e2da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-10 09:50:41 +02:00
gschwab 7bde55b23a added caret to show if advanced button in modal view is collapsed or not 2014-04-10 09:49:17 +02:00
Michael Hackstein 4bdc90b6cb Added test for AppDocumentationView, almost equal to ApiView 2014-04-10 01:46:52 +02:00
Michael Hackstein b8206ec8e0 Removed unused function and renamed ApiView according to standard 2014-04-10 01:45:54 +02:00
Michael Hackstein 85094878ad Added a test for API view 2014-04-10 01:31:39 +02:00
Michael Hackstein 967a2eed50 Added full test of graphViewer under coverage 2014-04-10 00:57:04 +02:00
Frank Celler 4acbffe372 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-10 00:01:06 +02:00
Frank Celler 725ee27028 added first version of statistics 2014-04-10 00:00:59 +02:00
Michael Hackstein 2427e85cd2 Added the new dashboard template 2014-04-09 16:41:23 +02:00
Michael Hackstein bcf1878888 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-09 16:06:47 +02:00
Michael Hackstein d39e306d38 First version of newest dashboard design 2014-04-09 16:06:43 +02:00
gschwab 51ff024337 removed userProfileView.* 2014-04-09 09:48:36 +02:00
gschwab 83da043073 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-09 09:42:48 +02:00
gschwab eb0b685bd4 refactored modals of manage graph 2014-04-09 09:42:35 +02:00
Jan Steemann ba8e38d6e5 bugfix for AQL query optimiser 
the following type of query was too eagerly optimised, leading to errors in code-generation:

   LET a = (FOR i IN [] RETURN i) LET b = (FOR i IN [] RETURN i) RETURN 1

the problem occurred when both lists in the subqueries were empty. In this case invalid code
was generated and the query couldn't be executed.
 2014-04-08 23:26:55 +02:00
Michael Hackstein 0829bc490b Fixed JSLint warnings 2014-04-08 18:26:56 +02:00
scottashton ab3da3d2ce removed window.* from documentsView and refactored router 2014-04-08 18:07:56 +02:00
scottashton 9143834bc3 100% coverage of _paginationView 2014-04-08 14:58:33 +02:00
scottashton cead527a19 fixed merge conflict 2014-04-08 14:38:45 +02:00
scottashton 7c0c57c914 view refactoring 2014-04-08 14:32:54 +02:00
gschwab 0cbec72e9e fixed some css for modals (info icon) 2014-04-08 14:11:34 +02:00
Jan Steemann 3711669d90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-08 13:21:16 +02:00
Jan Steemann ad64c52e28 issue #796: fixed potential issue with newlines treated slightly differently in different parts of AQL 2014-04-08 13:20:26 +02:00
gschwab acf585df22 fixed modal layout 2014-04-08 13:06:57 +02:00
Michael Hackstein 58baf0fbfe Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-08 10:22:58 +02:00
Michael Hackstein f47673752b Fixed karma tests 2014-04-08 10:22:55 +02:00
gschwab a1f2b6814f fixed id 2014-04-08 10:22:05 +02:00
scottashton 027351f739 refactoring documentsview 2014-04-08 09:15:42 +02:00
Michael Hackstein e8cac58918 Fixed some frontend tests and jslint warning 2014-04-08 09:09:00 +02:00
Heiko Kernbach 7477da64c7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 22:05:25 +02:00
Heiko Kernbach 8a6cdde372 newlog spec 2014-04-07 22:04:23 +02:00
Jan Steemann 23e844f8eb removed unused variables 2014-04-07 22:02:34 +02:00
Heiko Kernbach b9924c4fb8 documentViewSpec 2014-04-07 20:23:51 +02:00
Michael Hackstein 4bb8e6ec18 Removed hack for spies that caused side-effects. Some tests now fail, will be fixed soon 2014-04-07 18:14:25 +02:00
Michael Hackstein d27eac7cf9 Started fixing broxxen tests for arangoDocumentSpec 2014-04-07 18:09:34 +02:00
Michael Hackstein 1fd2fc854e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 16:41:22 +02:00
Michael Hackstein df5952e6dd Further refactoring of frontend 2014-04-07 16:41:17 +02:00
gschwab 4b0e0e930b added IDs for readonly entries in modal 2014-04-07 16:16:25 +02:00
Michael Hackstein d85ec9ea3c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 15:36:58 +02:00
Michael Hackstein c5daa94cd0 Inserted the paginatedCollection 2014-04-07 15:36:54 +02:00
Michael Hackstein 358ed60a46 Fixed a missing function getTotal. ArangoDocuments will now fetch their total amount on col change 2014-04-07 15:35:07 +02:00
Heiko Kernbach 10a3c0f153 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 14:40:21 +02:00
Heiko Kernbach 2dee04e24a documentViewSpec 2014-04-07 14:39:34 +02:00
Michael Hackstein 1e48d44050 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/collections/arangoDocuments.js
 2014-04-07 14:38:07 +02:00