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

656 Commits

Author SHA1 Message Date
hkernbach abaabb0de8 web ui added replication statistics 2015-11-17 20:37:27 +01:00
hkernbach a574f6bdac grunt build 2015-11-17 13:58:51 +01:00
hkernbach 9ac97807a4 added bind parameters to system example queries 2015-11-17 13:57:34 +01:00
hkernbach 466cd5b3fe added bind params to query editor template 2015-11-17 13:32:33 +01:00
hkernbach 068bee4c80 explain bind param support, view + aardvark 2015-11-17 13:24:21 +01:00
Jan Steemann f9ba16f8d4 fixed explainer indentation 2015-11-17 11:31:06 +01:00
Wilfried Goesgens 2d5d2d881e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-11 11:05:06 +01:00
hkernbach 1a17c14d6e small fix using bind parameters in aql editor 2015-11-10 10:43:02 +01:00
hkernbach 3ae8eed4cb frontend grunt build 2015-11-06 20:23:22 +01:00
hkernbach 45d153ca91 added support for bind params in the frontend aql editor, issue: #1563 2015-11-06 20:21:08 +01:00
Wilfried Goesgens 7a54982eb4 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-06 13:53:21 +01:00
Jan Steemann 62195e5f09 added derived file 2015-11-05 10:59:01 +01:00
Wilfried Goesgens 179660e87c Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-11-04 17:07:09 +01:00
Jan Steemann 3eb6794d8f added derived file 2015-11-03 10:21:34 +01:00
Frank Celler e87cdafe73 reverted abe72bec38, fb0a309b3c, f28e829586 because of missing CLA 2015-11-03 10:19:28 +01:00
hkernbach 699e2051c8 grunt build 2015-11-03 10:19:28 +01:00
hkernbach c88ab6b49c graph viewer now able to throw some errors/notifications 2015-11-03 10:19:25 +01:00
hkernbach 3632d1e44c updated scss-lint.yml 2015-11-03 10:19:23 +01:00
hkernbach 8bba3a795a grunt build 2015-10-30 10:27:11 +01:00
hkernbach f647212224 merge 2015-10-30 10:20:00 +01:00
hkernbach 4940c80d88 optimized notifications, removed bug in document editor, css fixes 2015-10-30 10:17:53 +01:00
Jan Steemann 10612184ee added derived file 2015-10-30 10:12:34 +01:00
Frank Celler 55e940c1cd reverted 2070d7bd47 because of missing cla 2015-10-29 20:02:39 +01:00
Wilfried Goesgens bb9039c855 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-29 16:01:01 +01:00
Jan Steemann 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +01:00
Wilfried Goesgens 327b408a22 Start implementing early filtering of paths to exclude from the result 2015-10-28 12:37:13 +01:00
Wilfried Goesgens 951165ab1e Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 
Conflicts:
	arangod/Aql/grammar.cpp
	arangod/Aql/grammar.h
	js/common/modules/org/arangodb/graph-examples/example-graph.js
 2015-10-28 11:08:18 +01:00
hkernbach 9a25bc2783 edited graph edit modal, js+css 2015-10-27 13:58:44 +01:00
hkernbach ea6903ee33 issue #1537: from and to vertices always visible 2015-10-23 18:53:59 +02:00
hkernbach a4bdf8d38c grunt build 2015-10-23 18:27:13 +02:00
hkernbach 7caac2edae webui: added some cursors to indicate actions 2015-10-23 18:24:46 +02:00
Jan Steemann afc3de16ed re-grunted 2015-10-23 14:03:08 +02:00
Jan Steemann 731fb9e1c5 moved frontend files 2015-10-23 14:02:08 +02:00
Jan Steemann 0d2197e77f changed documentation for index creation methods 2015-10-21 14:59:45 +02:00
Wilfried Goesgens dae95de667 Merge branch 'devel' of github.com:arangodb/ArangoDB into JHMH 2015-10-21 14:54:01 +02:00
Jan Steemann 4edc3d11f5 re-grunted 2015-10-21 13:07:30 +02:00
Jan Steemann 74edccbcde Merge branch 'aql-jmmh-conditions' of https://github.com/arangodb/arangodb into devel 2015-10-21 12:56:51 +02:00
Jan Steemann 3396214a63 added db._explain() convenience function 2015-10-21 12:52:40 +02:00
Jan Steemann 509ab83ed5 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-21 10:18:16 +02:00
hkernbach 179ecd341b added html cluster min files 2015-10-20 18:14:07 +02:00
hkernbach 86e4bf1a3a added missing cluster minify option 2015-10-20 18:13:16 +02:00
hkernbach 2191a89f6f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-20 17:06:40 +02:00
hkernbach 74bca104e5 issue: 1515, fixed 2 and changed text 2015-10-20 17:03:59 +02:00
Jan Steemann 813048592e fixed scss building 2015-10-20 12:50:15 +02:00
Jan Steemann 1f8b5e54af Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-20 12:34:33 +02:00
hkernbach 84b32587f5 issue: #1509, temp. disabled gv outbound connections 2015-10-20 10:57:28 +02:00
Jan Steemann d6cad3bac6 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-19 18:55:36 +02:00
Wilfried Goesgens 30be20224e Fix fluent AQL interface for fromVertices with arrays: need to use 'ArrayVariable [ * RETURN MERGE(CURRENT, other)]' instead of MERGE(ArrayVariable, other) 2015-10-19 16:40:39 +02:00
jsteemann 82b3acdf17 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-16 22:50:32 +02:00
hkernbach 6005d3098e frontend cleanup & grunt build 2015-10-16 19:34:54 +02:00
hkernbach 557c1952aa removed not needed templates 2015-10-16 16:54:39 +02:00
hkernbach 0225c4d982 grunt cleanup & optimization 2015-10-16 13:47:03 +02:00
Jan Steemann 0ffb11c25e do not use sparse indexes for sorting 2015-10-14 12:03:52 +02:00
Jan Steemann 8f150e942e Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-14 09:57:24 +02:00
hkernbach 3f4e6cb982 grunt build 2015-10-14 00:42:30 +02:00
hkernbach 81df6ddda1 cleanup web interface 2015-10-14 00:36:05 +02:00
Jan Steemann bb0051b739 fixed hard-coded `incremental` parameter in shell implementation of `syncCollection` function in replication module 2015-10-13 09:33:15 +02:00
jsteemann 29b3741156 reworked cost calculations 2015-10-12 22:23:03 +02:00
Jan Steemann ffa777979c make IN values unique and sort em 2015-10-12 15:34:41 +02:00
Jan Steemann 8c6d284cc3 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 16:17:18 +02:00
Jan Steemann e49064e5c4 hide `fm` variable in web interface shell 2015-10-09 15:25:56 +02:00
Jan Steemann e71dde08b7 added derived files 2015-10-09 14:28:02 +02:00
Jan Steemann 23ae3a9693 fixes for front end 
Conflicts:
	js/apps/system/_admin/aardvark/APP/GruntFile.js
 2015-10-09 14:26:46 +02:00
