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

4938 Commits

Author SHA1 Message Date
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 3744e8dde9 issue #796: Searching with newline chars broken? 2014-04-22 13:38:06 +02:00
Jan Steemann ce36c94082 added test for issue #796 2014-04-22 13:04:30 +02:00
Jan Steemann 4075f08aef silence foxx manager 2014-04-22 12:13:53 +02:00
Jan Steemann 75802ccf73 added derived file 2014-04-22 11:32:19 +02:00
Jan Steemann 76c09f43b5 added tests 2014-04-22 11:31:35 +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 931f10a402 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-17 14:12:24 +02:00
scottashton e4d5dfd7f2 clusterdashboard refactoring, backbone events are now passed into modalview 2014-04-17 14:12:13 +02:00
gschwab ca984e1212 added 'passwordToken' to create user, fixed small bug with changePassword attribute 2014-04-17 13:27:02 +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 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
Jan Steemann 90c0d0dfd6 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-11 21:33:41 +02:00
Jan Steemann a148b95183 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-11 20:06:34 +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
Jan Steemann b3ab5badf1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-11 16:19:19 +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
Jan Steemann b5cb711a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-11 13:01:13 +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
Jan Steemann 3dce782d5d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-10 09:12:32 +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
Jan Steemann 1040a43776 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-09 18:03:22 +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
Jan Steemann 0852dbb301 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-09 09:51:38 +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 9265669795 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-09 08:59:59 +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
Jan Steemann e4ead0b6fa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-08 17:10:58 +02:00
scottashton 9143834bc3 100% coverage of _paginationView 2014-04-08 14:58:33 +02:00
Jan Steemann 3b3c37d9a4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-08 14:40:44 +02:00
Jan Steemann c29cf874b5 transaction interface 2014-04-08 14:40:09 +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
Michael Hackstein f3b267db95 Further impl of arangoDocuments. Warning all tests broken, ongoing work 2014-04-07 14:36:20 +02:00
Heiko Kernbach b2eaf848cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 13:30:18 +02:00
Heiko Kernbach 446a2baaa2 css logs 2014-04-07 13:29:56 +02:00
gschwab 517b2d96af fixed tests 2014-04-07 11:49:20 +02:00
gschwab 2f56c946fa refactored modalDialogs for adding collections 2014-04-07 11:22:00 +02:00
scottashton d889ba7d69 jslinted file 2014-04-07 11:14:44 +02:00
scottashton 9179e2caaf moved uploadFile to documentscollection 2014-04-07 11:07:17 +02:00
Michael Hackstein bc8716c059 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-07 09:52:07 +02:00
Michael Hackstein 7a8f6cf0c1 Moved pagination to a more general collection, logs is now extending it 2014-04-07 09:52:03 +02:00
gschwab ed30df6c17 added SELECT2 entry for modal view 2014-04-07 09:14:03 +02:00
Michael Hackstein fb3eab315d Minor fixes in new arangoLogs, just cosmetics 2014-04-07 09:07:02 +02:00
Heiko Kernbach 36ace5297e refactored log view 2014-04-04 19:34:54 +02:00
Heiko Kernbach 33e3fa7267 scss 2014-04-04 19:28:51 +02:00
Heiko Kernbach d9a31855af Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 19:28:04 +02:00
Heiko Kernbach be8c91c603 scss + lint 2014-04-04 19:27:53 +02:00
Michael Hackstein cdfc19741c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 18:11:42 +02:00
Michael Hackstein 3ea2aacba9 Minor refactoring of collections. Still a lot to do 2014-04-04 18:11:38 +02:00
Heiko Kernbach cba8ae626d merge conflict 2014-04-04 17:54:22 +02:00
Heiko Kernbach 557a9b8365 refactoring logs 2014-04-04 17:53:11 +02:00
Michael Hackstein da0e807e16 Removed foxxEdit and Mount Views(which are now embedded modals 2014-04-04 17:38:29 +02:00
Michael Hackstein 838b198267 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 17:29:59 +02:00
Jan Steemann 03ee5cc3c4 better description of some figures 2014-04-04 17:22:24 +02:00
Jan Steemann 06fa64b671 fixed jslint complaint 2014-04-04 17:22:16 +02:00
gschwab 9a1872597a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 16:39:44 +02:00
gschwab 51fe592572 removed test view 2014-04-04 16:39:39 +02:00
scottashton f4cd6dcea7 removed unsused cluster views 2014-04-04 16:25:47 +02:00
scottashton b5f1253ac4 finished documentViewTest 2014-04-04 14:47:04 +02:00
gschwab 0f54351a86 removed console.log O.o 2014-04-04 14:43:25 +02:00
gschwab 584558097a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 14:25:42 +02:00
gschwab 0d314683d8 added 'advanced' area for modal dialog 2014-04-04 14:25:06 +02:00
gschwab 34853739ae fixed password dialog 2014-04-04 14:24:26 +02:00
Heiko Kernbach 6c06b0c52e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-04 11:44:36 +02:00
Heiko Kernbach 34f061f85c excluded libs from coverage tests 2014-04-04 11:44:27 +02:00
Michael Hackstein 5d5aa029a8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-04 11:33:24 +02:00
gschwab cba524f15f refactored modal dialogs for databaseView 2014-04-04 11:13:53 +02:00
Frank Mayer ddb057fa27 Fixes "New Collection" window not honoring user-specified journal size. 
The tests need to be extended for this, as I didn't have a proper development environment set up for this.

Tested it manually though and it works.
 2014-04-04 06:23:45 +03:00
Michael Hackstein 06093ab5a5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 17:46:34 +02:00
Michael Hackstein 5e8f283841 Moved edit app modal to the centralized version 2014-04-03 17:46:29 +02:00
gschwab 3edbd02655 fixed jslint 2014-04-03 17:13:16 +02:00
gschwab 1a1f4558f1 refactored modal dialogs for userManagement 2014-04-03 16:40:46 +02:00
scottashton f891d7d253 documentsViewSpec 2014-04-03 16:34:25 +02:00
Michael Hackstein 5884e27879 Added conv function for password 2014-04-03 15:41:25 +02:00
Michael Hackstein 906f40e57e Fixed user profile route test 2014-04-03 15:40:05 +02:00
Michael Hackstein c606c0fd2a Fixed JSLint 2014-04-03 15:36:30 +02:00
Michael Hackstein 4caa3c50c6 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 15:27:26 +02:00
Michael Hackstein d69d4b5d03 Added some more conv. functions to modalview 2014-04-03 15:27:22 +02:00
gschwab 3c37ce38cd added mandatory field 2014-04-03 15:24:24 +02:00
Michael Hackstein 3bc50edc2f Improved createText convenience function in modal view 2014-04-03 15:19:11 +02:00
Michael Hackstein cf53a9aafa Removed unnecessary request for an unused image in css 2014-04-03 15:16:17 +02:00
Michael Hackstein 6cda5ae849 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 14:38:09 +02:00
Michael Hackstein f742a979d1 Moved install Foxx Modal to global singleton 2014-04-03 14:38:05 +02:00
Jan Steemann c1916b1825 bumped version number 2014-04-03 14:08:28 +02:00
Michael Hackstein fdaacdb209 Added a few convenience functions for the new modalView singleton 2014-04-03 13:04:29 +02:00
Michael Hackstein af406257a8 Sorted cancel button as second from right always 2014-04-03 11:03:09 +02:00
gschwab 98636cf1df first try with modals: some small bugs fixed 2014-04-03 10:53:04 +02:00
Michael Hackstein f9a5548e03 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 10:22:15 +02:00
Michael Hackstein 377f9fec1d Added test for the delete button and actually showed and hided the dialog 2014-04-03 10:22:12 +02:00
gschwab 83f4bfb5d3 added id to modal dialog 2014-04-03 10:21:02 +02:00
gschwab 07fd17b364 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-03 09:57:52 +02:00
gschwab 1af661d13f some scss refactoring for modals 2014-04-03 09:57:44 +02:00
scottashton ddca991a3c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-03 09:54:32 +02:00
scottashton 52b48fe586 fixed routerspec and removed unneccesary logs 2014-04-03 09:54:24 +02:00
Michael Hackstein 5c884282db Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-03 09:46:44 +02:00
gschwab 4cebb1a752 added confirmation div 2014-04-03 09:46:17 +02:00
Michael Hackstein e647e5e8e1 Added test for delete button 2014-04-03 09:43:09 +02:00
Michael Hackstein c6d4d7de08 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-02 17:58:41 +02:00
Michael Hackstein 21f8ae668c Fixed jslint warnings 2014-04-02 17:58:19 +02:00
Jan Steemann 0e071eaf52 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-02 17:51:37 +02:00
Jan Steemann 88c3089b36 don't report bogus error messages 2014-04-02 17:51:25 +02:00
Michael Hackstein 44c301bfae Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-04-02 17:33:38 +02:00
Michael Hackstein fe246890ae Added tests for modal table template 2014-04-02 17:33:34 +02:00
scottashton a0e5a2e1fb CollectionsViewSpec 2014-04-02 17:02:43 +02:00
Jan Steemann b188cbf608 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-02 16:29:50 +02:00
Jan Steemann 7eeba86254 update routing cache all or nothing 2014-04-02 16:29:42 +02:00
gschwab 91b3358f6a initial commit of modal table 2014-04-02 16:07:50 +02:00
gschwab 69098a89b2 prepared table content 2014-04-02 15:04:38 +02:00
Michael Hackstein 58f79be9a2 Start of modal view implementation 2014-04-02 14:43:32 +02:00
gschwab 18de674c1d template for modal dialog 2014-04-02 14:04:15 +02:00
gschwab 9043a0de34 fixed dashboard modals 2014-04-02 11:52:35 +02:00
Max Neunhoeffer b0f43cf027 Fix documentation of traversals w.r.t. sorting the edges at a vertex. 2014-04-02 11:36:07 +02:00
Max Neunhoeffer 5e0280bfc7 Export sort attribute for traversals via REST. 2014-04-02 11:12:03 +02:00
gschwab 9e21ef2ba8 fixed connection check: firefox does not support async:false 2014-04-02 09:23:46 +02:00
Michael Hackstein 7549c13bc5 Created a simple change password implementation for foxx. Added Documentation 2014-04-01 17:23:09 +02:00
scottashton 35e0e1c046 jslinted overwriteAjax.js 2014-04-01 13:48:04 +02:00
scottashton a4acff49d9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-01 13:41:37 +02:00
scottashton 8f44385c43 finished router tests 2014-04-01 13:41:29 +02:00
gschwab a2c292d8ac tests added for model arangoReplicationSpec.js 2014-04-01 13:22:21 +02:00
gschwab 01f4d8840d tests added for model arangoUsers.js 2014-04-01 13:08:15 +02:00
gschwab d4cd7ab629 added missing models 2014-04-01 13:02:32 +02:00
Michael Hackstein dc3289cc31 Karma frontend integration tests: Relinked all ajax-requests to a different arangod running on port 7777 2014-04-01 12:59:28 +02:00
Michael Hackstein 9274bc76e9 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/js/routers/router.js
	js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
 2014-04-01 12:57:20 +02:00
gschwab 30a1389426 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-31 16:15:22 +02:00
gschwab 7655ce3c18 fixed issue #800 2014-03-31 16:14:26 +02:00
scottashton f7ceebe35b reformated tests 2014-03-31 14:31:39 +02:00
scottashton 6c09b13d56 fixed tests 2014-03-31 14:21:38 +02:00
scottashton b111ffd8c2 Revert " finished router tests and reformated test files" 
This reverts commit 2352b41ba8a067eb7fb02258d322bba8ddc37809.
 2014-03-31 13:33:39 +02:00
scottashton fd88f2fc47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-31 13:06:45 +02:00
scottashton 86dd3cc94b finished router tests and reformated test files 2014-03-31 13:05:36 +02:00
Jan Steemann 7ee2caf94e simplified usage of arango-statement 2014-03-28 16:57:59 +01:00
Jan Steemann 55f0dc5739 logfile opening/closing fixes 2014-03-28 16:45:06 +01:00
Jan Steemann 202cbcf05d pacified jslint 2014-03-28 12:04:01 +01:00
Jan Steemann b6dff63218 disable version notification 2014-03-28 11:07:13 +01:00
gschwab 58541ce436 currentUser as global var 2014-03-28 09:35:13 +01:00
gschwab dfc7ab72a1 small fix: modal dialog will be filled, when using profile-link 2014-03-28 09:17:20 +01:00
gschwab aeb75f1d08 moved edit userProfile to user management 2014-03-27 17:05:56 +01:00
Jan Steemann 9724cfec64 fixed failing test 2014-03-27 13:12:45 +01:00
Jan Steemann e2f1d0dfb6 fixed issues in arango-dfdb 2014-03-27 12:29:32 +01:00
scottashton e8904d5d93 fixed jslint 2014-03-27 12:15:13 +01:00
scottashton fd2253076e testing collections and models finished, coverage = 100% 2014-03-27 11:06:42 +01:00
scottashton 48448a6039 fixed bug in manifest 2014-03-27 09:43:42 +01:00
gschwab 23f6ece5d4 fixed wrong filename O.o 2014-03-27 09:12:42 +01:00
gschwab c81b319506 fixed line too long - jslint 2014-03-27 09:12:14 +01:00
gschwab 4fa1d8e565 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-27 08:55:12 +01:00
Frank Celler 456d089deb generateSwagger can now also parse MD files 
Conflicts:
	js/apps/system/aardvark/api-docs/batch.json
	js/apps/system/aardvark/api-docs/collection.json
	js/apps/system/aardvark/api-docs/cursor.json
	js/apps/system/aardvark/api-docs/database.json
	js/apps/system/aardvark/api-docs/document.json
	js/apps/system/aardvark/api-docs/edge.json
	js/apps/system/aardvark/api-docs/edges.json
	js/apps/system/aardvark/api-docs/endpoint.json
	js/apps/system/aardvark/api-docs/graph.json
	js/apps/system/aardvark/api-docs/index.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/simple.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/api-docs/traversal.json
	js/apps/system/aardvark/api-docs/version.json
 2014-03-26 23:09:07 +01:00
scottashton 81aaa09949 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-26 17:43:37 +01:00
scottashton 48003a69e9 cluster tests 2014-03-26 17:43:20 +01:00
gschwab eb5902b139 fixed cluster restart and cluster dashboard refresh for authentication 2014-03-26 17:20:44 +01:00
gschwab ebabd76417 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-26 15:09:45 +01:00
gschwab 08878cb42c removed unnecessary authorization handon 2014-03-26 15:09:38 +01:00
scottashton 2c1981ea1b finished frontend/collections tests 2014-03-26 14:44:06 +01:00
Jan Steemann b4a78b55db fixed failing test 2014-03-25 18:48:53 +01:00
scottashton ca5ccf9a39 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:52:22 +01:00
scottashton 78d7a2c18a more tests 2014-03-25 17:52:14 +01:00
gschwab d7dbb38587 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-25 17:16:44 +01:00
gschwab 3ef97931f2 karma test for some more models 2014-03-25 17:16:34 +01:00
scottashton 213c61d104 merged conflict 2014-03-25 16:08:17 +01:00
scottashton 1b5e31b9d7 starting collections tests 2014-03-25 16:06:37 +01:00
Frank Celler d34832bbcf added changePassword attribute for users 2014-03-25 11:40:13 +01:00
gschwab 444a84157b karma test for some models, small refactoring (renaming) of ../collections/arangoStatisticsDescriptionCollection.js 2014-03-25 10:20:09 +01:00
Heiko Kernbach 24df691dd0 files now in files.json 2014-03-24 17:54:44 +01:00
scottashton 9e8cc5613c added testSpec for arangoCollections 2014-03-24 17:39:08 +01:00
gschwab a7c6f06fd0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 16:15:44 +01:00
gschwab 416e2bcd04 conf for local coverage report 2014-03-24 16:15:39 +01:00
scottashton a55b9e93c4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 16:14:51 +01:00
scottashton 5a7379e62a changed type of BytedSend and BytesReceived chart 2014-03-24 16:14:42 +01:00
Heiko Kernbach afdb776b51 html->cobertura 2014-03-24 15:37:45 +01:00
Heiko Kernbach 7b53a4fe4f karma for coverage 2014-03-24 15:13:55 +01:00
Heiko Kernbach 5f1443a527 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 11:48:02 +01:00
Heiko Kernbach 2aef561e51 changed delay for notifications 2014-03-24 11:47:55 +01:00
gschwab fa06331b7e css refactoring: refactored screenSizes.css - adjusted manifest.json 2014-03-24 09:49:32 +01:00
gschwab 9dc313c61b css refactoring: refactored screenSizes.css 2014-03-24 09:29:59 +01:00
gschwab cb95204e61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 09:19:58 +01:00
gschwab 527d88747b added connection check for multi machine cluster 2014-03-24 09:19:50 +01:00
Jan Steemann 3ad15e3ac1 fixed non-working "save" button in collection edit view of web interface 
clicking the save button did nothing. one had to press enter in one of the input fields to send modified form data

Conflicts:
	js/apps/system/aardvark/frontend/js/views/collectionView.js
 2014-03-21 22:44:37 +01:00
Jan Steemann a9920ea9ca dont try to load datatables.css - this file has already been deleted! 2014-03-21 21:27:33 +01:00
Heiko Kernbach 1fcbd582b3 logs pagination bugfix, when totalPages are zero 2014-03-21 17:21:10 +01:00
Heiko Kernbach 09c2060969 removed console logs 2014-03-21 17:12:47 +01:00
Heiko Kernbach 71ca2fee1f new icons for pagination (scss) 2014-03-21 17:05:39 +01:00
Heiko Kernbach 5107cbb694 removed old snippet css 2014-03-21 15:51:47 +01:00
Heiko Kernbach 085d3de302 snippet css to scss 2014-03-21 15:50:47 +01:00
Heiko Kernbach a2d80c2b9e dataTables scss lint 2014-03-21 15:48:53 +01:00
Heiko Kernbach 3824fe5fdb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 15:44:13 +01:00
Heiko Kernbach faa9317db5 removed unused glyphicons 2014-03-21 15:44:00 +01:00
scottashton 149d90e78b merged 2014-03-21 15:33:08 +01:00
scottashton 0e3da446d1 kill modal.css 2014-03-21 15:32:24 +01:00
Heiko Kernbach a409acd013 dataTables scss lint 2014-03-21 15:17:25 +01:00
Heiko Kernbach c84d284a90 cleanup css 2014-03-21 15:09:42 +01:00
Heiko Kernbach 4aef4877a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 15:09:28 +01:00
Heiko Kernbach 31a69dba67 dataTables css -> scss 2014-03-21 15:09:18 +01:00
scottashton 355c1100eb _collection.scss 2014-03-21 14:16:53 +01:00
scottashton 690a2afe81 fixed merge bug 2014-03-21 14:00:33 +01:00
scottashton d61f1e4e0c merged 2014-03-21 13:47:58 +01:00
scottashton 7a1a905f4d jslinted the dashboardView 2014-03-21 13:39:09 +01:00
scottashton 28029236d1 fixed dashboard bugs 2014-03-21 13:24:56 +01:00
scottashton 51c1072b42 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 13:24:22 +01:00
Michael Hackstein 1c825f12b3 I am to stupid to use a keyboard... 2014-03-21 11:22:36 +01:00
Michael Hackstein ef0562149a Fixed karma ui tests 2014-03-21 11:18:33 +01:00
Michael Hackstein 0b266d1dd5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-21 11:13:36 +01:00
Michael Hackstein 1c4d9f14e5 Fixed SCSS-Lint warnings for graphViewer.scss 2014-03-21 11:13:33 +01:00
Michael Hackstein a875353eb4 Removed now empty file 2014-03-21 11:08:30 +01:00
Michael Hackstein 55f0c0357c Finished moving graphViewer.css to scss, will now cleanup scss-lint 2014-03-21 11:07:51 +01:00
Heiko Kernbach 7ee66c908c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 11:06:07 +01:00
scottashton f5ff718ed0 merged 2014-03-21 10:58:11 +01:00
Heiko Kernbach 576a173b9f scss lint 2014-03-21 10:54:04 +01:00
Heiko Kernbach 8f486d1abb removed old unused font 2014-03-21 10:52:48 +01:00
Michael Hackstein a53ded4645 Removed now empty CSS files 2014-03-21 10:42:52 +01:00
Michael Hackstein 9b7034e3c0 Continued moving the graphViewer from css to scss 2014-03-21 10:41:08 +01:00
Michael Hackstein 4607522e8d Solved merge conflict 2014-03-21 10:39:26 +01:00
Jan Steemann 7c28db24af added tests for coffee script 2014-03-21 09:22:20 +01:00
Jan Steemann 2d7a586cc6 added derived file 2014-03-21 08:59:50 +01:00
scottashton aa2a4ba800 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 08:39:00 +01:00
scottashton 411f91f8ca merged 2014-03-21 08:38:39 +01:00
Frank Celler 11fb42e722 removed SYS_TEST_PORT from global namespace 2014-03-20 23:05:17 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Jan Steemann 0ac6928e0f prevent `body length: -9223372036854775808` being printed 2014-03-20 20:45:06 +01:00
Frank Celler e3df90d2c3 coffee script fix 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-03-20 19:36:42 +01:00
Heiko Kernbach 83ba5f313c JSLint 2014-03-20 19:09:34 +01:00
Heiko Kernbach 44bfa51f5d scss lint 2014-03-20 19:03:08 +01:00
Heiko Kernbach dbc2d81000 prep 2014-03-20 18:53:26 +01:00
Heiko Kernbach 66deff7d73 merge conflict 2014-03-20 17:33:23 +01:00
Heiko Kernbach f77a28f632 transfer documentView.css to scss 2014-03-20 17:31:59 +01:00
Heiko Kernbach c3e23ed8ee test 2014-03-20 17:31:11 +01:00
scottashton 4a3c27af88 fixed minor dashboardbugs 2014-03-20 17:07:28 +01:00
gschwab 43797c5af1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 16:45:22 +01:00
gschwab bb02f28607 css-refactoring: logsView.css finished 2014-03-20 16:41:10 +01:00
scottashton d76083ce82 another bugfix for jan 2014-03-20 16:40:31 +01:00
Heiko Kernbach 55467b3a3c scss-lint 2014-03-20 16:28:31 +01:00
Heiko Kernbach 78127b823d notification css fix 2014-03-20 16:25:19 +01:00
scottashton 6b45a98e5e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 16:02:05 +01:00
Heiko Kernbach 4fb7409cd9 fixed visual bugs in scss 2014-03-20 16:00:42 +01:00
scottashton 32874937b1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 15:58:44 +01:00
scottashton 6116fce553 fixed bug jan found, always show 20 min of history 2014-03-20 15:57:33 +01:00
gschwab 286261c2d1 fixed scsslint errors 2014-03-20 13:28:22 +01:00
gschwab 463f5bde2b css refactoring: finished layout.css 2014-03-20 13:22:06 +01:00
gschwab dabe3a2d3a css refactoring: started layout.css - cont. 2014-03-20 11:27:11 +01:00
gschwab b1ebb75202 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 10:40:37 +01:00
Michael Hackstein f5b6142f98 Fixed path to fontawesome 2014-03-20 10:39:54 +01:00
gschwab 333ed0dc17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:17:13 +01:00
scottashton 78fbcc7e17 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:17:10 +01:00
gschwab e21af4e3f0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:15:55 +01:00
Michael Hackstein 300d8aa517 Added missing semicolon 2014-03-20 09:15:14 +01:00
gschwab e2616ee5dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-20 09:10:55 +01:00
gschwab 6ef198f6d6 css refactoring: started layout.css 2014-03-20 09:10:51 +01:00
scottashton c783b41e17 renamed api.scss 2014-03-20 09:08:39 +01:00
Michael Hackstein 33a9bcfb5a Moved content from graphView to graphlayout.css, cleanup will be done in one flow 2014-03-20 08:55:12 +01:00
Michael Hackstein 0905ca2833 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-19 17:32:21 +01:00
Michael Hackstein 9bc623ff3a Removed now empty foxxView.css 2014-03-19 17:31:49 +01:00
Michael Hackstein 1d2c7fa6b5 Moved foxxView.css to scss: reduction 100% ...all unused 2014-03-19 17:30:50 +01:00
scottashton c4a8e69453 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 17:27:23 +01:00
scottashton 9603efa7cb got rid of api.css 2014-03-19 17:27:13 +01:00
Michael Hackstein 299e848567 Moved font-awesome from css to scss 2014-03-19 17:03:45 +01:00
Michael Hackstein d5003db6b8 Fixed js-lint 2014-03-19 16:52:14 +01:00
Michael Hackstein 61dac9b2ce Fixed scss-lint warnings 2014-03-19 16:38:21 +01:00
scottashton cf5c1538b6 scss-css, removes shellView.css 2014-03-19 16:32:47 +01:00
scottashton 84737c30db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 16:13:14 +01:00
scottashton 815112bc7a scss css refactoring 2014-03-19 16:12:58 +01:00
Michael Hackstein b544c69f93 Fixed scss-lint warnings 2014-03-19 16:10:42 +01:00
Michael Hackstein bd6677c42b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/_colors.scss
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-19 15:31:20 +01:00
Michael Hackstein bcceb5cb5a Fixed pagination, buttons, a table in documents view and scss-lint warning 2014-03-19 15:30:35 +01:00
scottashton 85645e3cf3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 14:54:25 +01:00
scottashton cd49e6defa css scss refactoring 2014-03-19 14:54:04 +01:00
gschwab 4faa60c65d fixed scsslint bug 2014-03-19 13:51:22 +01:00
gschwab 878365778e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 13:49:25 +01:00
gschwab fe16832e01 css refactoring: started layout.css 2014-03-19 13:49:16 +01:00
scottashton d5f3352411 css refactoring 2014-03-19 13:39:22 +01:00
scottashton 3fb3b82e79 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-19 10:30:22 +01:00
scottashton df8d2dbd89 removed 2 unused css files and fixed minor dashboard bug 2014-03-19 10:30:14 +01:00
gschwab 23905b1d7a css refactoring: fixed scsslint 2014-03-19 10:00:21 +01:00
gschwab 21633d77cc css refactoring: footerView.css 2014-03-19 09:58:45 +01:00
Michael Hackstein 3ca5dd163c Added generated css 2014-03-19 09:19:02 +01:00
Michael Hackstein 0ade3e15f7 Fixed the save document info text, was off by 5px 2014-03-19 09:16:53 +01:00
Michael Hackstein fb02eb07f3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/scss/generated.css
 2014-03-18 18:32:27 +01:00
Michael Hackstein 1eb45e7e9a Almost finished with documentsView.css however still some stuff to cleanup left. System is at least in a stable state. Layout of buttons in headerbar has slightly changed (they were off by 1px) 2014-03-18 18:26:14 +01:00
gschwab 444518dc3b deleted unused css 2014-03-18 17:04:37 +01:00
gschwab edb7d4ab13 deleted unused css-file 2014-03-18 16:46:10 +01:00
gschwab ca1d1c7eb5 deleted dead code 2014-03-18 16:12:31 +01:00
Michael Hackstein b8ce2a5b70 Fixed layout bug in graph layout 2014-03-18 16:05:02 +01:00
gschwab e1b531215a fixed some scsslint-problems 2014-03-18 15:28:05 +01:00
gschwab 4ae7297eaa merged 2014-03-18 15:25:45 +01:00
gschwab 8af66ca112 css refactoring: queryView.css => _queryView.scscc, pt 2 2014-03-18 15:18:26 +01:00
gschwab 98bc899807 css refactoring: queryView.css => _queryView.scscc 2014-03-18 15:17:20 +01:00
scottashton 6c6f27d4f6 removed unused images 2014-03-18 14:51:42 +01:00
Michael Hackstein be1e290a10 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-18 13:45:32 +01:00
Michael Hackstein e4f14f0130 Contiuned porting documentView.css. Almost done, there is one too general rule left 2014-03-18 13:45:29 +01:00
scottashton 5117447ef7 fixed bug in systemUserTimeChart 2014-03-18 13:38:21 +01:00
Michael Hackstein 8bef15ce62 Started translating docmentView.css created tabViews and jsonEditor.scss on the way 2014-03-18 12:57:53 +01:00
Michael Hackstein ff144f5395 REmoved now empty collectionView.css 2014-03-18 08:29:57 +01:00
Michael Hackstein 888c299257 Moved collectionView.css to scss 2014-03-18 08:29:19 +01:00
Michael Hackstein c3516c60c4 Fixed karma tests and jslint whining 2014-03-17 16:58:53 +01:00
Michael Hackstein 20f7a05cf7 Removed the now empty collectionsItemView.css 2014-03-17 16:30:51 +01:00
Michael Hackstein 58a9b5dc85 Moved collectionsItemView.css to scss reduction 100% so basicly removed 2014-03-17 16:30:17 +01:00
Michael Hackstein 296278cfbc Removed the empty collectionsView.css 2014-03-17 16:09:47 +01:00