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

3046 Commits

Author SHA1 Message Date
gschwab ca6d852621 fixed some minor bugs 2014-02-18 16:35:49 +01:00
Heiko Kernbach 1e964b18d0 removed old/unnecessary notifications 2014-02-18 16:31:46 +01:00
Heiko Kernbach a2e1425b87 karma fix for navigationviewspec 2014-02-18 16:00:00 +01:00
Heiko Kernbach ce450dd994 removed console log 2014-02-18 15:07:14 +01:00
Heiko Kernbach 736ae9ec62 cleanup 2014-02-18 14:55:36 +01:00
Heiko Kernbach fe8d22cdd7 finished new notification system 2014-02-18 14:54:38 +01:00
Heiko Kernbach 140a8f125b notifications 2014-02-18 12:27:39 +01:00
Jan Steemann 39584f0735 adjusted user result structure 2014-02-18 12:05:05 +01:00
Michael Hackstein 46cdc95c6d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-18 10:40:28 +01:00
Michael Hackstein 10c380602a Added a foxx route for authentication. It is now possible to request the logged in user 2014-02-18 10:40:23 +01:00
gschwab 107748a228 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-18 09:27:56 +01:00
gschwab 5408e4b845 added usermanagement view 2014-02-18 09:27:45 +01:00
Heiko Kernbach e8aaac38e2 css fix 2014-02-18 08:26:17 +01:00
Heiko Kernbach fce3cd2879 removed notification view 2014-02-18 08:23:57 +01:00
Michael Hackstein c4b14fcfac Added strong transparency to colors, used by tiles. Also added some more attributes to tile, still some overwrites found there 2014-02-17 22:16:09 +01:00
Michael Hackstein 36affeb5d7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-17 21:32:27 +01:00
Heiko Kernbach 286bcc658a notification prep. + karma fix 2014-02-17 16:46:15 +01:00
gschwab cecb40147d path fixed 2014-02-17 16:43:13 +01:00
Heiko Kernbach 899fa52876 added api-cmd for getting a complete user list 2014-02-17 16:37:50 +01:00
Heiko Kernbach c9193d153f removed obsolesce test 2014-02-17 11:55:22 +01:00
Heiko Kernbach 238396e3c4 prep for new notifications, cleanup 2014-02-17 11:47:58 +01:00
Jan Steemann c40d930fa6 issue #765: added SLICE AQL function 2014-02-17 11:09:03 +01:00
gschwab 067a202104 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-17 08:57:27 +01:00
gschwab 5e90b2fe04 added user and statistic view (fakey and inactive) 2014-02-17 08:57:17 +01:00
Heiko Kernbach 2f96ac70ad new model for notification 2014-02-14 20:45:00 +01:00
Heiko Kernbach 04ab98b133 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-14 20:43:25 +01:00
Heiko Kernbach bcf587847a karma 2014-02-14 20:43:01 +01:00
Frank Celler 38cffe5401 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-14 16:52:13 +01:00
Heiko Kernbach 5a2a5508ef added new collection/model for notifications 2014-02-14 16:51:57 +01:00
Frank Celler 6d51527fb5 check for drive letter 2014-02-14 16:51:40 +01:00
gschwab 2111c7a98e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 16:35:28 +01:00
gschwab 8d8476834e tests fixed 2014-02-13 16:35:18 +01:00
Frank Celler 6e588b468a Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 16:26:07 +01:00
gschwab df7932f7ca tools dropdown fixed 2014-02-13 16:15:53 +01:00
gschwab 2bb45f052c resized page margins 2014-02-13 15:37:39 +01:00
Frank Celler 16f7d558ba added node modules semver, numeral, moment, marked 2014-02-13 15:31:48 +01:00
Michael Hackstein 0474d47a1e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-13 15:12:56 +01:00
gschwab 485958a2a2 tests fixed 2014-02-13 13:10:54 +01:00
gschwab 4fefdeba7f dropdown menues fixed 2014-02-13 12:55:01 +01:00
gschwab 30b9f20250 Highlighting for dropdown item fixed 2014-02-13 09:29:05 +01:00
gschwab ee1ec1b08a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-13 08:45:19 +01:00
gschwab c58342f08a changed 'blubber' to 'Tools' 2014-02-13 08:43:19 +01:00
Frank Celler 89b6ca0ba3 fixed test setup 2014-02-12 22:04:19 +01:00
gschwab 0d2f3b945f karma configuration fixed 2014-02-12 14:44:53 +01:00
gschwab ae3fa2ec77 more tests fixed 2014-02-12 14:36:27 +01:00
gschwab a21d499e51 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 14:12:40 +01:00
gschwab 6d55f35058 fixed test 2014-02-12 14:12:18 +01:00
Frank Celler 25878be3d4 added fix for absolute path 2014-02-12 13:54:32 +01:00
Heiko Kernbach 9cb13ca7c0 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:40:31 +01:00
Heiko Kernbach f215495c0f karma&jslint 2014-02-12 10:40:23 +01:00
gschwab d91a283678 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:25:52 +01:00
gschwab 2910419738 database selection moved to navigation bar, links rearranged 2014-02-12 10:25:16 +01:00
Heiko Kernbach 421d0c8e93 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-12 10:24:59 +01:00
Heiko Kernbach 0a4d54440f some changes for user management 2014-02-12 10:24:53 +01:00
scottashton ee822fb182 cleanup code, added linebreaks 2014-02-12 09:27:39 +01:00
Jan Steemann 28edb544fd fixed jslint warnings 2014-02-12 09:15:47 +01:00
Jan Steemann 10b406b0e9 flush the user authentication cache after any modifications 2014-02-12 09:12:48 +01:00
Michael Hackstein 67f4da6b9e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-12 08:28:09 +01:00
Heiko Kernbach b3a7c9fff3 jslint fix 2014-02-12 08:20:00 +01:00
Frank Celler 42c5f0e3a8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-11 22:54:08 +01:00
Frank Celler 289a7dc0e0 fixed unloadAll for system modules 2014-02-11 22:54:02 +01:00
Heiko Kernbach e128c0aca4 redirect bugfix, optimizations 2014-02-11 19:32:00 +01:00
Heiko Kernbach ef86071517 scroll to focus method 2014-02-11 18:41:05 +01:00
Heiko Kernbach 43f431d036 added missing css pointer 2014-02-11 18:00:08 +01:00
Heiko Kernbach 45917d9400 info-view bugfix, updated new icons 2014-02-11 17:18:55 +01:00
Heiko Kernbach 7a2f404afa bugfix + jslint 2014-02-11 16:20:31 +01:00
Heiko Kernbach 1c47028361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 16:03:07 +01:00
Heiko Kernbach bbc65a3040 usability document view 2014-02-11 16:02:57 +01:00
Michael Hackstein c7036a67f7 Started changing the Application list tiles to be equal to Collection tiles. Not all functionality available yet 2014-02-11 15:07:44 +01:00
Frank Celler 5b7eb66c9d added iced coffee script 2014-02-11 14:49:01 +01:00
Frank Celler 4d707a7758 fixed doc for require 2014-02-11 14:38:56 +01:00
Heiko Kernbach c43d879aac Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:16:07 +01:00
Frank Celler b017cc04b1 added process module 2014-02-11 14:15:27 +01:00
Heiko Kernbach a99815de0b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-11 14:06:33 +01:00
Heiko Kernbach 2a5e8340a4 serveral bugfixes document editing view 2014-02-11 13:57:43 +01:00
Frank Celler da0453daa6 removed moduleNames, fixed app module 2014-02-11 13:48:37 +01:00
Frank Celler fe8bab5457 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	CHANGELOG
 2014-02-11 13:27:22 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Michael Hackstein 2098eac723 The index.html of the frontend is now composed from several parts. It will be reusable for the sharding frontend then 2014-02-11 11:07:29 +01:00