Frank Celler a85c44b25e removed commented out lines, less verbose help 2015-10-09 13:51:18 +02:00
hkernbach 6cc0d4d184 new webui grunt build 2015-10-09 10:30:14 +02:00
Jan Steemann 7bfbbfd77f Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-09 09:42:28 +02:00
Jan Steemann d572655d84 fixed compile warning 2015-10-08 16:28:04 +02:00
Jan Steemann 6a4e9658c5 fixes for explainer and condition 2015-10-08 16:22:52 +02:00
Jan Steemann 0d80a17002 generalize condition handling 2015-10-08 15:10:28 +02:00
hkernbach d066a4283c issue: #1446 2015-10-08 14:02:36 +02:00
Jan Steemann a1de2bfcc1 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 
Conflicts:
	CHANGELOG
 2015-10-07 10:18:21 +02:00
Alan Plum ea44c7710c Rebuild aardvark 2015-10-06 16:35:00 +02:00
Alan Plum 3325d46211 Unbreak aardvark shell 2015-10-06 16:18:23 +02:00
Jan Steemann 7d4c379598 small modifications, temporarily disabled interchange-adjacent-enumerations 2015-10-02 19:53:35 +02:00
Jan Steemann 8247ec0dff Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-02 12:59:13 +02:00
hkernbach db7533acf8 jslint fix 2015-10-02 10:23:08 +02:00
hkernbach 3beb6a280f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-10-02 10:02:30 +02:00
hkernbach 51a20beef3 graph test view 2015-10-02 10:02:25 +02:00
Jan Steemann 4175463248 Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-jmmh-conditions 2015-10-01 16:00:13 +02:00
Wilfried Goesgens c9cee71b2c Fresh swagger docu 2015-10-01 13:30:55 +02:00
Jan Steemann 9205739f6a added IndexNode 2015-09-30 14:10:04 +02:00
Jan Steemann 1ee1a87ae0 return proper errors to caller 2015-09-30 13:49:03 +02:00
Jan Steemann 3b0b04b179 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-29 14:59:03 +02:00
Jan Steemann 96d8c24c61 fix app thumbnails 2015-09-29 14:58:35 +02:00
Frank Celler f8c79f1ab0 added ARANGODB_DEFAULT_ROOT_PASSWORD 2015-09-29 13:15:25 +02:00
Alan Plum 8c24b0c28b Fixed missing thumbnail 2015-09-25 16:40:03 +02:00
Jan Steemann 3ce21453c3 added derived files 2015-09-25 16:01:36 +02:00
Jan Steemann ace5bd8ec2 some fixes for the web interface 2015-09-25 16:01:13 +02:00
Jan Steemann 0ebf0be777 fixed Gruntfile to include cluster stuff 2015-09-25 15:07:24 +02:00
Jan Steemann 7c992a5d51 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-09-24 16:05:15 +02:00
Jan Steemann 71f8d89eeb allow installing Foxx applications in /_open/ 2015-09-24 15:59:42 +02:00
Jan Steemann a430cb9f6c allow installing Foxx apps in /_open/ 2015-09-24 15:54:09 +02:00
Alan Plum 252cba5e9f Implemented FoxxService 2015-09-24 13:46:14 +02:00
Alan Plum 763d206c40 Rebuilt aardvark shell 2015-09-24 13:46:14 +02:00
Alan Plum 038267cb06 Re-implemented require/module based on Node 4.1.0 
The require function should now behave as expected and treat ArangoDB's module paths as sources for "external" modules.
The "assert", "buffer" and "path" modules have been moved out of ./js/node into the bootstrap modules.
The module "org/arangodb/foxx/arangoApp" (as well as any modules depending on it) is incompatible with the new module loading behaviour and will be have to be rewritten from scratch.
The "Package" class has been removed entirely and is no longer needed.
Support for the database-stored modules is currently missing and needs to be re-implemented within the module loader.
 2015-09-24 13:46:13 +02:00
Jan ebfdf38c08 Merge pull request #1505 from jsteemann/devel 
added generated files
 2015-09-24 12:04:56 +02:00
hkernbach d21f375ade scss 2015-09-23 16:40:09 +02:00
hkernbach 1b8e6ddfec renamed a graph viewer label 2015-09-22 15:58:31 +02:00
hkernbach 9e79c27b64 finalized issue #1433 2015-09-22 15:22:51 +02:00
hkernbach 108b873b28 graphViewer css 2015-09-22 15:00:58 +02:00