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

1643 Commits

Author SHA1 Message Date
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
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
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
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 f742a979d1 Moved install Foxx Modal to global singleton 2014-04-03 14:38:05 +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 21f8ae668c Fixed jslint warnings 2014-04-02 17:58:19 +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
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
gschwab 9e21ef2ba8 fixed connection check: firefox does not support async:false 2014-04-02 09:23:46 +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
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 48003a69e9 cluster tests 2014-03-26 17:43:20 +01:00