Michael Hackstein f87b594a1c Added new classes for the tiles in collection overview. They should now be easily reusable for Databases and Applications 2014-02-11 09:58:09 +01:00
Michael Hackstein b76101de64 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-11 08:53:25 +01:00
Michael Hackstein 232c616288 Fixed jenkins crying... 2014-02-11 08:53:20 +01:00
scottashton 80768b564b fixed waitForSync in graph api, adjusted documentation, delete tests in api-http-spec.rb due to change in ruby lib 2014-02-10 17:53:21 +01:00
Michael Hackstein 2e3e9b6e3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-10 11:59:36 +01:00
Michael Hackstein 4fd06a6f32 Finished with general positioning of elements in scss. Much much (much)* simpler now 2014-02-10 11:59:26 +01:00
Michael Hackstein 7094f4378e Converted footer view to scss and added resizing functionality. 2014-02-09 23:07:21 +01:00
Frank Celler 7528779137 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	CMakeLists.txt
	VERSION
	arangod/Ahuacatl/ahuacatl-functions.c
	arangod/RestServer/ArangoServer.cpp
	arangod/VocBase/vocbase-defaults.c
	build.h
	configure
	configure.ac
	js/apps/system/aardvark/api-docs.json
	js/apps/system/aardvark/api-docs/batch.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/endpoint.json
	js/apps/system/aardvark/api-docs/job.json
	js/apps/system/aardvark/api-docs/replication.json
	js/apps/system/aardvark/api-docs/system.json
	js/apps/system/aardvark/frontend/css/buttons.css
	js/apps/system/aardvark/frontend/css/documentsView.css
	js/apps/system/aardvark/frontend/js/templates/applicationsView.ejs
	js/apps/system/aardvark/frontend/js/templates/documentsView.ejs
	js/server/modules/org/arangodb/ahuacatl.js
	js/server/tests/ahuacatl-graph.js
 2014-02-09 18:39:11 +01:00
Frank Celler 98ed813138 added json reading 2014-02-09 18:27:47 +01:00
Frank Celler 741ab9da9e added stream and events 2014-02-09 18:26:16 +01:00
Frank Celler 13b361555f new version 2014-02-09 18:25:44 +01:00
Michael Hackstein d875e213fb Improvements for navbar in SCSS , simplified code and removed old navbar.css from manifest. 2014-02-09 13:28:26 +01:00
Michael Hackstein 3d9bdcc210 Navbar now completely moved to Scss 2014-02-09 13:10:26 +01:00
Michael Hackstein 61aeeeceae Renamed logo (missing d) and optimized navbar setup 2014-02-08 09:12:09 +01:00
Michael Hackstein 2670c30ef3 Started moving from css to scss for better maintanence. Also started cleanup process 2014-02-08 08:55:49 +01:00
Frank Celler 0bc50d9d10 release version 1.4.9 2014-02-07 21:45:05 +01:00
Michael Hackstein c340f8f4a3 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-04 09:21:16 +01:00
Michael Hackstein c83f4621c1 Fixed tests for new graphviwer toolbox layout 2014-02-04 09:21:03 +01:00
Jan Steemann 6bb4f0f0ac added SKIPLIST AQL function 
Conflicts:
	CHANGELOG
 2014-02-03 16:54:35 +01:00
Jan Steemann fe9464afec added SKIPLIST AQL function 2014-02-03 16:37:07 +01:00
Michael Hackstein 4dc635e59c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-03 11:42:48 +01:00
Michael Hackstein 08858d414b Added new version of graphViewer Icons 2014-02-03 11:42:18 +01:00
Jan Steemann 4339d5aab6 removed unused variable 2014-02-02 09:21:43 +01:00
Claudius Weinberger 2748152fc5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	js/apps/system/aardvark/frontend/css/buttons.css
 2014-02-01 17:28:18 +01:00
Claudius Weinberger 7d29bfcf6a some ui improvements 2014-02-01 17:26:13 +01:00
Jan Steemann 3db9bbe0cc evil mimetype detection attempt 2014-02-01 17:02:42 +01:00
Jan Steemann 1a10cb52eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-02-01 12:08:35 +01:00
Jan Steemann d9bc39c576 don't fail if body response is undefined 2014-02-01 12:08:08 +01:00
Michael Hackstein 0ee6183d3d Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-02-01 09:47:28 +01:00
Michael Hackstein 1e21d3750f Fixed tests for graph previewer 2014-02-01 09:47:19 +01:00
Jan Steemann 4a99cde395 jslintified several tests 2014-02-01 01:50:58 +01:00
Jan Steemann 8be60b04db Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 23:59:01 +01:00
Jan Steemann 74c0457b4b added version check for admin interface 2014-01-31 23:58:36 +01:00
Michael Hackstein f580bd1ade Fixed tests for translated arrow positions. 2014-01-31 23:38:33 +01:00
Michael Hackstein 6b12a0babc The db selection select box is now readable in firefox 2014-01-31 23:09:24 +01:00
Michael Hackstein 0c59b93390 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 22:57:47 +01:00
Michael Hackstein 7c063d3572 The graph viewer now has arrows 2014-01-31 22:57:03 +01:00
Michael Hackstein 6f44fcf00e Made unexpanded vertices semi-transparent, i am not yet happy with this 2014-01-31 21:41:40 +01:00
Michael Hackstein 7085c6cb6d The context menu in the graphviewer now has style of OSX 2014-01-31 21:38:47 +01:00
Max Neunhoeffer b6c3600ecc Add an include needed to please the compiler on Linux. 2014-01-31 19:31:36 +01:00
Michael Hackstein 2a289bf28d Fixed a bug where the group-by list of the graphviewer has not been stored locally 2014-01-31 18:17:25 +01:00
Michael Hackstein 0b0d4c5dd7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 17:38:20 +01:00
Michael Hackstein 0c62714017 Fixed a bug where dragging of nodes was not possible and connecting them with edges made everything even worse 2014-01-31 17:38:15 +01:00
Frank Celler 014afdf792 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 15:56:21 +01:00
Frank Celler 29f075cfce added external processes 2014-01-31 15:55:51 +01:00
Michael Hackstein f7735391df Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 14:06:51 +01:00
Jan Steemann 04d40c10e9 fixed wrong REST API parameter type in documentation 2014-01-31 13:56:24 +01:00
Jan Steemann dab81b1702 fixed wrong REST API parameter type in documentation 2014-01-31 13:54:47 +01:00
Michael Hackstein 46c9b0e83b Added a confirmation dialog before deleting nodes/edges 2014-01-31 13:04:55 +01:00
Jan Steemann bd7c5d4113 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 11:23:38 +01:00
Jan Steemann 4ead86d0f7 removed some unused variables 2014-01-31 11:23:27 +01:00
Michael Hackstein d30585ceb2 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 09:29:00 +01:00
Michael Hackstein 817013004b Fixed a bug where node creation does not work determinisiticly 2014-01-31 09:28:53 +01:00
Jan Steemann a5d4b1b5a1 make change for issue #755 less strict 2014-01-31 02:07:27 +01:00
Jan Steemann d17e049ed7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-01-31 02:02:49 +01:00
Jan Steemann ea7772295b issue #755 2014-01-31 02:02:25 +01:00
Jan Steemann b7ad436d19 issue #755: TRAVERSAL does not use strategy, order and itemOrder options 2014-01-31 01:52:07 +01:00
Michael Hackstein a219bc8342 Changed internal layout of the graphviewer, This fixes issues with the context menu, click events and display of edges to be 2014-01-31 01:16:38 +01:00
Michael Hackstein e22972578c Headerbar buttons now have a cursor: pointer 2014-01-31 01:14:45 +01:00
Michael Hackstein cb4d9deb3b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-31 01:09:51 +01:00
Claudius Weinberger fadb568728 fixed merge conflict 2014-01-31 01:00:49 +01:00
Claudius Weinberger 7f92c53519 Some layout changes 2014-01-31 00:56:56 +01:00
Michael Hackstein 6ffd56760c Fixed a bug in the WI where it was not possible to install a foxx in a specific version 2014-01-30 23:55:17 +01:00
Michael Hackstein 521a46088c Fixed a bug with undefined values printed to console.log but they had no effect 2014-01-30 20:39:37 +01:00
Michael Hackstein 875100a195 Encapsulated the GraphViewer menu into a container with padding 2014-01-30 20:38:49 +01:00
Michael Hackstein 86d8ddb71e Removed pointless console.log 2014-01-30 20:37:21 +01:00
Michael Hackstein a51979818a Added test for graph deletion confirmation 2014-01-30 17:13:23 +01:00
Michael Hackstein 54346784ca Added confirm dialog to graph deletion 2014-01-30 16:56:31 +01:00
Michael Hackstein 301b8ac7c2 The graph management delete button is now correct red color and hover effect does not change it to green 2014-01-30 16:05:47 +01:00
Michael Hackstein 402d80930b Fixed spelling mistake 2014-01-30 15:15:08 +01:00
Michael Hackstein 0b57142b5d Fixed colour discrepeancy of API views 2014-01-30 15:12:04 +01:00